DO NOT REPLY [Bug 48685] Spnego Support in Tomcat

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48685

--- Comment #14 from ashish.j...@in.ibm.com 2010-04-22 03:38:51 EDT ---
Regarding your question "Step 5 of Spnego", in most of the cases the size of
the Spnego token will be less that < 4 KB however in case it goes over and
above 4KB, maxHttpHeaderSize can be increased, so implementing Step5 is not a
necessity.

On the JAAS realm I had an understanding from your previous update that you
wanted a sample to test and that is the reason I have provided all the jars so
that you can test it in your setup.

However If I understand correctly you want me to provide a tomcat specific
implementation of "org.apache.geronimo.tomcat.realm.TomcatJAASRealm".
SpnegoAuthenticator is already up and available in the patch. 

So if I provide a tomcat specific implementation of TomcatJAASRealm will you
include the patch in Tomcat?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936640 - /tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 07:59:21 2010
New Revision: 936640

URL: http://svn.apache.org/viewvc?rev=936640&view=rev
Log:
Fix typo in overridden method name

Modified:

tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java

Modified: 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java?rev=936640&r1=936639&r2=936640&view=diff
==
--- 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
 (original)
+++ 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
 Thu Apr 22 07:59:21 2010
@@ -37,7 +37,8 @@ public class ImmutableNameNotFoundExcept
 public void appendRemainingName(Name name) {}
 @Override
 public void setRemainingName(Name name) {}
-public void setResolverName(Name name) {}
+@Override
+public void setResolvedName(Name name) {}
 @Override
 public void setRootCause(Throwable e) {}
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936641 - /tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 08:00:26 2010
New Revision: 936641

URL: http://svn.apache.org/viewvc?rev=936641&view=rev
Log:
Fix Eclipse warnings

Modified:

tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java

Modified: 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java?rev=936641&r1=936640&r2=936641&view=diff
==
--- 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
 (original)
+++ 
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
 Thu Apr 22 08:00:26 2010
@@ -31,15 +31,17 @@ import javax.naming.NameNotFoundExceptio
 public class ImmutableNameNotFoundException
 extends NameNotFoundException {
 
+private static final long serialVersionUID = 1L;
+
 @Override
-public void appendRemainingComponent(String name) {}
+public void appendRemainingComponent(String name) {/*NOOP*/}
 @Override
-public void appendRemainingName(Name name) {}
+public void appendRemainingName(Name name) {/*NOOP*/}
 @Override
-public void setRemainingName(Name name) {}
+public void setRemainingName(Name name) {/*NOOP*/}
 @Override
-public void setResolvedName(Name name) {}
+public void setResolvedName(Name name) {/*NOOP*/}
 @Override
-public void setRootCause(Throwable e) {}
+public void setRootCause(Throwable e) {/*NOOP*/}
 
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936642 - /tomcat/trunk/java/org/apache/naming/resources/package.html

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 08:02:14 2010
New Revision: 936642

URL: http://svn.apache.org/viewvc?rev=936642&view=rev
Log:
typos

Modified:
tomcat/trunk/java/org/apache/naming/resources/package.html

Modified: tomcat/trunk/java/org/apache/naming/resources/package.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/package.html?rev=936642&r1=936641&r2=936642&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/package.html (original)
+++ tomcat/trunk/java/org/apache/naming/resources/package.html Thu Apr 22 
08:02:14 2010
@@ -16,13 +16,13 @@
 -->
 
 
-This package contains the resources directory context implemetation.
+This package contains the resources directory context implementation.
 This includes :
 
 A CacheDirContext which handles caching and acts as a proxy for the real 
 resources context
-A FileDirContext, an implementation of DirContext to access the 
-filesystem
+A FileDirContext, an implementation of DirContext to access the file
+system
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936646 - in /tomcat/trunk/java/org/apache: catalina/ catalina/core/ catalina/startup/ naming/resources/

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 08:13:08 2010
New Revision: 936646

URL: http://svn.apache.org/viewvc?rev=936646&view=rev
Log:
Add support for loading static resources from /META-INF/resources inside JARs 
bundled with a web application

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=936646&r1=936645&r2=936646&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Apr 22 08:13:08 2010
@@ -1183,5 +1183,11 @@ public interface Context extends Contain
  */
 public JspConfigDescriptor getJspConfigDescriptor();
 
+/**
+ * Add a URL for a JAR that contains static resources in a
+ * META-INF/resources directory that should be included in the static
+ * resources for this context.
+ */
+public void addResourceJarUrl(URL url);
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=936646&r1=936645&r2=936646&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Apr 
22 08:13:08 2010
@@ -115,6 +115,7 @@ standardContext.loginConfig.loginPage=Fo
 standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must 
start with a ''/'' in Servlet 2.4
 standardContext.loginConfig.required=LoginConfig cannot be null
 standardContext.mappingError=MAPPING configuration error for relative URI {0}
+standardContext.noResourceJar=Resource JARs are not supported. The JAR found 
at [{0}] will no be used to provide static content for context with path [{1}]
 standardContext.notFound=The requested resource ({0}) is not available.
 standardContext.notReloadable=Reloading is disabled on this Context
 standardContext.notStarted=Context has not yet been started

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=936646&r1=936645&r2=936646&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Apr 22 
08:13:08 2010
@@ -962,6 +962,21 @@ public class StandardContext
 
 
 /**
+ * Add a URL for a JAR that contains static resources in a
+ * META-INF/resources directory that should be included in the static
+ * resources for this context.
+ */
+public void addResourceJarUrl(URL url) {
+if (webappResources instanceof BaseDirContext) {
+((BaseDirContext) webappResources).addResourcesJar(url);
+} else {
+log.error(sm.getString("standardContext.noResourceJar", url,
+getPath()));
+}
+}
+
+
+/**
  * Set the current alias configuration. The list of aliases should be of 
the
  * form "/aliasPath1=docBase1,/aliasPath2=docBase2" where aliasPathN must
  * include a leading '/' and docBaseN must be an absolute path to either a
@@ -2122,11 +2137,13 @@ public class StandardContext
 return;
 
 if (resources instanceof BaseDirContext) {
+// Caching
 ((BaseDirContext) resources).setCached(isCachingAllowed());
 ((BaseDirContext) resources).setCacheTTL(getCacheTTL());
 ((BaseDirContext) resources).setCacheMaxSize(getCacheMaxSize());
 ((BaseDirContext) resources).setCacheObjectMaxSize(
 getCacheObjectMaxSize());
+// Alias support
 ((BaseDirContext) resources).setAliases(getAliases());
 }
 if (resources instanceof FileDirContext) {

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=936646&r1=936645&r2=936646&view=diff
==
--- tomcat/trunk/java/

svn commit: r936651 - /tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 08:33:53 2010
New Revision: 936651

URL: http://svn.apache.org/viewvc?rev=936651&view=rev
Log:
Update

Modified:
tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt?rev=936651&r1=936650&r2=936651&view=diff
==
--- tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (original)
+++ tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Thu Apr 22 08:33:53 2010
@@ -26,25 +26,19 @@
- Done
 
 3. Implement all the new Servlet 3 features
+   NOTE: Status is based on a review of the specification, not the TCK tests
- Sections 1 to 3 - Compliant
- Sections 4.1 to 4.3 - Compliant
- Section 4.4 - TODO - ServletContainerInitializer
-   - Section 4.5 - Compliant
-   - Section 4.6 - TODO getResource() & META-INF/resources
-   - Section 4.7 to 4.8 - Compliant
+   - Section 4.5 to 4.8 - Compliant
- Sections 5 to 7 - Compliant
- Section 8 - in progress
  8.1 - Compliant
  8.2 - TODO - ServletContainerInitializer
  8.3 - Scope for re-factoring
  8.4 - Compliant
-   - Section 9 - Compliant
-   - Section 10 to 12 - not checked
-   - Section 13 - In progess
- 13.1 to 13.3 - Compliant
- 13.4 - In progress
- 13.5 to 13.10 - Compliant
- Section 14 to 15 - not checked
+   - Sections 9 to 13 - Compliant
+   - Section 14 to 15 - not checked
- Java EE spec requirements - not checked
- JSR 196 - Recommended - Not yet implemented. Copy from Geronimo?
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936655 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/BackupManager.java webapps/docs/changelog.xml

2010-04-22 Thread kfujino
Author: kfujino
Date: Thu Apr 22 08:46:58 2010
New Revision: 936655

URL: http://svn.apache.org/viewvc?rev=936655&view=rev
Log:
Fixed for BZ49151.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936655&r1=936654&r2=936655&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 22 08:46:58 2010
@@ -280,14 +280,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49151
-  Avoid ClassCastException.
-  http://svn.apache.org/viewvc?view=revision&revision=935510
-  +1: kfujino
-  +1: kkolinko: and also +1 for 
http://svn.apache.org/viewvc?rev=935777&view=rev
-  +1: markt: and also +1 for http://svn.apache.org/viewvc?rev=935777&view=rev
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
   http://svn.apache.org/viewvc?view=revision&revision=935998
   +1: fhanik, markt

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=936655&r1=936654&r2=936655&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
Thu Apr 22 08:46:58 2010
@@ -227,9 +227,8 @@ public class BackupManager extends Stand
  */
 public void stop() throws LifecycleException
 {
-
-LazyReplicatedMap map = (LazyReplicatedMap)sessions;
-if ( map!=null ) {
+if (sessions instanceof LazyReplicatedMap) {
+LazyReplicatedMap map = (LazyReplicatedMap)sessions;
 map.breakdown();
 }
 if ( !this.started ) return;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=936655&r1=936654&r2=936655&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 22 08:46:58 2010
@@ -125,6 +125,10 @@
 48934: Previous fix to handle dropped connections 
incorrectly
 permanently disabled session replication. (fhanik)
   
+  
+49151: Avoid ClassCastException in BackupManager#stop. 
+(kfujino)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 46350] Maven repository should contain source bundles

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46350

--- Comment #3 from Marc Guillemot  2010-04-22 04:47:52 
EDT ---
No reaction since 1 1/2 year!

Does it mean that Tomcat committers are not interested by this very simple way
to promote Tomcat sources? Personally I think that it makes easier to start
looking at the source files and therefore increase the probability for the
project to receive good bug reports with patches.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49151] ClassCastException in BackupManager#stopInternal.

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49151

Keiichi Fujino  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Keiichi Fujino  2010-04-22 04:49:49 EDT 
---
This fix applied to 6.0, will be in 6.0.27 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Memory leak detection and JVMTI

2010-04-22 Thread Rainer Jung
Just a short note: I stumbled over the "ForceGarbageCollection" JVMTI 
function today. It reliably triggers a full GC and the call only returns 
after having run the GC. It will do so, even when System.gc() is 
disabled. It looks like it doesn't respect ExplicitGCInvokesConcurrent, 
so it will always do a stop-the-world collection leading to possibly 
long stop times but also to defragmented tenured space.


As always, it is not expected, that the finalizers will be run.

Maybe something we could add to tcnative. Since the call is stateless, 
adding it should be simple, just implementing Agent_OnLoad to initialize 
the JVMTI environmnt using GetEnv() and then making 
ForceGarbageCollection(env) publicly accessible. One must also register 
the JVMTi agent using e.g. the "-agentlib" startup option.


I don't know, whether that would lead to a problem with duplicate 
library loading, in which case one would have to separate it from tcnative.


Caution: this is all form looking at docs and code, no tests done yet.

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936723 - /tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

2010-04-22 Thread markt
Author: markt
Date: Thu Apr 22 10:06:06 2010
New Revision: 936723

URL: http://svn.apache.org/viewvc?rev=936723&view=rev
Log:
Complete review of spec. One additional requirement

Modified:
tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt

Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt?rev=936723&r1=936722&r2=936723&view=diff
==
--- tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (original)
+++ tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Thu Apr 22 10:06:06 2010
@@ -35,12 +35,9 @@
- Section 8 - in progress
  8.1 - Compliant
  8.2 - TODO - ServletContainerInitializer
- 8.3 - Scope for re-factoring
- 8.4 - Compliant
-   - Sections 9 to 13 - Compliant
-   - Section 14 to 15 - not checked
-   - Java EE spec requirements - not checked
-   - JSR 196 - Recommended - Not yet implemented. Copy from Geronimo?
+ 8.3 to 8.4 - Compliant
+   - Sections 9 to 15 - Compliant
+   - Strict spec compliance requires deployment descriptor validation
 
 4. Do an initial release (from trunk)
- Create tc7.0.x\tags to hold release tags - Done
@@ -55,6 +52,9 @@
 7. Create tc7.0.x\trunk from trunk at first stable release
 
 8. Nice to haves in first Tomcat 7 stable release
+   - Refactor Jasper integration as suggested in SRV.8.3
- Lifecycle clean-up for init()/destroy() inc. MBeans
- Remove old, unused code
  - Clean up internal API (eg remove unused params from methods)
+   - JSR 115/196 implementations - Copy from Geronimo?
+   
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49132] JNDI not working

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49132

--- Comment #2 from Alvin  2010-04-22 06:29:01 EDT ---
Created an attachment (id=25331)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25331)
Webapp test src

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49132] JNDI not working

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49132

--- Comment #3 from Alvin  2010-04-22 06:31:03 EDT ---
Created an attachment (id=25332)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25332)
Test war file showing issue

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49132] JNDI not working

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49132

Mark Thomas  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |

--- Comment #4 from Mark Thomas  2010-04-22 06:31:32 EDT ---
Possible timing issue with listener events and JNDI init

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49170] New: Transmission of duplicated session in DeltaManager#handleGET_ALL_SESSIONS.

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49170

   Summary: Transmission of duplicated session in
DeltaManager#handleGET_ALL_SESSIONS.
   Product: Tomcat 7
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: kfuj...@apache.org


Created an attachment (id=25333)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25333)
patch against trunk.

Config


DeltaManager#handleGET_ALL_SESSIONS is as follows.
=
...skip...
if (isSendAllSessions()) {
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
int len = currentSessions.length < getSendAllSessionsSize() ?
currentSessions.length : getSendAllSessionsSize();Session[]
sendSessions = new Session[len];
for (int i = 0; i < currentSessions.length; i += getSendAllSessionsSize())
{
len = i + getSendAllSessionsSize() > currentSessions.length ?
currentSessions.length - i : getSendAllSessionsSize();
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
...skip...
}
...skip...
}

=

sendSessions maintains previous Session. 

For instance,
currentSessions=[ssA, ssB, ssC, ssD, ssE]
sendAllSessionsSize=3

loop1 : sendSessions=[ssA, ssB, ssC]
loop2 : sendSessions=[ssD, ssE, ssC]

ssC is transmitted two times.
It should be the following. 

loop1 :  sendSessions=[ssA, ssB, ssC]
loop2 : sendSessions=[ssD, ssE]

This problem exists in TC5.5, TC6.0, and TC7.0. 

I made a patch against trunk.

Best Regards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936777 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

2010-04-22 Thread kfujino
Author: kfujino
Date: Thu Apr 22 10:57:55 2010
New Revision: 936777

URL: http://svn.apache.org/viewvc?rev=936777&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=936777&r1=936776&r2=936777&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Apr 
22 10:57:55 2010
@@ -1463,10 +1463,9 @@ public class DeltaManager extends Cluste
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
 // send session at blocks
-int len = currentSessions.length < getSendAllSessionsSize() ? 
currentSessions.length : getSendAllSessionsSize();
-Session[] sendSessions = new Session[len];
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
-len = i + getSendAllSessionsSize() > currentSessions.length ? 
currentSessions.length - i : getSendAllSessionsSize();
+int len = i + getSendAllSessionsSize() > 
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+Session[] sendSessions = new Session[len];
 System.arraycopy(currentSessions, i, sendSessions, 0, len);
 sendSessions(sender, sendSessions,findSessionTimestamp);
 if (getSendAllSessionsWaitTime() > 0) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936779 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-22 Thread kfujino
Author: kfujino
Date: Thu Apr 22 11:05:57 2010
New Revision: 936779

URL: http://svn.apache.org/viewvc?rev=936779&view=rev
Log:
Proposal for BZ49170.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936779&r1=936778&r2=936779&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 22 11:05:57 2010
@@ -292,3 +292,9 @@ PATCHES PROPOSED TO BACKPORT:
   
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_context_httpOnly.patch
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
+  Do not send duplicated session.
+  http://svn.apache.org/viewvc?view=revision&revision=936777
+  +1: kfujino
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936780 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-04-22 Thread kfujino
Author: kfujino
Date: Thu Apr 22 11:06:46 2010
New Revision: 936780

URL: http://svn.apache.org/viewvc?rev=936780&view=rev
Log:
Proposal for BZ49170.

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=936780&r1=936779&r2=936780&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Apr 22 11:06:46 2010
@@ -128,3 +128,10 @@ PATCHES PROPOSED TO BACKPORT:
   
http://people.apache.org/~kkolinko/patches/2010-04-21_tc55_context_httpOnly.patch
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
+  Do not send duplicated session.
+  http://svn.apache.org/viewvc?view=revision&revision=936777
+  +1: kfujino
+  -1: 
+



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49170] Transmission of duplicated session in DeltaManager#handleGET_ALL_SESSIONS.

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49170

Keiichi Fujino  changed:

   What|Removed |Added

  Component|Cluster |Cluster
Version|unspecified |6.0.26
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default

--- Comment #1 from Keiichi Fujino  2010-04-22 07:08:00 EDT 
---
Fixed in trunk and proposed for 6.0.x and 5.5.x.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 49171] New: Avoid raw type warning in TagSupport

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49171

   Summary: Avoid raw type warning in TagSupport
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=25334)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25334)
Simple fix to suppress raw-type warning (does not affect API!)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936794 - /tomcat/tc6.0.x/trunk/STATUS.txt

2010-04-22 Thread kfujino
Author: kfujino
Date: Thu Apr 22 11:47:41 2010
New Revision: 936794

URL: http://svn.apache.org/viewvc?rev=936794&view=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936794&r1=936793&r2=936794&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 22 11:47:41 2010
@@ -170,7 +170,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix cross-context session expiration
   http://svn.apache.org/viewvc?rev=926716&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Add support for displaying the Spring Security user name in the manager app
@@ -189,7 +189,7 @@ PATCHES PROPOSED TO BACKPORT:
   the sessionCreated event is fired if the Manager is configured to replicate
   session events
   http://svn.apache.org/viewvc?rev=928482&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, kfujino
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48839



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936819 - /tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 13:00:11 2010
New Revision: 936819

URL: http://svn.apache.org/viewvc?rev=936819&view=rev
Log:
Expose properties of VirtualWebappLoader
and WebappClassLoader via JMX.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=936819&r1=936818&r2=936819&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Thu Apr 
22 13:00:11 2010
@@ -65,16 +65,83 @@
   
 
 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
   
+ type="org.apache.catalina.loader.WebappClassLoader">
+
+
+
+
+
+
+
+
+
+
+
+  
 
-  
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936823 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java java/org/apache/catalina/loader/WebappLoader.java java/org/apache/catalina/loader/mbeans-descriptors.xml

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 13:08:01 2010
New Revision: 936823

URL: http://svn.apache.org/viewvc?rev=936823&view=rev
Log:
Add property "searchExternalFirst" to WebappLoader:
if set the external repositories will be searched before
the WEB-INF ones. Default (false) is unchanged behaviour.
Expose the new property via JMX and document it..

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/loader.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=936823&r1=936822&r2=936823&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Apr 
22 13:08:01 2010
@@ -410,6 +410,11 @@ public class WebappClassLoader
 protected boolean hasExternalRepositories = false;
 
 /**
+ * Search external repositories first
+ */
+protected boolean searchExternalFirst = false;
+
+/**
  * need conversion for properties files
  */
 protected boolean needConvert = false;
@@ -535,7 +540,21 @@ public class WebappClassLoader
 this.antiJARLocking = antiJARLocking;
 }
 
-
+/**
+ * @return Returns the searchExternalFirst.
+ */
+public boolean getSearchExternalFirst() {
+return searchExternalFirst;
+}
+
+/**
+ * @param searchExternalFirst Whether external repositories should be 
searched first
+ */
+public void setSearchExternalFirst(boolean searchExternalFirst) {
+this.searchExternalFirst = searchExternalFirst;
+}
+
+
 /**
  * If there is a Java SecurityManager create a read FilePermission
  * or JndiPermission for the file directory path.
@@ -1065,22 +1084,37 @@ public class WebappClassLoader
 try {
 if (log.isTraceEnabled())
 log.trace("  findClassInternal(" + name + ")");
-try {
-clazz = findClassInternal(name);
-} catch(ClassNotFoundException cnfe) {
-if (!hasExternalRepositories) {
-throw cnfe;
-}
-} catch(AccessControlException ace) {
-log.warn("WebappClassLoader.findClassInternal(" + name
-+ ") security exception: " + ace.getMessage(), ace);
-throw new ClassNotFoundException(name, ace);
-} catch (RuntimeException e) {
-if (log.isTraceEnabled())
-log.trace("  -->RuntimeException Rethrown", e);
-throw e;
+if (hasExternalRepositories && searchExternalFirst) {
+try {
+clazz = super.findClass(name);
+} catch(AccessControlException ace) {
+log.warn("WebappClassLoader.findClassInternal(" + name
++ ") security exception: " + ace.getMessage(), 
ace);
+throw new ClassNotFoundException(name, ace);
+} catch (RuntimeException e) {
+if (log.isTraceEnabled())
+log.trace("  -->RuntimeException Rethrown", e);
+throw e;
+}
 }
-if ((clazz == null) && hasExternalRepositories) {
+if ((clazz == null)) {
+try {
+clazz = findClassInternal(name);
+} catch(ClassNotFoundException cnfe) {
+if (!hasExternalRepositories || searchExternalFirst) {
+throw cnfe;
+}
+} catch(AccessControlException ace) {
+log.warn("WebappClassLoader.findClassInternal(" + name
++ ") security exception: " + ace.getMessage(), 
ace);
+throw new ClassNotFoundException(name, ace);
+} catch (RuntimeException e) {
+if (log.isTraceEnabled())
+log.trace("  -->RuntimeException Rethrown", e);
+throw e;
+}
+}
+if ((clazz == null) && hasExternalRepositories && 
!searchExternalFirst) {
 try {
 clazz = super.findClass(name);
 } catch(AccessControlException ace) {
@@ -1138,21 +1172,26 @@ public class WebappClassLoader
 
 URL url = null;
 
-ResourceEntry entry = resourceEntries.get(name);
-if (entry == null) {
-if (securityManager != null) {
-PrivilegedAction dp =
-new PrivilegedFindResourceB

svn commit: r936825 - in /tomcat/trunk/java/org/apache/catalina/loader: VirtualWebappLoader.java mbeans-descriptors.xml

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 13:11:24 2010
New Revision: 936825

URL: http://svn.apache.org/viewvc?rev=936825&view=rev
Log:
Expose the new WebappLoader flag in the VirtualWebappLoader,
but allow alternative name searchVirtualFirst to make it
consistent with the "virtual" terminology.

Now you can decide, whether the virtual paths will
be searched before the webapp or after it.

If searched before, external resources take precendence
over internal ones. Before that change one couldn't overwrite
resources already present in the webapp.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=936825&r1=936824&r2=936825&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Thu 
Apr 22 13:11:24 2010
@@ -82,6 +82,20 @@ public class VirtualWebappLoader extends
 }
 
 /**
+ * @return Returns searchVirtualFirst.
+ */
+public boolean getSearchVirtualFirst() {
+return getSearchExternalFirst();
+}
+
+/**
+ * @param searchVirtualFirst Whether the virtual class path should be 
searched before the webapp
+ */
+public void setSearchVirtualFirst(boolean searchVirtualFirst) {
+setSearchExternalFirst(searchVirtualFirst);
+}
+
+/**
  * Implement the requirements
  * of {...@link LifecycleBase#startInternal()}.
  *

Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=936825&r1=936824&r2=936825&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Thu Apr 
22 13:11:24 2010
@@ -89,6 +89,10 @@
   description="The reloadable flag for this Loader"
  type="boolean"/>
 
+
+
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936837 - /tomcat/trunk/webapps/docs/config/loader.xml

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 13:27:38 2010
New Revision: 936837

URL: http://svn.apache.org/viewvc?rev=936837&view=rev
Log:
Add docs about VirtualWebappLoader.

Modified:
tomcat/trunk/webapps/docs/config/loader.xml

Modified: tomcat/trunk/webapps/docs/config/loader.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/loader.xml?rev=936837&r1=936836&r2=936837&view=diff
==
--- tomcat/trunk/webapps/docs/config/loader.xml (original)
+++ tomcat/trunk/webapps/docs/config/loader.xml Thu Apr 22 13:27:38 2010
@@ -140,6 +140,36 @@
 
   
 
+  
+
+This implementation of Loader is
+org.apache.catalina.loader.VirtualWebappLoader.
+It extends WebappLoader and supports the following
+additional attributes
+
+
+
+  
+Additional repositories to search for resources.
+Multiple elements can be joined using ;
+as a separator.
+Example: 
virtualClasspath="${catalina_base}/myapp_config"
+  
+
+  
+Set to true if you want the virtual
+class path to be searched before
+WEB-INF/classes and WEB-INF/lib.
+Default value is false.
+If searched before, resources located in the virtual
+class path take precendence over resources with the same
+name contained in the webapp.
+  
+
+
+
+  
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936840 - /tomcat/trunk/webapps/docs/changelog.xml

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 13:36:03 2010
New Revision: 936840

URL: http://svn.apache.org/viewvc?rev=936840&view=rev
Log:
Update changelog.

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=936840&r1=936839&r2=936840&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 22 13:36:03 2010
@@ -35,6 +35,9 @@
 
   
 
+  
+Improve and document VirtualWebappLoader. (rjung)
+  
   
 43642: Add prestartminSpareThreads attribute for Executor. 
(jfclere)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936892 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

2010-04-22 Thread rjung
Author: rjung
Date: Thu Apr 22 15:14:11 2010
New Revision: 936892

URL: http://svn.apache.org/viewvc?rev=936892&view=rev
Log:
Respect configurable search order in getURLs().

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=936892&r1=936891&r2=936892&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Apr 
22 15:14:11 2010
@@ -1679,19 +1679,30 @@ public class WebappClassLoader
 
 int filesLength = files.length;
 int jarFilesLength = jarRealFiles.length;
-int length = filesLength + jarFilesLength + external.length;
+int externalsLength = external.length;
+int off = 0;
 int i;
 
 try {
 
-URL[] urls = new URL[length];
-for (i = 0; i < length; i++) {
-if (i < filesLength) {
-urls[i] = getURL(files[i], true);
-} else if (i < filesLength + jarFilesLength) {
-urls[i] = getURL(jarRealFiles[i - filesLength], true);
-} else {
-urls[i] = external[i - filesLength - jarFilesLength];
+URL[] urls = new URL[filesLength + jarFilesLength + 
externalsLength];
+if (searchExternalFirst) {
+for (i = 0; i < externalsLength; i++) {
+urls[i] = external[i];
+}
+off = externalsLength;
+}
+for (i = 0; i < filesLength; i++) {
+urls[off + i] = getURL(files[i], true);
+}
+off += filesLength;
+for (i = 0; i < jarFilesLength; i++) {
+urls[off + i] = getURL(jarRealFiles[i], true);
+}
+off += jarFilesLength;
+if (!searchExternalFirst) {
+for (i = 0; i < externalsLength; i++) {
+urls[off + i] = external[i];
 }
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936898 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 15:33:03 2010
New Revision: 936898

URL: http://svn.apache.org/viewvc?rev=936898&view=rev
Log:
add release date for 5.5.29

Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=936898&r1=936897&r2=936898&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Apr 22 
15:33:03 2010
@@ -108,7 +108,7 @@
 
   
 
-
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936900 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 15:36:01 2010
New Revision: 936900

URL: http://svn.apache.org/viewvc?rev=936900&view=rev
Log:
Arrange alphabetically

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=936900&r1=936899&r2=936900&view=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Apr 22 15:36:01 2010
@@ -269,6 +269,12 @@ A complete list of all the Apache Commit
 
 
 
+Keiichi Fujino (kfujino at apache.org)
+
+
+
+
+
 Tim Funk (funkman at apache.org)
 
 
@@ -340,11 +346,6 @@ open-source projects: you can read more 
 
 
 
-
-Keiichi Fujino (kfujino at apache.org)
-
-
-
 
 
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=936900&r1=936899&r2=936900&view=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Thu Apr 22 15:36:01 2010
@@ -59,6 +59,10 @@ A complete list of all the Apache Commit
 Ian Darwin (idarwin at apache.org)
 
 
+Keiichi Fujino (kfujino at apache.org)
+
+
+
 Tim Funk (funkman at apache.org)
 
 
@@ -103,9 +107,6 @@ open-source projects: you can read more 
 Tim Whittington (timw at apache.org)
 
 
-Keiichi Fujino (kfujino at apache.org)
-
-
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936948 - in /tomcat/site/trunk: docs/bugreport.html docs/lists.html xdocs/bugreport.xml xdocs/lists.xml

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 16:38:23 2010
New Revision: 936948

URL: http://svn.apache.org/viewvc?rev=936948&view=rev
Log:
bugreport.html: Remove search links for the mailing lists from the bugreport 
page. The lists.html page provides more recent links for that. Update the 
"Recently fixed issues" section.
lists.html: Add links to the "Mail Archive" mail archive site

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/lists.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=936948&r1=936947&r2=936948&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Thu Apr 22 16:38:23 2010
@@ -375,15 +375,6 @@ problem you are having before reporting 
   Others may have already found a solution.  The tomcat-user,
   taglibs-user or tomcat-dev list archives may contain
   discussions which will help you resolve the problem.
-  Here are three resources to view the Apache Tomcat User List archives:
-   http://marc.theaimsgroup.com/?l=tomcat-user&r=1&w=2";>Mailing list 
ARChives,
-   http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse,
-   http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail 
Archive.
-
-  Here are three resources to view the Apache Tomcat Developer List 
archives
-  http://marc.theaimsgroup.com/?l=tomcat-dev&r=1&w=2";>Mailing list 
ARChives,
-  http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Eyebrowse,
-  and http://www.mail-archive.com/dev@tomcat.apache.org/";>Mail 
Archive.
 
 See the mailing lists page for the further
 information on the lists.
@@ -448,17 +439,15 @@ problem you are having before reporting 
 Supported Tomcat projects:
 
   
-Tomcat 7 - future Tomcat 7.0
+Tomcat 7, Tomcat 6 and Tomcat 5 – Tomcat 7.0.x,
+  6.0.x and 5.5.x, respectively
   
-Tomcat 6 - Tomcat 6.0.x
+Tomcat Connectors – Integration of Tomcat with other Web 
servers
   
-Tomcat 5 - Tomcat 5.5.x
+Tomcat Native – APR based native HTTP and AJP connectors for 
Tomcat
   
-Tomcat Connectors - Integration of Tomcat with other Web servers
-  
-Tomcat Native - APR based native HTTP and AJP connectors for Tomcat
-  
-Taglibs - Apache Taglibs
+Taglibs – Apache Taglibs
+
 
   
 
@@ -510,15 +499,13 @@ problem you are having before reporting 
 
 
 
-
-Problems fixed in released versions of Tomcat can be found on the
-Changelog pages in Documentation. Here are the links to them:
+The Changelog pages list the problems fixed in released
+versions of Tomcat. They can be found in Documentation:
 
 
   
 http://tomcat.apache.org/tomcat-6.0-doc/changelog.html";>Tomcat 6.0,
 http://tomcat.apache.org/tomcat-5.5-doc/changelog.html";>Tomcat 5.5
-Changelog
   
   
 http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>Tomcat
 Connectors
@@ -528,7 +515,7 @@ problem you are having before reporting 
   
 
 
-A copy of the above files for not yet released versions can be found
+The Changelog files for not yet released versions can 
be found
 in the sources repository. Those files are in XML format, but if you are
 using a fairly modern browser it will render them for you:
 
@@ -536,19 +523,18 @@ problem you are having before reporting 
   
 http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml";>Tomcat
 6.0,
 http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml";>Tomcat
 5.5
-changelog.xml
   
 
 
-Patches that are already prepared, but have not yet collected enough
-committer votes to be applied, are listed in the STATUS files in the
-root of the source trees for the released versions of Tomcat.
+The Status files are used by committers to review and vote for
+the patches that are proposed for the stable versions of Tomcat. The issues
+mentioned there already have patches, but have not yet gathered enough
+votes for those to be applied:
 
 
   
 http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?view=markup";>Tomcat
 6.0,
 http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?view=markup";>Tomcat
 5.5
-STATUS.txt
   
 
   

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=936948&r1=936947&r2=936948&view=diff
==
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Thu Apr 22 16:38:23 2010
@@ -358,8 +358,9 @@ Tomcat questions to Eric or Rick themsel
 a

Question about context aliases

2010-04-22 Thread Rainer Jung
Experimenting on the extreme side of things: when trying to use 
aliases="/=/some/path" I can't get any resource to load:


- there is /some/path/test.properties
- servletContext().getResourceAsStream("/test.properties") returns null.

It works, once I use aliases="/myapp=/some/path" and 
servletContext().getResourceAsStream("/myapp/test.properties").


Is that expected?

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Question about context aliases

2010-04-22 Thread Mark Thomas
On 22/04/2010 17:40, Rainer Jung wrote:
> Experimenting on the extreme side of things: when trying to use
> aliases="/=/some/path" I can't get any resource to load:
> 
> - there is /some/path/test.properties
> - servletContext().getResourceAsStream("/test.properties") returns null.
> 
> It works, once I use aliases="/myapp=/some/path" and
> servletContext().getResourceAsStream("/myapp/test.properties").
> 
> Is that expected?

Nope. Thats broken.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936971 - in /tomcat/site/trunk: docs/bugreport.html xdocs/bugreport.xml

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 17:17:27 2010
New Revision: 936971

URL: http://svn.apache.org/viewvc?rev=936971&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49028
Include a more explicit section on patch submission

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/xdocs/bugreport.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=936971&r1=936970&r2=936971&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Thu Apr 22 17:17:27 2010
@@ -212,11 +212,11 @@
 
 Recent version
 
+
+
 
 Recently fixed issues
 
-
-
 
 Reporting Apache Tomcat bugs
 
@@ -336,16 +336,16 @@ problem you are having before reporting 
 
 
 
-Documentation - Review the documentation for the version
-  of Apache Tomcat you are using.  The problem you are having may already
-  be addressed in the docs.
+Documentation – Review the documentation for the version
+  of Apache Tomcat that you are using.  The problem that you are
+  facing may already be addressed in the docs.
 
-Logs - The logs which Apache Tomcat generates can be a valuable
+Logs – The logs which Apache Tomcat generates can be a valuable
   resource when trying to diagnose a problem.  Please review them.
   You may want to enable debug output in your Apache Tomcat configuration
   so that you have more information to help diagnose the problem.
 
-FAQ's - Search the http://wiki.apache.org/tomcat/FAQ";>
+FAQ's – Search the http://wiki.apache.org/tomcat/FAQ";>
   Tomcat Frequently Asked Questions.
 
   
@@ -484,10 +484,19 @@ problem you are having before reporting 
 
 
 
-
-  
+
+
+
+
 
-
+
+
+
+
+
+
+
+
 
 
 Recently fixed issues
@@ -497,6 +506,7 @@ problem you are having before reporting 
 
 
 
+
 
 
 The Changelog pages list the problems fixed in released
@@ -537,16 +547,6 @@ problem you are having before reporting 
 http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?view=markup";>Tomcat
 5.5
   
 
-  
-
-
-
-
-
-
-
-
-
 
 
 
@@ -576,59 +576,76 @@ bug in your web application.
 
 Please provide as much information as possible. It is
 very hard to fix a bug if the person looking into the problem cannot
-reproduce it.  Here is a listing of information which should be included:
+reproduce it.  Here is a listing of information which should be included:
 
   Environment details:
 
   
-Version - Apache Tomcat version, if from a nightly build,
+Version – Apache Tomcat version, if from a nightly build,
   version and date of build. Please not only select the version from a
   list, but also repeat it in the text of your bug report.
   
-Platform and OS - Hardware platform and operating system
+Platform and OS – Hardware platform and operating system
   Tomcat is running on.
   
-Java version - Vendor and version of your Java Runtime
+Java version – Vendor and version of your Java Runtime
   Environment used to run Tomcat.
 
   
   Configuration:
 
   
-Component - Apache Tomcat component which has the bug.
+Component – Apache Tomcat component which has the bug.
   If you do not know, just guess.
   
-Web Server - Web Server and version, Apache Tomcat Connector
+Web Server – Web Server and version, Apache Tomcat Connector
   and version.
   
-Configuration - Attach configuration files if they would
-  help track down the bug.
+Configuration – Attach configuration files if they would
+  help to track down the bug.
 
   
   Evidences:
 
   
-Log file excerpts - Review your logs files, reproduce the bug
+Log file excerpts – Review your logs files, reproduce the bug
   with debugging enabled in your Apache Tomcat configuration.  Then submit
-  any relevant sections of the log which help document the bug.
+  any relevant sections of the log which help to document the bug.
   
-Stack Traces - Any stack traces generated by the bug.
+Stack Traces – Any stack traces generated by the bug.
 
   
   
-Example - Example configuration files or web applications which
+Example – Example configuration files or web applications which
 demonstrate the bug.  When submitting an example which reproduces the bug,
 please try to make it as simple as possible.
   
-Bug Fix Patch - A patch created using diff -u or
-svn diff which fixes the bug.
-(If you have found a bug fix which can be applied to the Apache Tomcat 
code)
+Bug Fix Patch – A patch that fixes the issue, if you know
+how to fix it.
   
-Miscellaneous - Any other information you feel will help track
-down the problem.  For example other Java API's and versions being used
-with Apache Tomcat.
+Miscellaneous – Any other information that you feel will help
+to track down the problem.  

DO NOT REPLY [Bug 49028] Include a more explicit section on patch submission

2010-04-22 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49028

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Konstantin Kolinko  2010-04-22 
13:20:52 EDT ---
Fixed in r936971

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r936982 - /tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 17:42:32 2010
New Revision: 936982

URL: http://svn.apache.org/viewvc?rev=936982&view=rev
Log:
Replace spaces with underscore in HTML anchor names.
To preserve compatibility each (sub)section will now generate two anchors:
the old one and the new one, if they differ.

Modified:
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=936982&r1=936981&r2=936982&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Thu Apr 22 17:42:32 2010
@@ -179,11 +179,15 @@
 
   
 
+
+  
+
 
   
   
   
-  
+  ()
+  
   
   
   
@@ -217,11 +221,15 @@
   
   
 
+
+  
+
 
   
   
   
-  
+  ()
+  
   
   
   
@@ -247,7 +255,10 @@
   
   
 
-
+
+  
+
+
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r937059 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2010-04-22 Thread kkolinko
Author: kkolinko
Date: Thu Apr 22 20:56:54 2010
New Revision: 937059

URL: http://svn.apache.org/viewvc?rev=937059&view=rev
Log:
vote

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=937059&r1=937058&r2=937059&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Apr 22 20:56:54 2010
@@ -133,5 +133,7 @@ PATCHES PROPOSED TO BACKPORT:
   Do not send duplicated session.
   http://svn.apache.org/viewvc?view=revision&revision=936777
   +1: kfujino
+  +1: kkolinko: to apply to the both DeltaManager classes in TC 5.5 (in
+ o.a.c.ha.session and o.a.c.cluster.session packages)
   -1: 
 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=937059&r1=937058&r2=937059&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 22 20:56:54 2010
@@ -296,5 +296,5 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
   Do not send duplicated session.
   http://svn.apache.org/viewvc?view=revision&revision=936777
-  +1: kfujino
+  +1: kfujino, kkolinko
   -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org