DO NOT REPLY [Bug 48379] Session cookie domain and path configuration support

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48379

--- Comment #3 from Mark Thomas  2010-03-10 08:29:09 UTC ---
See also https://issues.apache.org/bugzilla/show_bug.cgi?id=48258

-- 
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 48258] Creating a session cookie with a specific default domain.

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48258

--- Comment #8 from Mark Thomas  2010-03-10 08:29:14 UTC ---
See also https://issues.apache.org/bugzilla/show_bug.cgi?id=48379

-- 
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: r921266 - /tomcat/tc5.5.x/trunk/STATUS.txt

2010-03-10 Thread jfclere
Author: jfclere
Date: Wed Mar 10 09:27:05 2010
New Revision: 921266

URL: http://svn.apache.org/viewvc?rev=921266&view=rev
Log:
My votes.

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=921266&r1=921265&r2=921266&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 09:27:05 2010
@@ -98,13 +98,13 @@ PATCHES PROPOSED TO BACKPORT:
   (Remove linewrap between checksum and filename that occurs there with
   ANT 1.7+)
   http://people.apache.org/~kkolinko/patches/2010-03-07_tc55_md5.patch
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
   Ensure multiple threads do not end up with the same InputStream
   http://svn.apache.org/viewvc?rev=920858&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
@@ -118,7 +118,7 @@ PATCHES PROPOSED TO BACKPORT:
   Improve exception processing in CustomObjectInputStream#resolveClass(),
   to help find the cause behind BZ 48007.
   http://svn.apache.org/viewvc?rev=920912&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701



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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Mark Thomas
On 09/03/2010 17:19, jean-frederic clere wrote:
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.26/
> 
> According to the release process, the 6.0.26 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [X] Stable

OpenPGP signatures verified

Signing key in ASF web of trust

-src.tar.gz == -src.zip with the exception of line endings to text files
(as expected)

-src.zip == TOMCAT_6_0_26 tag with the exception of the version
properties (as expected)

Windows installer works on 64-bit Windows (with 64-bit JVM)

With STRICT_SERVLET_COMPLIANCE=true and Jasper development mode turned off:
Servlet 2.5 TCK passes
JSP 2.1 TCK passes

Mark



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



svn commit: r921331 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/docs/config/

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 12:54:16 2010
New Revision: 921331

URL: http://svn.apache.org/viewvc?rev=921331&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48258 for TC7
Allow session cookie domain to be over-ridden by context configuration in the 
same way httpOnly may be
Based on a patch by Donn Aiken

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/config/context.xml

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=921331&r1=921330&r2=921331&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Mar 10 12:54:16 2010
@@ -175,6 +175,7 @@ public interface Context extends Contain
  */
 public void setCookies(boolean cookies);
 
+
 /**
  * Gets the value of the use HttpOnly cookies for session cookies flag.
  * 
@@ -192,6 +193,25 @@ public interface Context extends Contain
  */
 public void setUseHttpOnly(boolean useHttpOnly);
 
+
+/**
+ * Gets the domain to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @return  The value of the default session cookie domain or null if not
+ *  specified
+ */
+public String getSessionCookieDomain();
+
+
+/**
+ * Sets the domain to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @param sessionCookieDomain   The domain to use
+ */
+public void setSessionCookieDomain(String sessionCookieDomain);
+
 /**
  * Return the "allow crossing servlet contexts" flag.
  */

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=921331&r1=921330&r2=921331&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Mar 10 
12:54:16 2010
@@ -2279,7 +2279,8 @@ public class Request
 secure,
 context.getUseHttpOnly(),
 response.getConnector().getEmptySessionPath(),
-context.getEncodedPath());
+context.getEncodedPath(),
+context.getSessionCookieDomain());
 response.addCookie(newCookie);
 }
 }
@@ -2560,7 +2561,8 @@ public class Request
 isSecure(),
 context.getUseHttpOnly(),
 connector.getEmptySessionPath(),
-context.getEncodedPath());
+context.getEncodedPath(),
+context.getSessionCookieDomain());
 
 response.addCookieInternal(cookie);
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java?rev=921331&r1=921330&r2=921331&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
Wed Mar 10 12:54:16 2010
@@ -112,10 +112,12 @@ public class ApplicationSessionCookieCon
  * @param httpOnlyShould session cookie be configured as httpOnly
  * @param emptyPath   Should session cookie be configured with empty path
  * @param contextPath Context path to use if required   
+ * @param domain  Domain to use for the session cookie. If null, use 
the
+ *domain specified by the scc parameter.
  */
 public static Cookie createSessionCookie(SessionCookieConfig scc,
 String sessionId, boolean secure, boolean httpOnly,
-boolean emptyPath, String contextPath) {
+boolean emptyPath, String contextPath, String domain) {
 
// Session config can over-ride default name  
String cookieName = scc.getName();
@@ -127,9 +129,14 @@ public class ApplicationSessionCookieCon
// Just apply the defaults.
cookie.setMaxAge(scc.getMaxAge());
cookie.setComment(scc.getComment());
-   // Avoid possible NPE
-   if (scc.getDomain() != null) {
-   

DO NOT REPLY [Bug 48379] Session cookie domain and path configuration support

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48379

Mark Thomas  changed:

   What|Removed |Added

 CC||donn.ai...@gmail.com

--- Comment #4 from Mark Thomas  2010-03-10 12:56:12 UTC ---
*** Bug 48258 has been marked as a duplicate of this bug. ***

-- 
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 48258] Creating a session cookie with a specific default domain.

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48258

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #9 from Mark Thomas  2010-03-10 12:56:12 UTC ---
I've applied a patch to Tomcat 7 based on your patch. I plan to make a couple
of related changes (bug 48379) to Tomcat 7 and then apply a combined patch to
Tomcat 6.

I'm marking this issue as a duplicate of 48379 and will track further progress
in bug 48376.

*** This bug has been marked as a duplicate of bug 48379 ***

-- 
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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Mladen Turk

On 03/09/2010 06:19 PM, jean-frederic clere wrote:

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.26/

According to the release process, the 6.0.26 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable



Tested on linux and windows.

Regards
--
^TM

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



Reusing instances

2010-03-10 Thread Mladen Turk

Hi,

Anyone knows what would be the major points that would
be problematic when launching multiple instances in the same
directory.
Lets presume that connectors share the same sockets among
multiple virtual machines using the JVM loaded inside each
Httpd or IIS worker process for example.

As I see it there are few things that would have to be addressed.
1. Session sharing
2. Logging issues (multiple processes write to the same file)
3. What about war deployments
4. Do we have any other resources which access should be
   synchronized?



Regards
--
^TM

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



svn commit: r921352 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/docs/config/

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 13:56:28 2010
New Revision: 921352

URL: http://svn.apache.org/viewvc?rev=921352&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48379
Allow session cookie path to be configured per context
With this option, the servlet 3 options and Connector.emptySessionPath there 
were just too many places this was being configured so the Connector option has 
been removed for Tomcat 7.

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=921352&r1=921351&r2=921352&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Mar 10 13:56:28 2010
@@ -211,13 +211,32 @@ public interface Context extends Contain
  * @param sessionCookieDomain   The domain to use
  */
 public void setSessionCookieDomain(String sessionCookieDomain);
+
+
+/**
+ * Gets the path to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @return  The value of the default session cookie path or null if not
+ *  specified
+ */
+public String getSessionCookiePath();
+
+
+/**
+ * Sets the path to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @param sessionCookiePath   The path to use
+ */
+public void setSessionCookiePath(String sessionCookiePath);
+
 
 /**
  * Return the "allow crossing servlet contexts" flag.
  */
 public boolean getCrossContext();
 
-
 
 /**
  * Return the alternate Deployment Descriptor name.

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=921352&r1=921351&r2=921352&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Mar 10 
13:56:28 2010
@@ -105,12 +105,6 @@ public class Connector extends Lifecycle
 
 
 /**
- * Use "/" as path for session cookies ?
- */
-protected boolean emptySessionPath = false;
-
-
-/**
  * The "enable DNS lookups" flag for this Connector.
  */
 protected boolean enableLookups = false;
@@ -398,29 +392,6 @@ public class Connector extends Lifecycle
 
 
 /**
- * Return the "empty session path" flag.
- */
-public boolean getEmptySessionPath() {
-
-return (this.emptySessionPath);
-
-}
-
-
-/**
- * Set the "empty session path" flag.
- *
- * @param emptySessionPath The new "empty session path" flag value
- */
-public void setEmptySessionPath(boolean emptySessionPath) {
-
-this.emptySessionPath = emptySessionPath;
-setProperty("emptySessionPath", String.valueOf(emptySessionPath));
-
-}
-
-
-/**
  * Return the "enable DNS lookups" flag.
  */
 public boolean getEnableLookups() {

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=921352&r1=921351&r2=921352&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Mar 10 
13:56:28 2010
@@ -2273,14 +2273,8 @@ public class Request
 
 if (response != null) {
 Cookie newCookie =
-ApplicationSessionCookieConfig.createSessionCookie(
-context.getServletContext().getSessionCookieConfig(),
-newSessionId,
-secure,
-context.getUseHttpOnly(),
-response.getConnector().getEmptySessionPath(),
-context.getEncodedPath(),
-context.getSessionCookieDomain());
+ApplicationSessionCookieConfig.createSessionCookie(context,
+newSessionId, secure);
 response.addCookie(newCookie);
 }
 }
@@ -2542,7 +

Re: Reusing instances

2010-03-10 Thread Mark Thomas
On 10/03/2010 13:55, Mladen Turk wrote:
> Hi,
> 
> Anyone knows what would be the major points that would
> be problematic when launching multiple instances in the same
> directory.
> Lets presume that connectors share the same sockets among
> multiple virtual machines using the JVM loaded inside each
> Httpd or IIS worker process for example.
> 
> As I see it there are few things that would have to be addressed.
> 1. Session sharing
> 2. Logging issues (multiple processes write to the same file)
> 3. What about war deployments
> 4. Do we have any other resources which access should be
>synchronized?

Work directory, temp directory come to mind.

Easier to use a CATALINA_HOME/CATALINA_BASE style approach.

Mark



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



DO NOT REPLY [Bug 48379] Session cookie domain and path configuration support

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48379

--- Comment #5 from Mark Thomas  2010-03-10 14:00:02 UTC ---
Bug 48258 implemented domain configuration and I've just added path config to
trunk. Cookie name is next.

-- 
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 propchange: r921352 - svn:log

2010-03-10 Thread markt
Author: markt
Revision: 921352
Modified property: svn:log

Modified: svn:log at Wed Mar 10 14:01:01 2010
--
--- svn:log (original)
+++ svn:log Wed Mar 10 14:01:01 2010
@@ -1,3 +1,4 @@
 Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48379
 Allow session cookie path to be configured per context
 With this option, the servlet 3 options and Connector.emptySessionPath there 
were just too many places this was being configured so the Connector option has 
been removed for Tomcat 7.
+Based on a patch by Brane F. Gracnar


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



DO NOT REPLY [Bug 46925] Nested groups in JNDI realm with non-recursive implementation

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46925

--- Comment #2 from Mark Thomas  2010-03-10 14:11:42 UTC ---
This improvement was added to 6.0.x in 6.0.21 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



Re: Reusing instances

2010-03-10 Thread Mladen Turk

On 03/10/2010 02:58 PM, Mark Thomas wrote:


Work directory, temp directory come to mind.

Easier to use a CATALINA_HOME/CATALINA_BASE style approach.



The idea IS to use the same directory and same files.
I'm trying to locate things that presume Tomcat is running
as self contained singleton application and see whether
it can be made to be aware of multiple processes that
constitute a single servlet engine instance.

Work and temp could probably have their own process-id
like prefix if not possible to reuse the files or if
sync would be too complex.


Regards
--
^TM

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



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

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 14:41:07 2010
New Revision: 921372

URL: http://svn.apache.org/viewvc?rev=921372&view=rev
Log:
Remove some changes that have since made it into 6.0.x

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=921372&r1=921371&r2=921372&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 10 14:41:07 2010
@@ -40,10 +40,6 @@
 asynchronous support is not yet complete. (markt/fhanik)
   
   
-46925: Replace recursive search for nested roles with
-iterative search. Patch provided by Stefan Zoerner. (rjung)
-  
-  
 Switch from AnnotationProcessor to InstanceManager. Patch provided by
 David Jecks with modifications by Remy. (remm/fhanik)
   
@@ -55,30 +51,15 @@
 651977 Add some missing control checks to
 ThreadWithAttributes. (markt) 
   
-  
-656084 Small performance improvement for NIO. (fhanik) 
-  
-  
-666232 Prevent NPE stacktrace and lost log message when
-logger has been shutdown. Instead log the error, with the message.
-(fhanik)
-  
   
 677640 Add a startup class that does not require any
 configuration files. (costin)
   
   
-677910 Use platform mbean server by default. (costin)
-  
-  
 700532 Log if temporary file operations within the CGI
 servlet fail. Make sure header Reader is closed on failure. (markt)
   
   
-707670 Correctly handle timeouts with Comet so events do not
-stop. (fhanik)
-  
-  
 708541 Delete references to DefaultContext which was removed
 in 6.0.x. (markt)
   
@@ -87,13 +68,6 @@
 for JULI. (fhanik)
   
   
-713953 Include name of attribute when logging failure of
-session attribute serialization. (mturk)
-  
-  
-Improve JNDI realm compatibility with Active Directory. (rjung)
-  
-  
 Give session thisAccessedTime and lastAccessedTime clear semantics.
 (rjung)
   
@@ -141,10 +115,6 @@
 dependent line endings rather than always using \r\n.
 (markt)
   
-  
-701902 Add support for full client-cert chains to AJP.
-(billbarker)
-  
   
 Use tc-native 1.2.x which is based on APR 1.3.3+ (mturk)
   



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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Konstantin Kolinko
2010/3/9 jean-frederic clere :
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.26/
>
> According to the release process, the 6.0.26 tag is:
> [x] Stable
>

Best regards,
Konstantin Kolinko

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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Jim Jagielski

On Mar 9, 2010, at 12:19 PM, jean-frederic clere wrote:

> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.26/
> 
> According to the release process, the 6.0.26 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [X] Stable
> 


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



svn commit: r921389 - in /tomcat/site/trunk: .classpath docs/migration.html xdocs/migration.xml

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 15:11:50 2010
New Revision: 921389

URL: http://svn.apache.org/viewvc?rev=921389&view=rev
Log:
Add some Tomcat 7 migration information

Added:
tomcat/site/trunk/.classpath   (with props)
Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml

Added: tomcat/site/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/.classpath?rev=921389&view=auto
==
--- tomcat/site/trunk/.classpath (added)
+++ tomcat/site/trunk/.classpath Wed Mar 10 15:11:50 2010
@@ -0,0 +1,5 @@
+
+
+   
+   
+

Propchange: tomcat/site/trunk/.classpath
--
svn:eol-style = native

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=921389&r1=921388&r2=921389&view=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Wed Mar 10 15:11:50 2010
@@ -409,6 +409,197 @@ compatibility problems.
 
 
 
+
+
+
+
+
+6.0.x to 7.0.x
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+Java 6 required
+
+
+
+
+
+
+
+
+Apache Tomcat 7.0.x requires Java 6. Apache Tomcat 6.0.x required Java
+5.
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+Manager application
+
+
+
+
+
+
+
+  
+The Manager application has been re-structured for Tomcat 7 onwards and
+some of URLs have changed. All URLs used to access the Manager application
+should now start with one of the following options:
+
+
+  /html for the HTML GUI
+  /text for the text interface
+  /jmxproxy for the JMX proxy
+  /status for the status pages
+
+
+   Note that the URL for the text interface has changed from
+   "" to "/text".
+
+The roles required to use the Manager application were changed from the
+single manager role to the following four roles. You will need to
+assign the role(s) required for the functionality you wish to access.
+
+
+  
+manager - allows access to the HTML GUI and the status
+  pages
+  
+manager-script - allows access to the text interface and the
+  status pages
+  
+manager-jmx - allows access to the JMX proxy and the status
+  pages
+  
+manager-status - allows access to the status pages only
+
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+Host Manager application
+
+
+
+
+
+
+
+  
+The Host Manager application has been re-structured for Tomcat 7 onwards
+and some of URLs have changed. All URLs used to access the Manager
+application should now start with one of the following options:
+
+
+  /html for the HTML GUI
+  /text for the text interface
+
+
+   Note that the URL for the text interface has changed from
+   "" to "/text".
+
+The roles required to use the Host Manager application were changed from
+the single admin role to the following two roles. You will need to
+assign the role(s) required for the functionality you wish to access.
+
+
+  
+admin - allows access to the HTML GUI and the status
+  pages
+  
+admin-script - allows access to the text interface and the
+  status pages
+
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+Session cookie configuration
+
+
+
+
+
+
+
+
+With the addition of SessionCookieConfig in the Servlet 3.0
+specification, a number of session cookie configuration options have been
+removed to reduce configuration and code complexity.
+
+
+  Connector.emptySessionPath: This has been removed. An equivalent
+  effect can be obtained by configuring sessionCookiePath="/" in the global
+  context.xml (in CATALINA_BASE/conf/context.xml).
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=921389&r1=921388&r2=921389&view=diff
==
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Wed Mar 10 15:11:50 2010
@@ -82,5 +82,89 @@ compatibility problems.
 
 
 
+
+
+  
+
+Apache Tomcat 7.0.x requires Java 6. Apache Tomcat 6.0.x required Java
+5.
+
+  
+
+  
+  
+The Manager application has been re-structured for Tomcat 7 onwards and
+some of URLs have changed. All URLs used to access the Manager application
+should now start with one of the following options:
+
+
+  /html for the HTML GUI
+  /text for the text interface
+  /jmxproxy for the JMX proxy
+  /status for the status p

svn commit: r921390 - /tomcat/site/trunk/.classpath

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 15:13:37 2010
New Revision: 921390

URL: http://svn.apache.org/viewvc?rev=921390&view=rev
Log:
Remove accidentally added file

Removed:
tomcat/site/trunk/.classpath


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



svn commit: r921426 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ webapps/docs/config/

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 16:18:10 2010
New Revision: 921426

URL: http://svn.apache.org/viewvc?rev=921426&view=rev
Log:
Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48379
Allow session cookie name to be configured per context
With this option, the servlet 3 options and system property there were just too 
many places this was being configured so the system property option has been 
removed for Tomcat 7.

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=921426&r1=921425&r2=921426&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Mar 10 16:18:10 2010
@@ -177,6 +177,25 @@ public interface Context extends Contain
 
 
 /**
+ * Gets the name to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @return  The value of the default session cookie name or null if not
+ *  specified
+ */
+public String getSessionCookieName();
+
+
+/**
+ * Sets the name to use for session cookies. Overrides any setting that
+ * may be specified by the application.
+ * 
+ * @param sessionCookieName   The name to use
+ */
+public void setSessionCookieName(String sessionCookieName);
+
+
+/**
  * Gets the value of the use HttpOnly cookies for session cookies flag.
  * 
  * @return true if the HttpOnly flag should be set on session

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=921426&r1=921425&r2=921426&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Mar 10 16:18:10 2010
@@ -268,9 +268,7 @@ public final class Globals {
  * The name of the cookie used to pass the session identifier back
  * and forth with the client.
  */
-public static final String SESSION_COOKIE_NAME =
-System.getProperty("org.apache.catalina.SESSION_COOKIE_NAME",
-"JSESSIONID");
+public static final String SESSION_COOKIE_NAME = "JSESSIONID";
 
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=921426&r1=921425&r2=921426&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Mar 
10 16:18:10 2010
@@ -29,6 +29,7 @@ import org.apache.catalina.Globals;
 import org.apache.catalina.Wrapper;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.catalina.comet.CometEvent;
+import org.apache.catalina.core.ApplicationSessionCookieConfig;
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.catalina.util.ServerInfo;
 import org.apache.catalina.util.URLEncoder;
@@ -722,9 +723,12 @@ public class CoyoteAdapter implements Ad
 if (count <= 0)
 return;
 
+String sessionCookieName =
+ApplicationSessionCookieConfig.getSessionCookieName(context);
+
 for (int i = 0; i < count; i++) {
 ServerCookie scookie = serverCookies.getCookie(i);
-if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) {
+if (scookie.getName().equals(sessionCookieName)) {
 // Override anything requested in the URL
 if (!request.isRequestedSessionIdFromCookie()) {
 // Accept only the first session id cookie

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java?rev=921426&r1=921425&r2=921426&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
Wed Mar 10 16:18:10 2010
@@ -122,11 +122,7 @@ public class ApplicationSessionCooki

svn commit: r921428 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 16:20:45 2010
New Revision: 921428

URL: http://svn.apache.org/viewvc?rev=921428&view=rev
Log:
More migration notes

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

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=921428&r1=921427&r2=921428&view=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Wed Mar 10 16:20:45 2010
@@ -578,6 +578,11 @@ compatibility problems.
   Connector.emptySessionPath: This has been removed. An equivalent
   effect can be obtained by configuring sessionCookiePath="/" in the global
   context.xml (in CATALINA_BASE/conf/context.xml).
+
+  org.apache.catalina.SESSION_COOKIE_NAME system property: This has 
been
+  removed. An equivalent effect can be obtained by configuring the
+  sessionCookieName attribute for the global context.xml
+  (in CATALINA_BASE/conf/context.xml).
 
 
   

Modified: tomcat/site/trunk/xdocs/migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=921428&r1=921427&r2=921428&view=diff
==
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Wed Mar 10 16:20:45 2010
@@ -160,6 +160,11 @@ compatibility problems.
   Connector.emptySessionPath: This has been removed. An equivalent
   effect can be obtained by configuring sessionCookiePath="/" in the global
   context.xml (in CATALINA_BASE/conf/context.xml).
+
+  org.apache.catalina.SESSION_COOKIE_NAME system property: This has 
been
+  removed. An equivalent effect can be obtained by configuring the
+  sessionCookieName attribute for the global context.xml
+  (in CATALINA_BASE/conf/context.xml).
 
 
   



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



DO NOT REPLY [Bug 48379] Session cookie domain and path configuration support

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48379

--- Comment #6 from Mark Thomas  2010-03-10 16:22:36 UTC ---
This has now been implemented in trunk with a modified patch that takes account
of the additional session cookie configuration options available in Servlet 3.0

-- 
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 48879] Duplicate local variable status

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48879

--- Comment #2 from André Schäfer  2010-03-10 
16:23:35 UTC ---
I checked with 6.0.25 from SVN and it seems to be fixed.
Sorry for opening this new BUG, didn't find the other one.

Thank you for your efforts.

-- 
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 48879] Duplicate local variable status

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48879

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #3 from Mark Thomas  2010-03-10 16:25:08 UTC ---
NO problem. Thanks for checking and reporting back.

*** This bug has been marked as a duplicate of bug 48616 ***

-- 
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 48616] Struts 1.2 and bean:define tag throws jsp 1.1 regression exception

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48616

Mark Thomas  changed:

   What|Removed |Added

 CC||andre.schae...@namics.com

--- Comment #27 from Mark Thomas  2010-03-10 16:25:08 UTC ---
*** Bug 48879 has been marked as a duplicate of this bug. ***

-- 
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: r921444 - /tomcat/trunk/bin/catalina.sh

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 16:46:46 2010
New Revision: 921444

URL: http://svn.apache.org/viewvc?rev=921444&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48793
Make catalina.sh more robust to different return values on different platforms
Patch provided by Thomas GL

Modified:
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=921444&r1=921443&r2=921444&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Mar 10 16:46:46 2010
@@ -354,7 +354,7 @@ elif [ "$1" = "stop" ] ; then
   SLEEP=5
   if [ ! -z "$1" ]; then
 echo $1 | grep "[^0-9]" > /dev/null 2>&1
-if [ $? -eq 1 ]; then
+if [ $? -gt 0 ]; then
   SLEEP=$1
   shift
 fi
@@ -369,7 +369,7 @@ elif [ "$1" = "stop" ] ; then
   if [ ! -z "$CATALINA_PID" ]; then
 if [ -f "$CATALINA_PID" ]; then
   kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
-  if [ $? -eq 1 ]; then
+  if [ $? -gt 0 ]; then
 echo "PID file ($CATALINA_PID) found but no matching process was 
found. Stop aborted."
 exit 1
   fi
@@ -390,7 +390,7 @@ elif [ "$1" = "stop" ] ; then
 if [ -f "$CATALINA_PID" ]; then
   while [ $SLEEP -ge 0 ]; do 
 kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
-if [ $? -eq 1 ]; then
+if [ $? -gt 0 ]; then
   rm $CATALINA_PID
   break
 fi



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



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

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 16:48:50 2010
New Revision: 921446

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

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=921446&r1=921445&r2=921446&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 10 16:48:50 2010
@@ -166,3 +166,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=921166&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48793
+  Make catalina.sh more robust to different return values on different 
platforms
+  Patch provided by Thomas GL
+  http://svn.apache.org/viewvc?rev=921444&view=rev
+  +1: markt
+  -1: 



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



DO NOT REPLY [Bug 48793] catalina.sh: "stop" errors on HP-UX

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48793

--- Comment #1 from Mark Thomas  2010-03-10 16:48:54 UTC ---
Thanks for the patch. It has been applied to trunk and proposed for 6.0.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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Filip Hanik - Dev Lists

On 03/09/2010 10:19 AM, jean-frederic clere wrote:

[X] Stable
   



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



Re: [VOTE] Release build 6.0.26

2010-03-10 Thread Henri Gomez
> [X] Stable

Les admin français vous remercient :)

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



[g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

2010-03-10 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk has an issue affecting its community integration.
This issue affects 2 projects,
 and has been outstanding for 12 runs.
The current state of this project is 'Failed', with reason 'Missing Build 
Outputs'.
For reference only, the following projects are affected by this:
- tomcat-trunk :  Java Servlet 3.0 & Server Pages JSP 2.1 implementation 
(for ...
- tomcat-trunk-test :  Java Servlet 3.0 & Server Pages JSP 2.1 
implementation (for ...


Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property 
jasper-jdt.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on junit exists, no need to add for property junit.jar.
 -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason missing build outputs
 -ERROR- Missing Output: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-juli.jar
 -ERROR- See Directory Listing Work for Missing Outputs
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk/gump_work/build_tomcat-trunk_tomcat-trunk.html
Work Name: build_tomcat-trunk_tomcat-trunk (Type: Build)
Work ended in a state of : Success
Elapsed: 1 min 7 secs
Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbuild.sysclasspath=only 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-10032010.jar 
-Dno.build.jasper-jdt=true 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-10032010-native-src.tar.gz
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-10032010-native-src.tar.gz
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-10032010.jar
 
-Djasper-jdt.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-10032010.jar
 -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool 
-Dcommons-dbcp.home=/srv/gump/public/workspace
 /apache-commons/dbcp 
-Dcommons-logging-api.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-10032010.jar
 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-10032010.jar
 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/public/workspace/junit/dist/junit-10032010.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-10032010.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3
 
.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-jdbc-10032010.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-10032010.jar
-
 [xslt] Processing 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/listeners.xml to 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/docs/config/listeners.html
 [xslt] Processing 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/loader.xml to 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/docs/config/loader.html
 [xslt] Processing 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/manager.xml to 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/

svn commit: r921464 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java servlet/JspServletWrapper.java

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 17:35:43 2010
New Revision: 921464

URL: http://svn.apache.org/viewvc?rev=921464&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
If compilation fails, always try to re-compile the next time around

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=921464&r1=921463&r2=921464&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Mar 10 
17:35:43 2010
@@ -595,6 +595,8 @@ public class JspCompilationContext {
 } catch (JasperException ex) {
 // Cache compilation exception
 jsw.setCompilationException(ex);
+// Make sure recompilation is attempted
+jsw.setLastModificationTest(-1);
 throw ex;
 } catch (Exception ex) {
 JasperException je = new JasperException(

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=921464&r1=921463&r2=921464&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Wed Mar 
10 17:35:43 2010
@@ -202,8 +202,8 @@ public class JspServletWrapper {
 }
 if (options.getDevelopment() || firstTime ) {
 synchronized (this) {
-firstTime = false;
 ctxt.compile();
+firstTime = false;
 }
 } else {
 if (compileException != null) {



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



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

2010-03-10 Thread markt
Author: markt
Date: Wed Mar 10 17:37:37 2010
New Revision: 921466

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

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=921466&r1=921465&r2=921466&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 10 17:37:37 2010
@@ -173,3 +173,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=921444&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
+  If compilation fails, always try to re-compile the next time around
+  http://svn.apache.org/viewvc?rev=921464&view=rev
+  +1: markt
+  -1: 
+



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



DO NOT REPLY [Bug 48795] Tomcat tries to use cache when compilation failed

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48795

--- Comment #1 from Mark Thomas  2010-03-10 17:37:48 UTC ---
This has been fixed in trunk and proposed for 6.0.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



Re: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

2010-03-10 Thread Mark Thomas
On 10/03/2010 11:43, Bill Barker wrote:
>  -ERROR- Missing Output: 
> /srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-juli.jar
>  -ERROR- See Directory Listing Work for Missing Outputs
>  -INFO- Failed to extract fallback artifacts from Gump Repository

I think I have fixed this. We'll need to wait for the next Gump run to
be sure.

Mark



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



Re: svn commit: r921464 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java servlet/JspServletWrapper.java

2010-03-10 Thread Remy Maucherat
On Wed, 2010-03-10 at 17:35 +, ma...@apache.org wrote:
> Author: markt
> Date: Wed Mar 10 17:35:43 2010
> New Revision: 921464
> 
> URL: http://svn.apache.org/viewvc?rev=921464&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
> If compilation fails, always try to re-compile the next time around
> 
> Modified:
> tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
> tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Great idea in theory. Since compilation is an expensive process, this is
likely a dos problem however.

Rémy



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



Re: svn commit: r921464 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java servlet/JspServletWrapper.java

2010-03-10 Thread Mark Thomas
On 10/03/2010 17:46, Remy Maucherat wrote:
> On Wed, 2010-03-10 at 17:35 +, ma...@apache.org wrote:
>> Author: markt
>> Date: Wed Mar 10 17:35:43 2010
>> New Revision: 921464
>>
>> URL: http://svn.apache.org/viewvc?rev=921464&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
>> If compilation fails, always try to re-compile the next time around
>>
>> Modified:
>> tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
>> tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
> 
> Great idea in theory. Since compilation is an expensive process, this is
> likely a dos problem however.

I did consider that but I was working on the basis that in production
you wouldn't (OK shouldn't) have broken JSPs that don't compile. In that
scenario with valid JSPs if you don't pre-compile there will be the
initial recompilation as currently but no further load.

If we think broken JSPs in production are something we need to handle
then we could make this dependent on the setting of the development mode.

Thoughts?

Mark



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



DO NOT REPLY [Bug 47242] request for AJP command line client

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47242

--- Comment #13 from Ken Van Camp  2010-03-10 
18:14:47 UTC ---
Thanks Chamith for your prompt fixes!  Could you please attach your updated
source code too?  Looks like your latest attachment is just the jar file.
Ken

-- 
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: r921571 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml container/webapps/docs/changelog.xml

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 21:13:54 2010
New Revision: 921571

URL: http://svn.apache.org/viewvc?rev=921571&view=rev
Log:
Correct MD5 generation in the build process.

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921571&r1=921570&r2=921571&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 21:13:54 2010
@@ -94,13 +94,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix generation of MD5 files for the release
-  (Remove linewrap between checksum and filename that occurs there with
-  ANT 1.7+)
-  http://people.apache.org/~kkolinko/patches/2010-03-07_tc55_md5.patch
-  +1: kkolinko, markt, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
   Ensure multiple threads do not end up with the same InputStream
   http://svn.apache.org/viewvc?rev=920858&view=rev

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=921571&r1=921570&r2=921571&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Wed Mar 10 21:13:54 2010
@@ -1576,10 +1576,9 @@
 
 
 
-
-
+
+  
+
   
 
 
@@ -1629,10 +1628,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1650,10 +1648,9 @@
includes="RELEASE-NOTES" />
 
 
-
-
+
+  
+
   
 
   
@@ -1666,10 +1663,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1682,10 +1678,9 @@
   
 
  
-
-
+
+  
+
   
 
   
@@ -1702,10 +1697,9 @@
   
 

-
-
+
+  
+
   
 
   
@@ -1786,10 +1780,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1812,10 +1805,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1839,10 +1831,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1863,10 +1854,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1891,10 +1881,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1928,10 +1917,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1944,10 +1932,9 @@
   
 
 
-
-
+
+  
+
   
 
   
@@ -1978,10 +1965,20 @@
   
 
 
-
-
+
+  
+
+  
+
+  
+  
+  
+
+
+
+
+
+
   
 
   

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=921571&r1=921570&r2=921571&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 10 
21:13:54 2010
@@ -79,6 +79,9 @@
   
 Encode all property files using ascii escaped UTF-8. (rjung)
   
+  
+Correct MD5 generation in the build process. (kkolinko)
+  
 
   
   



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



Re: Reusing instances

2010-03-10 Thread Costin Manolache
You want to have each webapp served by a different process ?
Or even different versions of a webapp in a different process ?

Sounds very good !

Costin

On Wed, Mar 10, 2010 at 6:17 AM, Mladen Turk  wrote:

> On 03/10/2010 02:58 PM, Mark Thomas wrote:
>
>>
>> Work directory, temp directory come to mind.
>>
>> Easier to use a CATALINA_HOME/CATALINA_BASE style approach.
>>
>>
> The idea IS to use the same directory and same files.
> I'm trying to locate things that presume Tomcat is running
> as self contained singleton application and see whether
> it can be made to be aware of multiple processes that
> constitute a single servlet engine instance.
>
> Work and temp could probably have their own process-id
> like prefix if not possible to reuse the files or if
> sync would be too complex.
>
>
> Regards
> --
> ^TM
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


svn commit: r921597 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java container/webapps/docs/changelog.xml

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 22:27:29 2010
New Revision: 921597

URL: http://svn.apache.org/viewvc?rev=921597&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(),
to help find the cause behind BZ 48007.

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921597&r1=921596&r2=921597&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 22:27:29 2010
@@ -107,13 +107,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
-  Improve exception processing in CustomObjectInputStream#resolveClass(),
-  to help find the cause behind BZ 48007.
-  http://svn.apache.org/viewvc?rev=920912&view=rev
-  +1: kkolinko, markt, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Tag account of TagVariableInfo when implementing the rules of JSP.5.3
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java?rev=921597&r1=921596&r2=921597&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
 Wed Mar 10 22:27:29 2010
@@ -74,8 +74,14 @@ public final class CustomObjectInputStre
 try {
 return Class.forName(classDesc.getName(), false, classLoader);
 } catch (ClassNotFoundException e) {
-// Try also the superclass because of primitive types
-return super.resolveClass(classDesc);
+try {
+// Try also the superclass because of primitive types
+return super.resolveClass(classDesc);
+} catch (ClassNotFoundException e2) {
+// Rethrow original exception, as it can have more information
+// about why the class was not found. BZ 48007
+throw e;
+}
 }
 }
 

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=921597&r1=921596&r2=921597&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 10 
22:27:29 2010
@@ -141,6 +141,10 @@
 48004: Allow applications to set the Server header. (markt)
   
   
+48007: Improve exception processing in
+CustomObjectInputStream. (kkolinko)
+  
+  
 48049: Fix copy and paste error so
 NamingContext.destroySubContext() works correctly.
 Patch provided by gingyang.xu (markt)



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



DO NOT REPLY [Bug 48007] ClassNotFoundException when deserializing custom object with FileStore

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48007

--- Comment #7 from Konstantin Kolinko  2010-03-10 
22:29:04 UTC ---
Exception handling fix applied to 5.5, will be in 5.5.29 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



svn commit: r921603 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/naming/resources/FileDirContext.java container/catalina/src/share/org/apache/naming/resources/WARDirC

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 22:43:20 2010
New Revision: 921603

URL: http://svn.apache.org/viewvc?rev=921603&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
Remove race condition that can result in multiple threads trying to use the 
same InputStream
(markt)

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

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java

tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=921603&r1=921602&r2=921603&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 22:43:20 2010
@@ -94,12 +94,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
-  Ensure multiple threads do not end up with the same InputStream
-  http://svn.apache.org/viewvc?rev=920858&view=rev
-  +1: markt, kkolinko, jfclere
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
   Add system property to allow disabling enforcement of JSP.5.3
   The spec recommends, but does not require this enforcement.

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java?rev=921603&r1=921602&r2=921603&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/FileDirContext.java
 Wed Mar 10 22:43:20 2010
@@ -942,7 +942,7 @@ public class FileDirContext extends Base
 
 
 /**
- * This specialized resource implementation avoids opening the IputStream
+ * This specialized resource implementation avoids opening the InputStream
  * to the file right away (which would put a lock on the file).
  */
 protected class FileResource extends Resource {
@@ -982,7 +982,9 @@ public class FileDirContext extends Base
 public InputStream streamContent()
 throws IOException {
 if (binaryContent == null) {
-inputStream = new FileInputStream(file);
+FileInputStream fis = new FileInputStream(file);
+inputStream = fis;
+return fis;
 }
 return super.streamContent();
 }

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java?rev=921603&r1=921602&r2=921603&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/resources/WARDirContext.java
 Wed Mar 10 22:43:20 2010
@@ -938,7 +938,9 @@ public class WARDirContext extends BaseD
 throws IOException {
 try {
 if (binaryContent == null) {
-inputStream = base.getInputStream(entry);
+InputStream is = base.getInputStream(entry);
+inputStream = is;
+return is;
 }
 } catch (ZipException e) {
 throw new IOException(e.getMessage());

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=921603&r1=921602&r2=921603&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 10 
22:43:20 2010
@@ -175,6 +175,10 @@
 (markt)
   
   
+48760: Remove race condition that can result in multiple
+threads trying to use the same InputStream. (markt)
+  
+  
 Add an additional permission required by JULI when running under newer
 JDKs and a security manager. (markt)
   



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



DO NOT REPLY [Bug 48760] Tomcat breaks in serving large files (>=1.8MB) under high load and high threading.

2010-03-10 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48760

--- Comment #16 from Konstantin Kolinko  2010-03-10 
22:45:45 UTC ---
The patch (r920858) was applied to Tomcat 5.5, will be in 5.5.29 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



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

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 23:10:17 2010
New Revision: 921618

URL: http://svn.apache.org/viewvc?rev=921618&view=rev
Log:
proposal

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=921618&r1=921617&r2=921618&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 10 23:10:17 2010
@@ -106,3 +106,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2010-03-09-bug48701.patch
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
+  Only attempt APR initialization if the  has been specified
+  It is backport of r911300. (fix by fhanik)
+  http://people.apache.org/~kkolinko/patches/2010-03-11_tc55_bug48613.patch
+  +1: kkolinko
+  -1:



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



svn commit: r921629 - in /tomcat/trunk: build.properties.default build.xml

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 23:36:38 2010
New Revision: 921629

URL: http://svn.apache.org/viewvc?rev=921629&view=rev
Log:
Fix download of commons-daemon-1.0.2:
The "destfile" parameter has to be specified for "downloadzip" task.
It specifies the file which absence triggers the download of the archive.
Thus, without it the archive was redownloaded again and again with each build.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=921629&r1=921628&r2=921629&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Mar 10 23:36:38 2010
@@ -105,11 +105,12 @@ nsis.loc=${base-sf.loc}/nsis/nsis-2.45.z
 # - Commons Daemon, version 1.0-Alpha or later -
 commons-daemon.version=1.0.2
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
-commons-daemon.lib=${commons-daemon.home}
-commons-daemon.jar=${commons-daemon.lib}/commons-daemon-${commons-daemon.version}.jar
-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
+commons-daemon.native.win.home=${commons-daemon.home}/windows
+commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
 
commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
 
commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
 
commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
 
commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
 

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=921629&r1=921628&r2=921629&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Mar 10 23:36:38 2010
@@ -1737,7 +1737,8 @@ Apache Tomcat ${version} native binaries
 
 
   
-  
+  
+  
 
 
 



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



svn commit: r921630 - /tomcat/trunk/build.properties.default

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Wed Mar 10 23:39:45 2010
New Revision: 921630

URL: http://svn.apache.org/viewvc?rev=921630&view=rev
Log:
Update to NSIS 2.46

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=921630&r1=921629&r2=921630&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Mar 10 23:39:45 2010
@@ -95,12 +95,12 @@ commons-pool.home=${base.path}/commons-p
 
commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
 
 # - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.45
+nsis.home=${base.path}/nsis-2.46
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
 commons-daemon.version=1.0.2



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



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

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Thu Mar 11 00:30:49 2010
New Revision: 921647

URL: http://svn.apache.org/viewvc?rev=921647&view=rev
Log:
proposal

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=921647&r1=921646&r2=921647&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 11 00:30:49 2010
@@ -113,3 +113,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~kkolinko/patches/2010-03-11_tc55_bug48613.patch
   +1: kkolinko
   -1:
+
+* Update to NSIS 2.46
+  NSIS changelog: http://nsis.sourceforge.net/Docs/AppendixF.html#F.1.1
+  http://svn.apache.org/viewvc?rev=921630&view=rev
+  +1: kkolinko
+  -1:

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=921647&r1=921646&r2=921647&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 11 00:30:49 2010
@@ -180,3 +180,8 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1: 
 
+* Update to NSIS 2.46
+  NSIS changelog: http://nsis.sourceforge.net/Docs/AppendixF.html#F.1.1
+  http://svn.apache.org/viewvc?rev=921630&view=rev
+  +1: kkolinko
+  -1:



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



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

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Thu Mar 11 01:08:25 2010
New Revision: 921654

URL: http://svn.apache.org/viewvc?rev=921654&view=rev
Log:
proposal

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=921654&r1=921653&r2=921654&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 11 01:08:25 2010
@@ -185,3 +185,12 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=921630&view=rev
   +1: kkolinko
   -1:
+
+* Update to Commons Daemon 1.0.2 and use procrun from upstream distribution
+  1)
+svn delete res/procrun
+  2)
+
http://people.apache.org/~kkolinko/patches/2010-03-11_tc6_commons-daemon.patch
+  +1: kkolinko
+  -1:
+



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



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

2010-03-10 Thread kkolinko
Author: kkolinko
Date: Thu Mar 11 01:53:42 2010
New Revision: 921663

URL: http://svn.apache.org/viewvc?rev=921663&view=rev
Log:
proposal

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=921663&r1=921662&r2=921663&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 11 01:53:42 2010
@@ -119,3 +119,11 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=921630&view=rev
   +1: kkolinko
   -1:
+
+* Update to Commons Daemon 1.0.2 and use procrun from upstream distribution
+  1)
+svn delete connectors/procrun
+  2)
+
http://people.apache.org/~kkolinko/patches/2010-03-11_tc55_commons-daemon.patch
+  +1: kkolinko
+  -1:



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



Re: [g...@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

2010-03-10 Thread Bill Barker



"Mark Thomas"  wrote in message 
news:4b97da6f.50...@apache.org...

On 10/03/2010 11:43, Bill Barker wrote:
 -ERROR- Missing Output: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-juli.jar

 -ERROR- See Directory Listing Work for Missing Outputs
 -INFO- Failed to extract fallback artifacts from Gump Repository


I think I have fixed this. We'll need to wait for the next Gump run to
be sure.



Thanks for doing that.  Yes, that should fix the tomcat-trunk build.  Sorry 
for being blind as to the path :(


Mark 




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



Re: Reusing instances

2010-03-10 Thread Mladen Turk

On 03/10/2010 11:10 PM, Costin Manolache wrote:

You want to have each webapp served by a different process ?
Or even different versions of a webapp in a different process ?



First goal is to get rid of connectors and use Tomcat
directly inside httpd or IIS or new Commons Runtime
(replacing Tomcat Native and Daemon) I'm working on.

Second is to have application pools where one could
say: Serve WebAppX inside Default Application Pool
consisting of 1 ... N processes or use Custom Application
pool with some process limitation factors (memory, cpu usage, etc)

Third goal is to allow graceful restarts which would
allow to reconfigure the entire VM or redeploy the
application without down time.
Those kind of things is done nowadays by using some sort
of clustering where each node actually behaves like one
of Httpd's child processes.

First thing I'm going to do is the thorough analysis
of what actually happens under the hood during different
engine life stages and see what resources might require
the synchronization or cross-process sharing and
how to do that.

I know it might sound very complex, but it's actually
doing what Tomcat is suppose to do (be a servlet engine),
so perhaps Tomcat Light would fit in that story.


Regards
--
^TM

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



Re: Reusing instances

2010-03-10 Thread Costin Manolache
On Wed, Mar 10, 2010 at 10:28 PM, Mladen Turk  wrote:

> On 03/10/2010 11:10 PM, Costin Manolache wrote:
>
>> You want to have each webapp served by a different process ?
>> Or even different versions of a webapp in a different process ?
>>
>>
> First goal is to get rid of connectors and use Tomcat
> directly inside httpd or IIS or new Commons Runtime
> (replacing Tomcat Native and Daemon) I'm working on.
>

It used to work - about 10 years ago :-)



> Second is to have application pools where one could
> say: Serve WebAppX inside Default Application Pool
> consisting of 1 ... N processes or use Custom Application
> pool with some process limitation factors (memory, cpu usage, etc)
>

This sounds a bit complex - but the big question is "why" ?

If you do multi-process, you can just go simple and say that one process
runs a single app - thus resolving most security issues ( no longer need
a sandbox ), you can set use limits, etc. Upgrading the app will no longer
leak resources, you can have the old version running for a while, in
parallel
with the new one ( with some tricks in the lb - for example use session to
direct
to the right version ).

Having multi-process and combining multiple apps in a single process
seems pointless.

The other nice thing would be to fire up the process on demand, and kill
them
if not used - and maybe start new processes if needed.



>
> Third goal is to allow graceful restarts which would
> allow to reconfigure the entire VM or redeploy the
> application without down time.
>

Yes, but 1 app ( and one version ) per process would make it easier.


> Those kind of things is done nowadays by using some sort
> of clustering where each node actually behaves like one
> of Httpd's child processes.
>



> First thing I'm going to do is the thorough analysis
> of what actually happens under the hood during different
> engine life stages and see what resources might require
> the synchronization or cross-process sharing and
> how to do that.
>

IMHO if you use such a model, it may be better to change the
directory structure - and have all the files ever created by
an webapp ( including logs, work dir, etc ) under a single tree.

Than you can chroot to it, versioning may also be easier.



>
> I know it might sound very complex, but it's actually
> doing what Tomcat is suppose to do (be a servlet engine),
> so perhaps Tomcat Light would fit in that story.


I don't think it's that hard - starting tomcat7 'standalone', with minimal
config and a different dir structure is easy.

The trick will be the frontend - load balancer plus logic to start the
right
processes.



Costin


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


Re: Reusing instances

2010-03-10 Thread Mladen Turk

On 03/11/2010 07:52 AM, Costin Manolache wrote:

On Wed, Mar 10, 2010 at 10:28 PM, Mladen Turk  wrote:


On 03/10/2010 11:10 PM, Costin Manolache wrote:


You want to have each webapp served by a different process ?
Or even different versions of a webapp in a different process ?



First goal is to get rid of connectors and use Tomcat
directly inside httpd or IIS or new Commons Runtime
(replacing Tomcat Native and Daemon) I'm working on.



It used to work - about 10 years ago :-)



Actually didn't. It worked for IIS and Httpd on windows
only since at that time they had a single child process.
Now IIS is the same as httpd with worker mpm.

That was on of the reasons we kill JK2.
JNI inproc connector simply didn't work.

Regards
--
^TM

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



net start "Apache tomcat" is not working on java build

2010-03-10 Thread pannar

Hi,
I have built the automated script used to compile the java classes and sends
an email result.It is working fine but after build , i really wanted to
start the tomcat from build.bat file, seems like it doesn't work,

My build.bat file.

@echo on
 
ECHO.
ECHO.
ECHO.
ECHO =
ECHO RUNNING build.bat >>build.log
ECHO =
ECHO.
 
net stop "Apache Tomcat 6"
#Stopped successfully!!
 
e:\ant\bin\ant all -logger org.apache.tools.ant.listener.MailLogger
-propertyfile MailLogger.properties >>build.log
#build.log says the build is SUCCESSFULL
 
#BUT HERE It is Failed to execute, whats wrong??
ECHO.
ECHO Starting Tomcat 6
net start "Apache Tomcat 6"
pause

-- 
View this message in context: 
http://old.nabble.com/net-start-%22Apache-tomcat%22-is-not-working-on-java-build-tp27860190p27860190.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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



Re: net start "Apache tomcat" is not working on java build

2010-03-10 Thread Mladen Turk

On 03/11/2010 08:31 AM, pannar wrote:


Hi,

#BUT HERE It is Failed to execute, whats wrong??
ECHO.
ECHO Starting Tomcat 6
net start "Apache Tomcat 6"
pause



Try with real service name without spaces
(It should be Tomcat6)
Ant is probably messing up with your cmd line

Regards
--
^TM

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



Re: net start "Apache tomcat" is not working on java build

2010-03-10 Thread Mladen Turk

And please next time use the users list for such questions.

On 03/11/2010 08:31 AM, pannar wrote:


Hi,
I have built the automated script used to compile the java classes and sends



Regards
--
^TM

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



Re: net start "Apache tomcat" is not working on java build

2010-03-10 Thread pannar

Boss,

If the space is the problem, then how come the net stop "Apache Tomcat 6"
command line worked??

Can't we use the net start after the build? Please help me,as i really need
to fix this issue
if not possible, how to call another bat file from one bat file. Another bat
file, let me use net stop and net start

what do you say?
-- 
View this message in context: 
http://old.nabble.com/net-start-%22Apache-tomcat%22-is-not-working-on-java-build-tp27860190p27860333.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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



About Docs on AntiResource Locking

2010-03-10 Thread Gurkan Erdogdu
Hi;

In the documentation of context.xml(
http://tomcat.apache.org/tomcat-6.0-doc/config/context.html) it says relate
with "antiResourceLocking" attribute:

"Please note that setting this flag to true in applications that are outside
the appBase for the Host (the webapps directory by default) will cause the
application to be *deleted* on Tomcat shutdown. You probably don't want to
do this, so think twice before setting antiResourceLocking=true on a webapp
that's outside the appBase for its Host."

I have tried it with Tomcat 6.0.20, but it does not delete application from
docBase of the context. It just deletes application from temp/ folder at
shutdown. This is also the same for applications running on "webapps/"
(appBase of the Host).

Is this correct behaviour? or did I misunderstand the above explanation?

Thanks;

--Gurkan


Re: Reusing instances

2010-03-10 Thread jean-frederic clere
On 03/11/2010 08:30 AM, Mladen Turk wrote:
> On 03/11/2010 07:52 AM, Costin Manolache wrote:
>> On Wed, Mar 10, 2010 at 10:28 PM, Mladen Turk  wrote:
>>
>>> On 03/10/2010 11:10 PM, Costin Manolache wrote:
>>>
 You want to have each webapp served by a different process ?
 Or even different versions of a webapp in a different process ?


>>> First goal is to get rid of connectors and use Tomcat
>>> directly inside httpd or IIS or new Commons Runtime
>>> (replacing Tomcat Native and Daemon) I'm working on.
>>>
>>
>> It used to work - about 10 years ago :-)
>>
> 
> Actually didn't. It worked for IIS and Httpd on windows
> only since at that time they had a single child process.
> Now IIS is the same as httpd with worker mpm.
> 
> That was on of the reasons we kill JK2.
> JNI inproc connector simply didn't work.

One of the big problem is that the prefork and worker models may use
several process for the same session and you can't fix a session to a
JVM process... At the end you needed a flat cluster with one node for
each process and that doesn't scale.

Cheers

Jean-Frederic

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