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

2009-05-02 Thread pero 
Author: pero
Date: Sat May  2 18:38:00 2009
New Revision: 770975

URL: http://svn.apache.org/viewvc?rev=770975&view=rev
Log:
Cast my 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=770975&r1=770974&r2=770975&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May  2 18:38:00 2009
@@ -179,12 +179,12 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47080
   Prevent NPE when mapper makes no matches
   http://svn.apache.org/viewvc?rev=770809&view=rev
-  +1: markt
+  +1: markt, pero
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47086
   Include 64-bit windows binaries in distributions
   Update Windows installer to work automatically on 64-bit machines
   http://svn.apache.org/viewvc?view=rev&revision=770876
-  +1: markt
+  +1: markt, pero
   -1: 



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

DO NOT REPLY [Bug 47091] jsp problem

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47091


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #1 from Mark Thomas   2009-05-02 13:36:18 PST ---
Tomcat's behaviour is correct since there are two, differently scoped,
instances of your bean. Ask on the users list of you need more explanation.

-- 
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 47091] jsp problem

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47091





--- Comment #2 from Xie Xiaodong   2009-05-02 13:54:53 PST 
---
A variable in scriptlet is a local variable inside _jspService, and you can
find the corresponding .java file in
{tomcat_install_dir}/work/localhost/{webapp_dir}. 

And your variable defined in the  tag has a scope of request, so
they have two different scope, as Mark said.

-- 
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: r770985 - /tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 22:12:28 2009
New Revision: 770985

URL: http://svn.apache.org/viewvc?rev=770985&view=rev
Log:
Add all of the Tribes tests to the test suite. Some of these fail.

Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java

Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java?rev=770985&r1=770984&r2=770985&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java Sat 
May  2 22:12:28 2009
@@ -16,6 +16,22 @@
  */
 package org.apache.catalina.tribes.test;
 
+import org.apache.catalina.tribes.test.channel.ChannelStartStop;
+import org.apache.catalina.tribes.test.channel.TestChannelOptionFlag;
+import org.apache.catalina.tribes.test.channel.TestDataIntegrity;
+import org.apache.catalina.tribes.test.channel.TestMulticastPackages;
+import org.apache.catalina.tribes.test.channel.TestRemoteProcessException;
+import org.apache.catalina.tribes.test.channel.TestUdpPackages;
+import org.apache.catalina.tribes.test.interceptors.TestNonBlockingCoordinator;
+import org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor;
+import org.apache.catalina.tribes.test.interceptors.TestTwoPhaseCommit;
+import org.apache.catalina.tribes.test.io.TestSenderConnections;
+import org.apache.catalina.tribes.test.io.TestSerialization;
+import org.apache.catalina.tribes.test.membership.MemberSerialization;
+import org.apache.catalina.tribes.test.membership.TestDomainFilter;
+import org.apache.catalina.tribes.test.membership.TestMemberArrival;
+import org.apache.catalina.tribes.test.membership.TestTcpFailureDetector;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -29,13 +45,25 @@
 
 public static Test suite() {
 TestSuite suite = new TestSuite();
-
suite.addTestSuite(org.apache.catalina.tribes.test.channel.ChannelStartStop.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestChannelOptionFlag.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.membership.MemberSerialization.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestMemberArrival.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestTcpFailureDetector.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestDataIntegrity.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor.class);
+// o.a.catalina.tribes.test.channel
+suite.addTestSuite(ChannelStartStop.class);
+suite.addTestSuite(TestChannelOptionFlag.class);
+suite.addTestSuite(TestDataIntegrity.class);
+suite.addTestSuite(TestMulticastPackages.class);
+suite.addTestSuite(TestRemoteProcessException.class);
+suite.addTestSuite(TestUdpPackages.class);
+// o.a.catalina.tribes.test.interceptors
+suite.addTestSuite(TestNonBlockingCoordinator.class);
+suite.addTestSuite(TestOrderInterceptor.class);
+suite.addTestSuite(TestTwoPhaseCommit.class);
+// o.a.catalina.tribes.test.io
+suite.addTestSuite(TestSenderConnections.class);
+suite.addTestSuite(TestSerialization.class);
+// o.a.catalina.tribes.test.membership
+suite.addTestSuite(MemberSerialization.class);
+suite.addTestSuite(TestDomainFilter.class);
+suite.addTestSuite(TestMemberArrival.class);
+suite.addTestSuite(TestTcpFailureDetector.class);
 return suite;
 }
 }



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

DO NOT REPLY [Bug 47124] Run the unit tests as part of the build!!!

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47124


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #1 from Mark Thomas   2009-05-02 16:20:16 PST ---
I am -1 for this patch as is on the following grounds:
- The tests take far too long to run by default with every build. This patch
increases the rebuild time from 1s to over 5min.
- The patch doesn't follow the Tomcat convention for defining external libs

I'm also very close to -1 on the renaming. I don't think it adds that much.

Given this, what I have done is modified the current test/build.xml in trunk to
run all the tests. There are currently see a number of errors/failures - mostly
in Tribes. How many of those are genuine and how many are faulty tests is TBD.
Given the failures and the time taken, the Tribes tests are currently commented
out.

The remaining failures are caused by the use of ServerFactory that doesn't play
nicely with o.a.c.startup.Tomcat when multiple Tomcat instance are created.

As noted in the code ServerFactory needs to be removed.

Several resolutions are applicable here, I went for FIXED.

-- 
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: r771002 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 23:36:24 2009
New Revision: 771002

URL: http://svn.apache.org/viewvc?rev=771002&view=rev
Log:
Clean up inspired by https://issues.apache.org/bugzilla/show_bug.cgi?id=47111
Remove unused code.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=771002&r1=771001&r2=771002&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Sat May  2 
23:36:24 2009
@@ -67,21 +67,12 @@
  * @param packageName Name of package to create StringManager for.
  */
 private StringManager(String packageName) {
-this( packageName, Locale.getDefault() );
-}
-
-private StringManager(String packageName, Locale loc) {
 String bundleName = packageName + ".LocalStrings";
-bundle = ResourceBundle.getBundle(bundleName, loc);
+bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
 // Get the actual locale, which may be different from the requested one
 locale = bundle.getLocale();
 }
 
-private StringManager(ResourceBundle bundle ) {
-this.bundle=bundle;
-locale = bundle.getLocale();
-}
-
 /**
 Get a string from the underlying resource bundle or return
 null if the String is not found.
@@ -160,32 +151,4 @@
 return mgr;
 }
 
-/**
- * Get the StringManager for a particular package. If a manager for
- * a package already exists, it will be reused, else a new
- * StringManager will be created and returned.
- *
- * @param bundle The resource bundle
- */
-public synchronized static StringManager getManager(ResourceBundle bundle) 
{
-return new StringManager( bundle );
-}
-
-/**
- * Get the StringManager for a particular package and Locale. If a manager 
for
- * a package already exists, it will be reused, else a new
- * StringManager will be created for that Locale and returned.
- *
- * @param packageName The package name
- * @param loc The locale
- */
-public synchronized static StringManager getManager(String 
packageName,Locale loc) {
-StringManager mgr = managers.get(packageName+"_"+loc.toString());
-if (mgr == null) {
-mgr = new StringManager(packageName,loc);
-managers.put(packageName+"_"+loc.toString(), mgr);
-}
-return mgr;
-}
-
 }



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

DO NOT REPLY [Bug 47111] do caching the resources like the docu say it (StringManager)

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47111


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WONTFIX




--- Comment #3 from Mark Thomas   2009-05-02 16:36:27 PST ---
Thanks for the patch. I am afraid I went for the simpler option of just
removing getManager(ResourceBundle) as it isn't used in trunk.

I don't want to backport this is it would change the API for 6. Given it isn't
used, I am afraid there isn't much point backporting your patch.

I also removed the unused getManager(String, Locale) method and simplified the
constructors.

Marking this as WONTFIX, since the patch will not be applied to 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

svn commit: r770999 - in /tomcat/trunk: build.properties.default test/build.xml test/org/apache/TestAll.java

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 23:12:17 2009
New Revision: 770999

URL: http://svn.apache.org/viewvc?rev=770999&view=rev
Log:
Changes as a result of https://issues.apache.org/bugzilla/show_bug.cgi?id=47124
Add JUnit to build
Provide TestSuite to run all tests

Added:
tomcat/trunk/test/org/apache/TestAll.java   (with props)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/test/build.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=770999&r1=770998&r2=770999&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat May  2 23:12:17 2009
@@ -109,3 +109,8 @@
 
dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
 dojo-js.jar=${dojo-js.home}/dojo/dojo.js
 
+# - JUnit Unit Test Suite, version 3.7 or later -
+junit.home=${base.path}/junit3.8.2
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=${base-sf.loc}/junit/junit3.8.2.zip

Modified: tomcat/trunk/test/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/build.xml?rev=770999&r1=770998&r2=770999&view=diff
==
--- tomcat/trunk/test/build.xml (original)
+++ tomcat/trunk/test/build.xml Sat May  2 23:12:17 2009
@@ -20,51 +20,79 @@
   
   
   
-  
+  
 
-  
+  
 
   
-  
+  
 
   
   
 
-  
   
 
   
 
+
 
-
-  
-
-
-  
-
   
 
-  
-
-  
-
-  
-  
- 
- 
-  
-
+  
+
+
+
+  
+  
+
   
 
   
- 
-
-
-
+
+  
+  
+
+  
+   
+  
+   
+  
+  
+  
+   
+  
+   
+  
+
+
+
+
+
+  
+   
+  
+
+
+  
+
+  
 
+  
+
+
+
   
+
+  
+
+
+  
+
 

Added: tomcat/trunk/test/org/apache/TestAll.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=770999&view=auto
==
--- tomcat/trunk/test/org/apache/TestAll.java (added)
+++ tomcat/trunk/test/org/apache/TestAll.java Sat May  2 23:12:17 2009
@@ -0,0 +1,35 @@
+package org.apache;
+
+import org.apache.catalina.ha.session.TestSerializablePrincipal;
+import org.apache.catalina.startup.TomcatStartupAPITest;
+import org.apache.catalina.tomcat.util.http.TestCookies;
+import org.apache.catalina.tribes.test.TribesTestSuite;
+import org.apache.el.lang.TestELSupport;
+import org.apache.el.parser.TestELParser;
+import org.apache.tomcat.util.res.TestStringManager;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class TestAll {
+
+public static Test suite() {
+TestSuite suite = new TestSuite("Test for org.apache");
+// o.a.catalina.ha.session
+suite.addTestSuite(TestSerializablePrincipal.class); // TODO rename
+// o.a.catalina.startup
+suite.addTestSuite(TomcatStartupAPITest.class);
+// o.a.catalina.tomcat.util.http - TODO fix package
+suite.addTestSuite(TestCookies.class); // TODO rename
+// Tribes
+// suite.addTest(TribesTestSuite.suite());
+// o.a.el
+suite.addTestSuite(TestELSupport.class);
+suite.addTestSuite(TestELParser.class);
+// o.a.tomcat.util
+suite.addTestSuite(TestStringManager.class);
+
+return suite;
+}
+
+}

Propchange: tomcat/trunk/test/org/apache/TestAll.java
--
svn:eol-style = native

Propchange: tomcat/trunk/test/org/apache/TestAll.java
--
svn:keywords = Date Author Id Revision



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

svn commit: r771000 - in /tomcat/trunk: test.xml test/build.xml

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 23:17:55 2009
New Revision: 771000

URL: http://svn.apache.org/viewvc?rev=771000&view=rev
Log:
Move file for consistency. May ultimately move test.xml inside build.xml

Added:
tomcat/trunk/test.xml
  - copied, changed from r770999, tomcat/trunk/test/build.xml
Removed:
tomcat/trunk/test/build.xml

Copied: tomcat/trunk/test.xml (from r770999, tomcat/trunk/test/build.xml)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test.xml?p2=tomcat/trunk/test.xml&p1=tomcat/trunk/test/build.xml&r1=770999&r2=771000&rev=771000&view=diff
==
--- tomcat/trunk/test/build.xml (original)
+++ tomcat/trunk/test.xml Sat May  2 23:17:55 2009
@@ -20,12 +20,12 @@
   
   
   
-  
+  
 
-  
+  
 
-  
-  
+  
+  
 
   
   
@@ -41,7 +41,7 @@
   
 
 
-

svn commit: r771001 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 23:20:33 2009
New Revision: 771001

URL: http://svn.apache.org/viewvc?rev=771001&view=rev
Log:
Tab police and other whitespace issues

Modified:
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=771001&r1=771000&r2=771001&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Sat May  2 
23:20:33 2009
@@ -55,7 +55,6 @@
 /**
  * The ResourceBundle for this StringManager.
  */
-
 private ResourceBundle bundle;
 private Locale locale;
 
@@ -67,9 +66,8 @@
  *
  * @param packageName Name of package to create StringManager for.
  */
-
 private StringManager(String packageName) {
-   this( packageName, Locale.getDefault() );
+this( packageName, Locale.getDefault() );
 }
 
 private StringManager(String packageName, Locale loc) {
@@ -79,9 +77,8 @@
 locale = bundle.getLocale();
 }
 
-private StringManager(ResourceBundle bundle )
-{
-   this.bundle=bundle;
+private StringManager(ResourceBundle bundle ) {
+this.bundle=bundle;
 locale = bundle.getLocale();
 }
 
@@ -94,7 +91,6 @@
 bundle or null if not found.
 @throws IllegalArgumentException if key is null.
  */
-
 public String getString(String key) {
 if(key == null){
 String msg = "key may not have a null value";
@@ -104,20 +100,20 @@
 
 String str = null;
 
-try{
-   str = bundle.getString(key);
-}catch(MissingResourceException mre){
+try {
+str = bundle.getString(key);
+} catch(MissingResourceException mre) {
 //bad: shouldn't mask an exception the following way:
 //   str = "[cannot find message associated with key '" + key + "' 
due to " + mre + "]";
-   // because it hides the fact that the String was missing
-   // from the calling code.
-   //good: could just throw the exception (or wrap it in another)
-   //  but that would probably cause much havoc on existing
-   //  code.
-   //better: consistent with container pattern to
-   //  simply return null.  Calling code can then do
-   //  a null check.
-   str = null;
+// because it hides the fact that the String was missing
+// from the calling code.
+//good: could just throw the exception (or wrap it in another)
+//  but that would probably cause much havoc on existing
+//  code.
+//better: consistent with container pattern to
+//  simply return null.  Calling code can then do
+//  a null check.
+str = null;
 }
 
 return str;
@@ -130,7 +126,6 @@
  * @param key
  * @param args
  */
-
 public String getString(final String key, final Object... args) {
 String value = getString(key);
 if (value == null) {
@@ -157,12 +152,12 @@
  * @param packageName The package name
  */
 public synchronized static StringManager getManager(String packageName) {
-  StringManager mgr = managers.get(packageName);
-  if (mgr == null) {
-  mgr = new StringManager(packageName);
-  managers.put(packageName, mgr);
-  }
-  return mgr;
+StringManager mgr = managers.get(packageName);
+if (mgr == null) {
+mgr = new StringManager(packageName);
+managers.put(packageName, mgr);
+}
+return mgr;
 }
 
 /**
@@ -173,7 +168,7 @@
  * @param bundle The resource bundle
  */
 public synchronized static StringManager getManager(ResourceBundle bundle) 
{
-  return new StringManager( bundle );
+return new StringManager( bundle );
 }
 
 /**
@@ -184,14 +179,13 @@
  * @param packageName The package name
  * @param loc The locale
  */
-
-   public synchronized static StringManager getManager(String 
packageName,Locale loc) {
-  StringManager mgr = managers.get(packageName+"_"+loc.toString());
-  if (mgr == null) {
-  mgr = new StringManager(packageName,loc);
-  managers.put(packageName+"_"+loc.toString(), mgr);
-  }
-  return mgr;
+public synchronized static StringManager getManager(String 
packageName,Locale loc) {
+StringManager mgr = managers.get(packageName+"_"+loc.toString());
+if (mgr == null) {
+mgr = new StringManager(packageName,loc);
+managers.put(packageName+"_"+loc.toStrin

svn commit: r771003 - in /tomcat/trunk/test/org/apache: TestAll.java catalina/tomcat/util/http/ tomcat/util/http/ tomcat/util/http/TestCookies.java

2009-05-02 Thread markt 
Author: markt
Date: Sat May  2 23:41:12 2009
New Revision: 771003

URL: http://svn.apache.org/viewvc?rev=771003&view=rev
Log:
Put tests in right package

Added:
tomcat/trunk/test/org/apache/tomcat/util/http/
  - copied from r770988, 
tomcat/trunk/test/org/apache/catalina/tomcat/util/http/
Removed:
tomcat/trunk/test/org/apache/catalina/tomcat/util/http/
Modified:
tomcat/trunk/test/org/apache/TestAll.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java

Modified: tomcat/trunk/test/org/apache/TestAll.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=771003&r1=771002&r2=771003&view=diff
==
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Sat May  2 23:41:12 2009
@@ -2,10 +2,10 @@
 
 import org.apache.catalina.ha.session.TestSerializablePrincipal;
 import org.apache.catalina.startup.TomcatStartupAPITest;
-import org.apache.catalina.tomcat.util.http.TestCookies;
 import org.apache.catalina.tribes.test.TribesTestSuite;
 import org.apache.el.lang.TestELSupport;
 import org.apache.el.parser.TestELParser;
+import org.apache.tomcat.util.http.TestCookies;
 import org.apache.tomcat.util.res.TestStringManager;
 
 import junit.framework.Test;

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=771003&r1=770988&r2=771003&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Sat May  2 
23:41:12 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.catalina.tomcat.util.http; 
+package org.apache.tomcat.util.http; 
 
 import org.apache.tomcat.util.http.Cookies;
 import org.apache.tomcat.util.http.ServerCookie;



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

svn commit: r771006 - in /tomcat/trunk/modules/jdbc-pool: java/org/apache/tomcat/jdbc/pool/ test/org/apache/tomcat/jdbc/test/

2009-05-02 Thread fhanik 
Author: fhanik
Date: Sun May  3 00:18:33 2009
New Revision: 771006

URL: http://svn.apache.org/viewvc?rev=771006&view=rev
Log:
Make connection objects non reusable. Once release has been called, it can't be 
reused.
This makes the sizing algorithm easier
C3P0 leaks connections during the fairness test, reaches 20 connections even 
max is set to 10


Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java

tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=771006&r1=771005&r2=771006&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Sun May  3 00:18:33 2009
@@ -60,39 +60,39 @@
 /**
  * All the information about the connection pool
  */
-protected PoolProperties poolProperties;
+private PoolProperties poolProperties;
 
 /**
  * Contains all the connections that are in use
  * TODO - this shouldn't be a blocking queue, simply a list to hold our 
objects
  */
-protected BlockingQueue busy;
+private BlockingQueue busy;
 
 /**
  * Contains all the idle connections
  */
-protected BlockingQueue idle;
+private BlockingQueue idle;
 
 /**
  * The thread that is responsible for checking abandoned and idle threads
  */
-protected PoolCleaner poolCleaner;
+private PoolCleaner poolCleaner;
 
 /**
  * Pool closed flag
  */
-protected boolean closed = false;
+private boolean closed = false;
 
 /**
  * Since newProxyInstance performs the same operation, over and over
  * again, it is much more optimized if we simply store the constructor 
ourselves.
  */
-protected Constructor proxyClassConstructor;
+private Constructor proxyClassConstructor;
 
 /**
  * Executor service used to cancel Futures
  */
-protected ThreadPoolExecutor cancellator = new 
ThreadPoolExecutor(0,1,1000,TimeUnit.MILLISECONDS,new 
LinkedBlockingQueue());
+private ThreadPoolExecutor cancellator = new 
ThreadPoolExecutor(0,1,1000,TimeUnit.MILLISECONDS,new 
LinkedBlockingQueue());
 
 /**
  * reference to mbean
@@ -102,7 +102,7 @@
 /**
  * counter to track how many threads are waiting for a connection
  */
-protected AtomicInteger waitcount = new AtomicInteger(0);
+private AtomicInteger waitcount = new AtomicInteger(0);
 
 
//===
 // PUBLIC METHODS
@@ -427,9 +427,11 @@
 return;
 try {
 con.lock();
-con.release();
+if (con.release()) {
+size.addAndGet(-1);
+}
 } finally {
-size.addAndGet(-1);
+
 con.unlock();
 }
 }
@@ -441,7 +443,7 @@
  * @return PooledConnection
  * @throws SQLException
  */
-protected PooledConnection borrowConnection(int wait) throws SQLException {
+private PooledConnection borrowConnection(int wait) throws SQLException {
 
 if (isClosed()) {
 throw new SQLException("Connection pool closed.");

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=771006&r1=771005&r2=771006&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
 Sun May  3 00:18:33 2009
@@ -26,6 +26,7 @@
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -109,6 +110,8 @@
  */
 private WeakReference handler = null;
 
+private AtomicBoolean released = new AtomicBoolean(false);
+
 
 public PooledConnection(PoolProperties prop, ConnectionPool parent) {
 instanceCount = counter.addAndGet(1);
@@ -117,6 +120,7 @@
 }
 
 public void connect() throws SQLException {
+if (released.get()) throw new SQLException("A connection once 
releas

DO NOT REPLY [Bug 47133] Reloading web application causes CPU usage to spike when using AIO

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47133


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #2 from Mark Thomas   2009-05-02 17:36:37 PST ---
Tested with 6.0.18, 6.0.x and trunk with native/APR (1.1.16) and NIO with JDK
1.6.0_13_x64 on WinXP 64-bit and I can't reproduce this.

-- 
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 47136] Tomcat Compression limited to 48K

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47136


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME




--- Comment #2 from Mark Thomas   2009-05-02 17:42:19 PST ---
Looks like you have something else (filter?) in your configuration that is
messing this up. This works for files >48k for me on 6.0.18. At least one other
person on the users list reported 6.0.18 worked for them.

-- 
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: r771008 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/users/ webapps/docs/

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:03:03 2009
New Revision: 771008

URL: http://svn.apache.org/viewvc?rev=771008&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46815
Make MemoryUserDatabase read-only be default

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:03:03 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751295,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771008&r1=771007&r2=771008&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:03:03 2009
@@ -56,13 +56,6 @@
   http://svn.apache.org/viewvc?rev=757335&view=rev (to remove the Catalina dep)
   +1: markt, billbarker
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46815
-  http://svn.apache.org/viewvc?rev=751289&view=rev
-  http://svn.apache.org/viewvc?rev=753039&view=rev
-  Make MemoryUserDatabase read-only by default
-  +1: markt, rjung, pero
-  -1: 
-
 * Backport cleanup of semantics of thisAccessedTime and
   lastAccessedTime for sessions:
   - preparational whitespace changes

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties?rev=771008&r1=771007&r2=771008&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties 
Sun May  3 01:03:03 2009
@@ -18,3 +18,4 @@
 memoryUserDatabase.renameNew=Cannot rename new file to {0}
 memoryUserDatabase.writeException=IOException writing to {0}
 memoryUserDatabase.notPersistable=User database is not persistable - no write 
permissions on directory
+memoryUserDatabase.readOnly=User database has been configured to be read only. 
Changes cannot be saved

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=771008&r1=771007&r2=771008&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
Sun May  3 01:03:03 2009
@@ -120,7 +120,7 @@
 /**
  * A flag, indicating if the user database is read only.
  */
-protected boolean readonly = false;
+protected boolean readonly = true;
 
 /**
  * The set of {...@link Role}s defined in this database, keyed by
@@ -500,6 +500,7 @@
 public void save() t

DO NOT REPLY [Bug 46815] Tomcat user database file - permission problem on Unix systems

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46815


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Comment #4 from Mark Thomas   2009-05-02 18:03:22 PST ---
The patch has been applied to 6.0.x and will be included in 6.0.20 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: r771009 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina/util/ webapps/docs/

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:15:41 2009
New Revision: 771009

URL: http://svn.apache.org/viewvc?rev=771009&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46990
Various sync issues. Patch provided by s...@a.o

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/InstanceSupport.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:15:41 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763302,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763599,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771009&r1=771008&r2=771009&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:15:41 2009
@@ -111,14 +111,6 @@
   +1: markt, pero
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46990
-  Correct various sync issues reported by FindBugs
-  Patch provided by s...@a.o
-  http://svn.apache.org/viewvc?rev=763298&view=rev
-  +1: markt, rjung, pero
-   0: remm (zzz)
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
   Use correct link on error page in JSP security example
   Patch provided by Michael Moody

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=771009&r1=771008&r2=771009&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun 
May  3 01:15:41 2009
@@ -202,6 +202,8 @@
  * application, in the order they were encountered in the web.xml file.
  */
 private String applicationListeners[] = new String[0];
+
+private final Object applicationListenersLock = new Object();
 
 
 /**
@@ -224,6 +226,8 @@
 private ApplicationParameter applicationParameters[] =
 new ApplicationParameter[0];
 
+private final Object applicationParametersLock = new Object();
+
 
 /**
  * The application available flag for this Context.
@@ -264,6 +268,8 @@
  * The security constraints for this web application.
  */
 private SecurityConstraint constraints[] = new SecurityConstraint[0];
+
+private final Object constraintsLock = new Object();
 
 
 /**
@@ -360,6 +366,8 @@
  * they were defined in the deployment descriptor.
  */
 private FilterMap filterMaps[] = new FilterMap[0];
+
+private final Object filterMapsLock = new Object();
 
 
 /**
@@ -374,6 +382,8 @@
  */
 private String instanceListeners[] = new String[0];
 
+private final

DO NOT REPLY [Bug 46990] Synchronize target cannot be changed midway

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46990


Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #3 from Mark Thomas   2009-05-02 18:16:09 PST ---
This has been applied to 6.0.x and will be included in 6.0.20 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: r771011 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt webapps/docs/changelog.xml webapps/examples/jsp/security/protected/error.jsp

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:19:39 2009
New Revision: 771011

URL: http://svn.apache.org/viewvc?rev=771011&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
Correct link on error page. Patch provided by Michael Moody.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:19:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771011&r1=771010&r2=771011&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:19:39 2009
@@ -111,13 +111,6 @@
   +1: markt, pero
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
-  Use correct link on error page in JSP security example
-  Patch provided by Michael Moody
-  http://svn.apache.org/viewvc?rev=763325&view=rev
-  +1: markt, rjung, pero
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909
   Only include ';' in type attribute if there is a parameter
   http://svn.apache.org/viewvc?rev=763611&view=rev

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=771011&r1=771010&r2=771011&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May  3 01:19:39 2009
@@ -132,6 +132,10 @@
   
 
   
+46509: Use correct link on error page in JSP security
+example. Patch provided by Michael Moody. (markt)
+  
+  
 46599: Document known DAEMON issue. (markt)
   
   

Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp?rev=771011&r1=771010&r2=771011&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp 
(original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp Sun 
May  3 01:19:39 2009
@@ -20,6 +20,6 @@
 
 
 Invalid username and/or password, please try
-again.
+again.
 
 



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

DO NOT REPLY [Bug 46509] Tomcat 5.5 security example gives j_security_check not available

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46509





--- Comment #3 from Mark Thomas   2009-05-02 18:19:49 PST ---
This has been fixed in 6.0.x and will be included in 6.0.20 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: r771012 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:26:32 2009
New Revision: 771012

URL: http://svn.apache.org/viewvc?rev=771012&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909
Only include ';' in type attribute if there is a parameter

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:26:32 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771012&r1=771011&r2=771012&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:26:32 2009
@@ -111,13 +111,6 @@
   +1: markt, pero
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909
-  Only include ';' in type attribute if there is a parameter
-  http://svn.apache.org/viewvc?rev=763611&view=rev
-  +1: markt, rjung, pero
-   0: remm (zzz)
-  -1: 
-
 * https://issues.apache.org/bugzilla/show_bug.cgi?id=46984
   Invalid characters in HTTP request method should result in a 400
   http://svn.apache.org/viewvc?rev=763654&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=771012&r1=771011&r2=771012&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sun May 
 3 01:26:32 2009
@@ -1591,8 +1591,7 @@
 s0 = "http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=771012&r1=771011&r2=771012&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May  3 01:26:32 2009
@@ -120,6 +120,10 @@
 org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
 Patch provided by Konstantin Kolinko. (markt)
   
+  
+46909: Only include semi-colon in type attribute for
+ when it is required. (markt)
+  
 
   
   



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

DO NOT REPLY [Bug 46909] error

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46909





--- Comment #2 from Mark Thomas   2009-05-02 18:26:44 PST ---
This has been fixed in 6.0.x and will be included in 6.0.20 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

DO NOT REPLY [Bug 46984] Server incorrectly reports a 501 error on bad method name. Should report 400 error.

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46984





--- Comment #2 from Mark Thomas   2009-05-02 18:29:41 PST ---
This has been fixed in 6.0.x and will be included in 6.0.20 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: r771013 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/http11/ webapps/docs/

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:29:42 2009
New Revision: 771013

URL: http://svn.apache.org/viewvc?rev=771013&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=46984
Invalid characters in HTTP request method should result in a 400

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:29:42 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771013&r1=771012&r2=771013&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:29:42 2009
@@ -111,12 +111,6 @@
   +1: markt, pero
   -1: 
 
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=46984
-  Invalid characters in HTTP request method should result in a 400
-  http://svn.apache.org/viewvc?rev=763654&view=rev
-  +1: markt, rjung, pero
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
   Correct JSP compilation error with nested tagfile tags with variables with
   "AT_BEGIN" scope

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=771013&r1=771012&r2=771013&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Sun May  3 01:29:42 2009
@@ -834,17 +834,19 @@
 error = true;
 }
 
-// Setting up filters, and parse some request headers
-rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
-try {
-prepareRequest();
-} catch (Throwable t) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("http11processor.request.prepare"), 
t);
+if (!error) {
+// Setting up filters, and parse some request headers
+rp.setStage(org.apache.coyote.Constants.STAGE_PREPARE);
+try {
+prepareRequest();
+} catch (Throwable t) {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString("http11processor.request.prepare"), t);
+}
+

svn commit: r771014 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/Constants.java java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml

2009-05-02 Thread markt 
Author: markt
Date: Sun May  3 01:33:01 2009
New Revision: 771014

URL: http://svn.apache.org/viewvc?rev=771014&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47013
Use system property rather than hard code default

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  3 01:33:01 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771014&r1=771013&r2=771014&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May  3 01:33:01 2009
@@ -119,14 +119,6 @@
   +1: markt, remm (risky ...)
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47013
-  Use system property rather than hard code default
-  http://svn.apache.org/viewvc?rev=764985&view=rev
-  http://svn.apache.org/viewvc?rev=764997&view=rev
-  +1: markt, rjung, pero
-  -0: remm: Why should this be backported ?
-  -1: 
-
 * Fix use of non-ASCII characters in property files
   http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch 
(German)
   http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch 
(English)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java?rev=771014&r1=771013&r2=771014&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java Sun May  
3 01:33:01 2009
@@ -28,5 +28,8 @@
 public static final String JSP_SERVLET_CLASS =
 "org.apache.jasper.servlet.JspServlet";
 public static final String JSP_SERVLET_NAME = "jsp";
+public static final String PRECOMPILE = 
+System.getProperty("org.apache.jasper.Constants.PRECOMPILE",
+"jsp_precompile");
 
 }

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=771014&r1=771013&r2=771014&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun 
May  3 01:33:01 2009
@@ -1178,7 +1178,7 @@
 // Invoking jspInit
 DummyRequest req = new DummyRequest();
 req.setServletPath(jspFile);
-req.setQueryString("jsp_precompile=true");
+req.setQueryString(Constants.PRECOMPILE + "=true");

DO NOT REPLY [Bug 47013] JSP not compiled at startup when used as a servlet

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47013





--- Comment #4 from Mark Thomas   2009-05-02 18:33:11 PST ---
This has been fixed in trunk and will be in 6.0.20 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

DO NOT REPLY [Bug 47013] JSP not compiled at startup when used as a servlet

2009-05-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=47013


Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




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