[GSoC Projects Available] Issue Navigator - ASF JIRA
Hi, Just that JIRA stuff has been created for the GSoC. Should we move our entries there? Cheers Jean-Frederic https://issues.apache.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=12314021 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULTS][VOTE] Release build 6.0.25
>> A dependency on an 'unreleased' product ? > > I think he means Apache Geronimo. Ah yes. Sorry :) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULTS][VOTE] Release build 6.0.25
Thanks! 2010/3/4 jean-frederic clere > On 03/04/2010 04:04 AM, Rex Wang wrote: > > Hi, any plan when will 6.0.26 released? Our project has a dependency on > it.. > > There is still a regression to vote (and test): bug 48827. > If no other problems the release should happen early next week. > > Cheers > > Jean-Frederic > > > > > Thanks > > > > -Rex > > > > 2010/3/3 Mladen Turk > > > >> On 03/03/2010 08:33 AM, jean-frederic clere wrote: > >> > >>> Stable [3] > >>> Broken [2] > >>> > >>> So we go for a 6.0.26. Please commit the stuff voted in STATUS.txt > >>> > >>> > >> And few ones that need votes :) > >> E.g the trivial exception throwing fix for APR connector on shutdown. > >> > >> Regards > >> -- > >> ^TM > >> > >> > >> - > >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > >> For additional commands, e-mail: dev-h...@tomcat.apache.org > >> > >> > > > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Lei Wang (Rex) rwonly AT apache.org
Tomcat 5.5.x build broken?
Hi, I am trying to build Tomcat 5.5 following the instructions on the page on http://tomcat.apache.org/tomcat-5.5-doc/building.html I am running into problems with the main build.xml that is trying to check out Tomcat source from the svn url http://svn.apache.org/repos/asf/tomcat/current/tc5.5.x which does not exist anymore. after changing it to http://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk (or to a specific tag such as 5.5.26, for example) it still runs into other problems further down the road. Apparently some of the dependent components also changed its URLs where the build downloads from. So in general the build is broken. Is there another main build.xml somewhere else that will lead to a much smoother build for this? Thanks. - 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=47242 --- Comment #11 from chamith buddhika 2010-03-05 02:08:14 UTC --- (In reply to comment #10) Hi Ken, The basic syntax currently is as follows. java -jar ajpc.jar -o=- http://localhost:8009/axis2 -o switch with - tells to output to the console. 8009 is the port Tomcat is listening for AJP connections. Output should be some thing like this Run: 10/03/05 07:17:06 |Connection |StartTime |TimedOut |TimeElapsed(ms)|ReplyCode |URL |0 |10/03/05 07:17:06 |false |2 |302 |http://localhost:8009/axis2 I think first two exceptions you encountered are due to the fact that specifying URL differently. Currently you have to give the URL in full with the protocol (http) to make it work. Last one is bit strange because it seems to be a problem with protocol handling logic. I also came up with this error once during half way implementing the client. But it was random and only occured once and disappeared once I completed client in full. But anyway I will see in to that if you come across it again. Btw I guess 9009 is the port tomcat is listening for AJP connections. It has to be like that and not the normal http port for correct functioning for now. Let me know if you come across any issues again. Also you can get a some description of the switches by using -h switch on the command line. Regards, Chamith -- 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: Console for Tomcat
Hi to all, and thanks for your feedback, I've waited a little before to respond to start to look better at some of the Tomcat JMX features. I cross-post Pivot Developers here to give others some update. > Costin > There is a servlet that dumps all JMX objects - in a strange format ( like > manifest or INI file - not hard to parse ). > Would be great ( and quite easy ) to make it also output json. > All information you want should be there - and much more. Exposing new data > is also easy. > You can also use some of the JMX access methods - RMI, etc. thanks for the info, for us reading json data is well supported, but we'll have to use jmx to set values I think. In any case, this could be a starting point. > Rainer > Trying to aim at the middle ground might trigger more interest. Being able to > remotely administer, but maybe not using a very high level configuration > management. That's something one could also discuss on the users list. I think this could be our right choice, thanks for the info. > AFAIK one of the problematic parts of the old admin webapp was getting > storeconfig into a working and maintainable state. In other words: how does > one correctly save changes applied to a configuration by a console? Pivot Applets / Applications (as a RIA) will run on Client, usually downloaded from the Server (maybe with a new, dedicated Console webapp of Tomcat), and some parts of it can also run inside the Server. We can also use a local storage, but in this case probably we have to call something on the server to make it (check, then) update config files, and force a reload. This discussion is very interesting for me, because you (Tomcat Developers) know very well what is needed, and what is to be done, so any info and suggestion is welcome. The idea to manage a Cluster of Tomcat instances is very interesting, but my only fear is that could be too much long for us. Also the idea of the json-jmx proxy is good. My first use case to try to address is some of most common operations, like: - list/manage applications and maybe server status - deploy/undeploy/start/stop applications - list/manage users - list/manage datasources - etc ... You think these features could start to give some value or many others are required ? After this, the main problem we have at Pivot is that currently the Developer Team is little, so starting with a long/complex project could be a problem (we have a lot of features to implement in Pivot), but doing something step by step could be a practical choice. I expect that Greg Brown, the Pivot Team Leader can join here and explain better its point of view. Thanks to all, Sandro - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48862] New: AJP Connector ignores Backlog configuration parameter
https://issues.apache.org/bugzilla/show_bug.cgi?id=48862 Summary: AJP Connector ignores Backlog configuration parameter Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: tyler...@gmail.com Created an attachment (id=25085) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25085) Patch against trunk revision 919249 The AJP/JK ChannelSocket connector ignores the backlog configuration parameter. The current behavior is that the JDK default will be used. Because the JDK default is quite low, it is possible for Tomcat to get into a state where the queue of waiting connections is exhausted prematurely. This bug is a regression from Tomcat 5 Bug 38332. Patch attached. -- 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: r919243 - in /tomcat/site/trunk: docs/bugreport.html docs/irc.html xdocs/bugreport.xml xdocs/irc.xml
Author: kkolinko Date: Fri Mar 5 00:16:33 2010 New Revision: 919243 URL: http://svn.apache.org/viewvc?rev=919243&view=rev Log: Rearrange, rewrite and amend information on the bugreport.html page. Update server name on the IRC page. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/xdocs/bugreport.xml tomcat/site/trunk/xdocs/irc.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=919243&r1=919242&r2=919243&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Fri Mar 5 00:16:33 2010 @@ -217,6 +217,34 @@ + +Bugzilla is not a support forum + + + + + + + + +Support questions should not be sent to Bugzilla. If you cannot diagnose +your problem, or if the problem is in your configuration, use the +mailing lists. + + + + + + + + + + + + + + + Resources to help resolve Apache Tomcat problems @@ -271,6 +299,70 @@ + +Apache Tomcat discussion lists + + + + + + + +It is very likely you are not the first to run into a problem. + Others may have already found a solution. The tomcat-user, + taglibs-user or tomcat-dev list archives may contain + discussions which will help you resolve the problem. + Here are three resources to view the Apache Tomcat User List archives: + http://marc.theaimsgroup.com/?l=tomcat-user&r=1&w=2";>Mailing list ARChives, + http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse, + http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail Archive. + + Here are three resources to view the Apache Tomcat Developer List archives + http://marc.theaimsgroup.com/?l=tomcat-dev&r=1&w=2";>Mailing list ARChives, + http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Eyebrowse, + and http://www.mail-archive.com/dev@tomcat.apache.org/";>Mail Archive. + +See the mailing lists page for the further +information on the lists. + + + + + + + + + + + + + + + +Apache Tomcat on IRC + + + + + + + +An IRC channel dedicated to Apache Tomcat +exists on Freenode.net. + + + + + + + + + + + + + + Bug Database @@ -280,30 +372,31 @@ -Please search the bug database to see if the bug you are +Please https://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205&product=Tomcat%206&product=Tomcat%207&product=Tomcat%20Connectors&product=Tomcat%20Native";>search + the bug database to see if the bug you are seeing has already been reported. - -The bug may have already been fixed and is available in a later -version or nightly build. -Someone else may have reported the bug, you could add supporting -information to help reproduce and resolve the bug. - - Search the Apache Tomcat 6 bug database - http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%206";> - here. - Search the Apache Tomcat 5 bug database - http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205";> - here. - Search the Apache Tomcat 4 bug database - http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%204";> - here. - Search the Apache Tomcat Connectors bug database - http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Connectors";> - here. - Search the Apache Tomcat Native bug database - http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%20Native";> - here. + + The bug may have already been fixed and is available in a later + version or nightly build. + Someone else may have reported the bug, you could add supporting + information to help reproduce and resolve the bug. + +Supported Tomcat projects: + + +Tomcat 7 - future Tomcat 7.0 + +Tomcat 6 - Tomcat 6.0.x + +Tomcat 5 - Tomcat 5.5.x + +Tomcat Connectors - Integration of Tomcat with other Web servers + +Tomcat Native - APR based native HTTP and AJP connectors for Tomcat + +Taglibs - Apache Taglibs + @@ -318,8 +411,8 @@ - -Apache Tomcat discussion lists + +Recent version @@ -327,28 +420,9 @@ -It is very likely you are not the first to run into a problem. - Others may have already found a solution. The tomcat-user - or tomcat-dev list archives may contain discussions which - will help you resolve the problem. - Here are four resources to view the Apache Tomcat User List archives: - http://marc.theaimsgroup.com/?l=tomcat-user&r=1&w=2";>Mailing list ARChives, - http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Eyebrowse, - http://www.mail-archive.com/us...@tomcat.apache.org/";>Mail Archive, - and http://mikal.org/interests/java/tomcat/";>mikal.org. +Try to reproduce your proble
DO NOT REPLY [Bug 48861] New: Files without AL headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 Summary: Files without AL headers Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=25084) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25084) list of files that don't have AL headers Attachment is a list of files that don't have AL headers. As far as I can make out, all of these files should have headers. -- 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: r919208 - in /tomcat/trunk/java/org/apache/catalina/realm: CombinedRealm.java DataSourceRealm.java JAASRealm.java JDBCRealm.java JNDIRealm.java LockOutRealm.java MemoryRealm.java RealmBase
Author: markt
Date: Thu Mar 4 22:16:50 2010
New Revision: 919208
URL: http://svn.apache.org/viewvc?rev=919208&view=rev
Log:
Lifecycle refactoring
Realm: Note most implementations were firing the start event too early
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=919208&r1=919207&r2=919208&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Thu Mar 4
22:16:50 2010
@@ -30,6 +30,7 @@
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -218,15 +219,14 @@
/**
* Prepare for the beginning of active use of the public methods of this
- * component. This method should be called before any of the public
- * methods of this component are utilized. It should also send a
- * LifecycleEvent of type START_EVENT to any registered listeners.
+ * component and implement the requirements of
+ * {...@link LifecycleBase#startInternal()}.
*
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
@Override
-public void start() throws LifecycleException {
+protected void startInternal() throws LifecycleException {
// Start 'sub-realms' then this one
Iterator iter = realms.iterator();
@@ -243,23 +243,22 @@
}
}
}
-super.start();
+super.startInternal();
}
/**
* Gracefully terminate the active use of the public methods of this
- * component. This method should be the last one called on a given
- * instance of this component. It should also send a LifecycleEvent
- * of type STOP_EVENT to any registered listeners.
+ * component and implement the requirements of
+ * {...@link LifecycleBase#stopInternal()}.
*
* @exception LifecycleException if this component detects a fatal error
* that needs to be reported
*/
@Override
-public void stop() throws LifecycleException {
+protected void stopInternal() throws LifecycleException {
// Stop this realm, then the sub-realms (reverse order to start)
-super.stop();
+super.stopInternal();
for (Realm realm : realms) {
if (realm instanceof Lifecycle) {
((Lifecycle) realm).stop();
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=919208&r1=919207&r2=919208&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Thu Mar 4
22:16:50 2010
@@ -32,6 +32,7 @@
import org.apache.naming.ContextBindings;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -617,17 +618,15 @@
/**
- *
- * Prepare for active use of the public methods of this Component.
+ * Prepare for the beginning of active use of the public methods of this
+ * component and implement the requirements of
+ * {...@link LifecycleBase#startInternal()}.
*
* @exception LifecycleException if this component detects a fatal error
- * that prevents it from being started
+ * that prevents this component from being used
*/
@Override
-public void start() throws LifecycleException {
-
-// Perform normal superclass initialization
-super.start();
+protected void startInternal() throws LifecycleException {
// Create the roles PreparedStatement string
StringBuilder temp = new StringBuilder("SELECT ");
DO NOT REPLY [Bug 48860] High CPU usage
https://issues.apache.org/bugzilla/show_bug.cgi?id=48860 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID Severity|critical|normal --- Comment #1 from Konstantin Kolinko 2010-03-04 22:05:48 UTC --- Bugzilla is not a support forum. Please use the Tomcat users mailing list. -- 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 48860] New: High CPU usage
https://issues.apache.org/bugzilla/show_bug.cgi?id=48860 Summary: High CPU usage Product: Tomcat 6 Version: 6.0.24 Platform: Other OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: chris@ordosinc.com I upgrade from tomcat 4 to tomcat 6. After upgrade, I receive the following errors. I created a simple foo.jsp with <%= "Hello" %> When start the tomcat6, the CPU usage is 0%. When I open the foo.jsp, the CPU instantly jump to 100% and stays forever. I using mysql jdbc connector J connecting to mysql database. Please advise. Thanks. Mar 4, 2010 4:23:31 PM org.apache.catalina.loader.WebappClassLoader clearReferencesThreads SEVERE: A web application appears to have started a thread named [Timer-0] but has failed to stop it. This is very likely to create a memory leak. M Mar 4, 2010 4:24:38 PM org.apache.catalina.loader.WebappClassLoader clearReferencesThreads SEVERE: A web application appears to have started a thread named [Thread-4] but has failed to stop it. This is very likely to create a memory leak. Mar 4, 2010 4:24:38 PM org.apache.catalina.loader.WebappClassLoader clearReferencesThreads SEVERE: A web application appears to have started a thread named [Timer-0] but has failed to stop it. This is very likely to create a memory leak. Mar 4, 2010 4:24:38 PM org.apache.catalina.loader.WebappClassLoader clearReferencesThreads SEVERE: A web application appears to have started a thread named [Thread-8] but has failed to stop it. This is very likely to create a memory leak. M -- 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: r919188 - in /tomcat/trunk/java/org/apache: catalina/deploy/ tomcat/util/bcel/classfile/ tomcat/util/http/fileupload/
Author: markt
Date: Thu Mar 4 21:20:59 2010
New Revision: 919188
URL: http://svn.apache.org/viewvc?rev=919188&view=rev
Log:
Fix svn properties. Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java (props
changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
(contents, props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java
(contents, props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
(props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersSupport.java
(contents, props changed)
Propchange: tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
('svn:executable' removed)
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
('svn:executable' removed)
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
--
svn:eol-style = native
Propchange:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
--
svn:eol-style = native
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileCleaningTr
svn commit: r919187 - in /tomcat/trunk/java/org/apache/catalina: connector/ core/
Author: markt
Date: Thu Mar 4 21:18:03 2010
New Revision: 919187
URL: http://svn.apache.org/viewvc?rev=919187&view=rev
Log:
Lifecycle refactoring
StandardPipeline
(and turn Eclipse compilation warnings up to 11)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
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=919187&r1=919186&r2=919187&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Mar 4
21:18:03 2010
@@ -26,7 +26,6 @@
import javax.management.ObjectName;
import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
@@ -51,8 +50,7 @@
*/
-public class Connector extends LifecycleBase
-implements Lifecycle, MBeanRegistration {
+public class Connector extends LifecycleBase implements MBeanRegistration {
private static final Log log = LogFactory.getLog(Connector.class);
@@ -967,6 +965,7 @@
*
* @exception LifecycleException if a fatal startup error occurs
*/
+@Override
protected void startInternal() throws LifecycleException {
if( !initialized )
initialize();
@@ -1027,6 +1026,7 @@
*
* @exception LifecycleException if a fatal shutdown error occurs
*/
+@Override
protected void stopInternal() throws LifecycleException {
setState(LifecycleState.STOPPING);
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=919187&r1=919186&r2=919187&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar
4 21:18:03 2010
@@ -186,9 +186,6 @@
standardHost.warURL=Invalid URL for web application archive: {0}
standardHost.validationEnabled=XML validation enabled
standardHost.validationDisabled=XML validation disabled
-standardPipeline.alreadyStarted=Pipeline has already been started
-standardPipeline.notStarted=Pipeline has not been started
-standardPipeline.noValve=No more Valves in the Pipeline processing this request
standardServer.initialize.initialized=This server has already been initialized
standardServer.shutdownViaPort=A valid shutdown command was received via the
shutdown port. Stopping the Server instance.
standardService.initialize.initialized=This service has already been
initialized
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=919187&r1=919186&r2=919187&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu
Mar 4 21:18:03 2010
@@ -162,9 +162,6 @@
standardHost.warURL = URL inv\u00E1lida para archivo de aplicaci\u00F3n web\:
{0}
standardHost.validationEnabled = Activada la validaci\u00F3n XML
standardHost.validationDisabled = Desactivada la validaci\u00F3n XML
-standardPipeline.alreadyStarted = Ya se ha arrancado la Tuber\u00EDa (Pipeline)
-standardPipeline.notStarted = No se ha arrancado la Tuber\u00EDa (Pipeline)
-standardPipeline.noValve = No hay m\u00E1s V\u00E1lvulas en la Tuber\u00EDa
(Pipeline) procesando este requerimiento
standardServer.initialize.initialized = Ya se ha inicializado este servidor
standardService.initialize.initialized = Ya ha sido inicializado este servicio
standardService.initialize.failed = Servicio inicializando en {0} fall\u00F3
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=919187&r1=919186&r2=919187&view=diff
==
--- tomca
DO NOT REPLY [Bug 48322] Reading a cookie with an apostrophe in the value is truncated in Tomcat 6.0.20 and 6.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=48322 --- Comment #4 from Konstantin Kolinko 2010-03-04 20:48:57 UTC --- Fixed in 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: r919169 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/util/java/org/apache/tomcat/util/http/Cookies.java container/webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Mar 4 20:47:41 2010
New Revision: 919169
URL: http://svn.apache.org/viewvc?rev=919169&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48322
Single quote in a cookie should be not be treated as a separator
(markt)
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Cookies.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=919169&r1=919168&r2=919169&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 20:47:41 2010
@@ -67,12 +67,6 @@
kkolinko - Just a note: This issue won't affect configurations where
Jasper
runs with development=false.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48322
- Single quote should be not be treated as a separator
- http://svn.apache.org/viewvc?rev=830999&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Provide new option to allow = in cookie values
http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch
+1: markt, kkolinko, rjung
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Cookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Cookies.java?rev=919169&r1=919168&r2=919169&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Cookies.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Thu Mar 4 20:47:41 2010
@@ -51,10 +51,10 @@
Excluding the '/' char violates the RFC, but
it looks like a lot of people put '/'
in unquoted values: '/': ; //47
-'\t':9 ' ':32 '\"':34 '\'':39 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60
+'\t':9 ' ':32 '\"':34 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60
'=':61 '>':62 '?':63 '@':64 '[':91 '\\':92 ']':93 '{':123 '}':125
*/
-public static final char SEPARATORS[] = { '\t', ' ', '\"', '\'', '(', ')',
',',
+public static final char SEPARATORS[] = { '\t', ' ', '\"', '(', ')', ',',
':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' };
protected static final boolean separators[] = new boolean[128];
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=919169&r1=919168&r2=919169&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Mar 4
20:47:41 2010
@@ -144,6 +144,10 @@
(kkolinko/markt)
+48322: Single quote characters are not HTTP separators and
+should not be treated as such in the cookie handling. (markt)
+
+
48516: Prevent NPE in JNDIRealm if requested user does not
exist. Patch provided by Kevin Conaway. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47609] Failsafe EOL conversion
https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #7 from Konstantin Kolinko 2010-03-04 20:30:20 UTC --- Fixed in 6.0.22, 5.5.29. -- 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: r919165 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml container/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Mar 4 20:27:23 2010 New Revision: 919165 URL: http://svn.apache.org/viewvc?rev=919165&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 Implement fail-safe EOL conversion for source distributions Based on a patch provided by sebb 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=919165&r1=919164&r2=919165&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 20:27:23 2010 @@ -80,16 +80,6 @@ rjung: it might be more reader friendly to explicitely add parentheses when having || and && mixed in the same logical expression (see the "while" loop). -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 - Implement fail-safe EOL conversion for source distributions - Based on a patch provided by sebb - This patch is required, because otherwise the *.keystore - files used in storeconfig[-ha] module tests become broken in the -src.tar.gz - bundle. - http://people.apache.org/~kkolinko/patches/2010-01-05_tc55_bug47609.patch - +1: kkolinko, markt, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 Process changes for all naming contexts, not just the global one http://svn.apache.org/viewvc?rev=883134&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=919165&r1=919164&r2=919165&view=diff == --- tomcat/tc5.5.x/trunk/build/build.xml (original) +++ tomcat/tc5.5.x/trunk/build/build.xml Thu Mar 4 20:27:23 2010 @@ -102,6 +102,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1889,6 +1936,10 @@ + + + @@ -1901,11 +1952,10 @@ - - + + + 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=919165&r1=919164&r2=919165&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Mar 4 20:27:23 2010 @@ -41,6 +41,10 @@ in catalina.sh. (fhanik/kkolinko) +47609: Provide fail-safe EOL conversion for build process. +(sebb/markt/kkolinko) + + 47689: Enable the test Ant target to work. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919102 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
A few more incorrect properties: svn ps svn:eol-style native java/org/apache/catalina/deploy/SessionConfig.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/Annotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/ElementValue.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java svn ps svn:eol-style native java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java svn ps svn:eol-style native java/org/apache/tomcat/util/http/fileupload/FileItemHeaders.java svn ps svn:eol-style native java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java svn ps svn:eol-style native java/org/apache/tomcat/util/http/fileupload/FileItemHeadersSupport.java Also: svn pd svn:executable java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java svn pd svn:executable java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java On 04/03/2010, Mark Thomas wrote: > On 04/03/2010 18:48, Konstantin Kolinko wrote: > > > - do not have svn:eol-style. > > > /ME swears loudly > > Thanks. I thought I'd fixed that. Obviously not... > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919138 - in /tomcat/trunk/java/org/apache/catalina: core/ startup/
Author: markt
Date: Thu Mar 4 19:17:32 2010
New Revision: 919138
URL: http://svn.apache.org/viewvc?rev=919138&view=rev
Log:
Lifecycle refactoring
StandardService - Note use of LifecycleState.MUST_STOP in Catalina to ensure
shutdown
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=919138&r1=919137&r2=919138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar
4 19:17:32 2010
@@ -195,9 +195,7 @@
standardService.initialize.failed=Service initializing at {0} failed
standardService.register.failed=Error registering Service at domain {0}
standardService.start.name=Starting service {0}
-standardService.start.started=This service has already been started
standardService.stop.name=Stopping service {0}
-standardService.stop.notStarted=This service has not yet been started
standardWrapper.allocate=Error allocating a servlet instance
standardWrapper.allocateException=Allocate exception for servlet {0}
standardWrapper.containerServlet=Loading container servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=919138&r1=919137&r2=919138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu
Mar 4 19:17:32 2010
@@ -170,9 +170,7 @@
standardService.initialize.failed = Servicio inicializando en {0} fall\u00F3
standardService.register.failed = Error registrando servicio en dominio {0}
standardService.start.name = Arrancando servicio {0}
-standardService.start.started = Ya ha sido arrancado este sercicio
standardService.stop.name = Parando servicio {0}
-standardService.stop.notStarted = A\u00FAn no se ha arrancado este servicio
standardWrapper.allocate = Error reservando espacio para una instancia de
servlet
standardWrapper.allocateException = Excepci\u00F3n de reserva de espacio para
servlet {0}
standardWrapper.containerServlet = Cargando servlet de contenedor {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=919138&r1=919137&r2=919138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Thu
Mar 4 19:17:32 2010
@@ -141,9 +141,7 @@
standardServer.initialize.initialized=Ce serveur a d\u00e9j\u00e0
\u00e9t\u00e9 initialis\u00e9
standardService.initialize.initialized=Ce service a d\u00e9j\u00e0
\u00e9t\u00e9 initialis\u00e9
standardService.start.name=D\u00e9marrage du service {0}
-standardService.start.started=Ce service a d\u00e9j\u00e0 \u00e9t\u00e9
d\u00e9marr\u00e9
standardService.stop.name=Arr\u00eat du service {0}
-standardService.stop.notStarted=Ce service n''a pas encore \u00e9t\u00e9
d\u00e9marr\u00e9
standardWrapper.allocate=Erreur d''allocation \u00e0 une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet {0}
standardWrapper.containerServlet=Chargement du conteneur (container) de
servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=919138&r1=919137&r2=919138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properti
svn commit: r919128 - in /tomcat/trunk/java/org/apache/catalina: LifecycleState.java util/LifecycleBase.java
Author: markt Date: Thu Mar 4 18:55:30 2010 New Revision: 919128 URL: http://svn.apache.org/viewvc?rev=919128&view=rev Log: Fix eol-style Modified: tomcat/trunk/java/org/apache/catalina/LifecycleState.java (props changed) tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (props changed) Propchange: tomcat/trunk/java/org/apache/catalina/LifecycleState.java -- svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919102 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
On 04/03/2010 18:48, Konstantin Kolinko wrote: > - do not have svn:eol-style. /ME swears loudly Thanks. I thought I'd fixed that. Obviously not... - 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
https://issues.apache.org/bugzilla/show_bug.cgi?id=47242 --- Comment #10 from Ken Van Camp 2010-03-04 18:53:04 UTC --- Hi Chamith, I downloaded your AJP client to give it a try. It's not clear to me how to specify the URL for an AJP request. As you can see below, I tried a few alternatives (even tried telling it to use HTTP just to get past the malformed URL exception) to no avail. Can you provide a command-line example? Thanks! Ken $ java -jar ajpc.jar abeitmts1:9009/itm/ Exception in thread "main" java.net.MalformedURLException: unknown protocol: abe itmts1 at java.net.URL.(Unknown Source) at java.net.URL.(Unknown Source) at java.net.URL.(Unknown Source) at org.apache.coyote.ajp.client.ClientContext.init(ClientContext.java:98 ) at org.apache.coyote.ajp.client.AJPClient.init(AJPClient.java:200) at org.apache.coyote.ajp.client.AJPClient.main(AJPClient.java:53) $ java -jar ajpc.jar ajp://abeitmts1:9009/itm/ Exception in thread "main" java.net.MalformedURLException: unknown protocol: ajp at java.net.URL.(Unknown Source) at java.net.URL.(Unknown Source) at java.net.URL.(Unknown Source) at org.apache.coyote.ajp.client.ClientContext.init(ClientContext.java:98 ) at org.apache.coyote.ajp.client.AJPClient.init(AJPClient.java:200) at org.apache.coyote.ajp.client.AJPClient.main(AJPClient.java:53) $ java -jar ajpc.jar http://abeitmts1:9009/itm/ Exception in thread "Thread-0" java.lang.StringIndexOutOfBoundsException: String index out of range: 41082 at java.lang.String.checkBounds(Unknown Source) at java.lang.String.(Unknown Source) at org.apache.coyote.ajp.client.AjpProcessor.getString(AjpProcessor.java :546) at org.apache.coyote.ajp.client.AjpProcessor.parseHeaders(AjpProcessor.j ava:482) at org.apache.coyote.ajp.client.AjpProcessor.handshake(AjpProcessor.java :434) at org.apache.coyote.ajp.client.AjpProcessor.execute(AjpProcessor.java:4 21) at org.apache.coyote.ajp.client.AjpProcessor.process(AjpProcessor.java:1 04) at org.apache.coyote.ajp.client.AjpProcessor.run(AjpProcessor.java:95) at java.lang.Thread.run(Unknown Source) $ -- 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: r919123 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Author: markt
Date: Thu Mar 4 18:49:21 2010
New Revision: 919123
URL: http://svn.apache.org/viewvc?rev=919123&view=rev
Log:
Make toString() consistent with other components
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
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=919123&r1=919122&r2=919123&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Mar 4
18:49:21 2010
@@ -1059,9 +1059,11 @@
@Override
public String toString() {
// Not worth caching this right now
-StringBuilder sb = new StringBuilder("Connector-");
+StringBuilder sb = new StringBuilder("Connector[");
sb.append(getProtocol());
+sb.append('-');
sb.append(getPort());
+sb.append(']');
return sb.toString();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919102 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
2010/3/4 : > Author: markt > Date: Thu Mar 4 18:07:59 2010 > New Revision: 919102 > > URL: http://svn.apache.org/viewvc?rev=919102&view=rev > Log: > Lifecycle refactoring. > In an effort to reduce code duplication and improve consistency, provide a > base Lifecycle implementation. This will be used as the basis of the > refactoring of the components that implement Lifecycle > This: > Added: > tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java and from previous commit > Added: > tomcat/trunk/java/org/apache/catalina/LifecycleState.java - do not have svn:eol-style. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919121 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties StandardServer.java
Author: markt
Date: Thu Mar 4 18:47:17 2010
New Revision: 919121
URL: http://svn.apache.org/viewvc?rev=919121&view=rev
Log:
Lifecycle refactoring
StandardServer - relatively straight forward
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=919121&r1=919120&r2=919121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar
4 18:47:17 2010
@@ -189,12 +189,8 @@
standardPipeline.alreadyStarted=Pipeline has already been started
standardPipeline.notStarted=Pipeline has not been started
standardPipeline.noValve=No more Valves in the Pipeline processing this request
-standardServer.addContainer.ise=No connectors available to associate this
container with
standardServer.initialize.initialized=This server has already been initialized
standardServer.shutdownViaPort=A valid shutdown command was received via the
shutdown port. Stopping the Server instance.
-standardServer.start.connectors=At least one connector is not associated with
any container
-standardServer.start.started=This server has already been started
-standardServer.stop.notStarted=This server has not yet been started
standardService.initialize.initialized=This service has already been
initialized
standardService.initialize.failed=Service initializing at {0} failed
standardService.register.failed=Error registering Service at domain {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=919121&r1=919120&r2=919121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Thu
Mar 4 18:47:17 2010
@@ -165,11 +165,7 @@
standardPipeline.alreadyStarted = Ya se ha arrancado la Tuber\u00EDa (Pipeline)
standardPipeline.notStarted = No se ha arrancado la Tuber\u00EDa (Pipeline)
standardPipeline.noValve = No hay m\u00E1s V\u00E1lvulas en la Tuber\u00EDa
(Pipeline) procesando este requerimiento
-standardServer.addContainer.ise = No hay conectores disponibles para ser
asociados con este contenedor
standardServer.initialize.initialized = Ya se ha inicializado este servidor
-standardServer.start.connectors = Al menos un conector no est\u00E1 asociado
con cualquier contenedor
-standardServer.start.started = Ya ha sido arrancado este servidor
-standardServer.stop.notStarted = A\u00FAn no ha sido arrancado este servidor
standardService.initialize.initialized = Ya ha sido inicializado este servicio
standardService.initialize.failed = Servicio inicializando en {0} fall\u00F3
standardService.register.failed = Error registrando servicio en dominio {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=919121&r1=919120&r2=919121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Thu
Mar 4 18:47:17 2010
@@ -138,11 +138,7 @@
standardPipeline.alreadyStarted=Le "Pipeline" a d\u00e9j\u00e0 \u00e9t\u00e9
d\u00e9marr\u00e9
standardPipeline.notStarted=le "Pipeline" n''a pas \u00e9t\u00e9
d\u00e9marr\u00e9
standardPipeline.noValve=Plus aucune Valve dans le "Pipeline" traitant cette
requ\u00eate
-standardServer.addContainer.ise=Aucun connecteur n''est disponible pour
associer avec ce conteneur (container)
standardServer.initialize.initialized=Ce serveur a d\u00e9j\u00e0
\u00e9t\u00e9 initialis\u00e9
-standardServer.start.connectors=Au moins un connecteur n''est associ\u00e9
\u00e0 aucun conteneur (container)
-standardServer.start.started=Ce serveur a d\u00e9j\u00e0 \u00e9t\u00e9
d\u00e9marr\u00e9
-standardServer.stop.notStarted=Ce serveur n''a pas encore \u00e9t\u00e9
d\u00e9marr\u00e9
standardService.initialize.initialized=Ce service a d\u00e9j\u00e0
\u00e9t\u00e9 initialis\u00e9
standardService.start.name=D\u00e9marrage du service {0}
standardService.start.started=Ce service a d\u00e9j\u00e0 \u00e9t\u00
svn commit: r919115 - in /tomcat/trunk/java/org/apache/catalina/connector: Connector.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
Author: markt
Date: Thu Mar 4 18:34:36 2010
New Revision: 919115
URL: http://svn.apache.org/viewvc?rev=919115&view=rev
Log:
Lifecycle refactoring
Connector - relatively straight forward
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties
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=919115&r1=919114&r2=919115&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Mar 4
18:34:36 2010
@@ -28,10 +28,10 @@
import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.util.LifecycleSupport;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
@@ -51,9 +51,9 @@
*/
-public class Connector
-implements Lifecycle, MBeanRegistration
-{
+public class Connector extends LifecycleBase
+implements Lifecycle, MBeanRegistration {
+
private static final Log log = LogFactory.getLog(Connector.class);
@@ -132,12 +132,6 @@
/**
- * The lifecycle event support for this component.
- */
-protected LifecycleSupport lifecycle = new LifecycleSupport(this);
-
-
-/**
* The port number on which we listen for requests.
*/
protected int port = 0;
@@ -209,12 +203,6 @@
/**
- * Has this component been started yet?
- */
-protected boolean started = false;
-
-
-/**
* The shutdown signal to our background thread
*/
protected boolean stopped = false;
@@ -273,7 +261,7 @@
*/
protected boolean useBodyEncodingForURI = false;
-
+
protected static HashMap replacements =
new HashMap();
static {
@@ -383,15 +371,6 @@
}
-/**
- * Is this connector available for processing requests?
- */
-public boolean isAvailable() {
-
-return (started);
-
-}
-
/**
* Return the Container used for processing requests received by this
@@ -889,44 +868,6 @@
}
-// -- Lifecycle Methods
-
-
-/**
- * Add a lifecycle event listener to this component.
- *
- * @param listener The listener to add
- */
-public void addLifecycleListener(LifecycleListener listener) {
-
-lifecycle.addLifecycleListener(listener);
-
-}
-
-
-/**
- * Get the lifecycle listeners associated with this lifecycle. If this
- * Lifecycle has no listeners registered, a zero-length array is returned.
- */
-public LifecycleListener[] findLifecycleListeners() {
-
-return lifecycle.findLifecycleListeners();
-
-}
-
-
-/**
- * Remove a lifecycle event listener from this component.
- *
- * @param listener The listener to add
- */
-public void removeLifecycleListener(LifecycleListener listener) {
-
-lifecycle.removeLifecycleListener(listener);
-
-}
-
-
protected ObjectName createObjectName(String domain, String type)
throws MalformedObjectNameException {
Object addressObj = getProperty("address");
@@ -1026,18 +967,11 @@
*
* @exception LifecycleException if a fatal startup error occurs
*/
-public void start() throws LifecycleException {
+protected void startInternal() throws LifecycleException {
if( !initialized )
initialize();
-// Validate and update our current state
-if (started ) {
-if(log.isInfoEnabled())
-log.info(sm.getString("coyoteConnector.alreadyStarted"));
-return;
-}
-lifecycle.fireLifecycleEvent(START_EVENT, null);
-started = true;
+setState(LifecycleState.STARTING);
// We can't register earlier - the JMX registration of this happens
// in Server.start callback
@@ -1093,16 +1027,9 @@
*
* @exception LifecycleException if a fatal shutdown error occurs
*/
-public void stop() throws LifecycleException {
+protected void stopInternal() throws LifecycleException {
-// Validate and update our current state
Re: svn commit: r919100 - in /tomcat/trunk/java/org/apache/catalina: Lifecycle.java LifecycleState.java
On 04/03/2010 18:06, ma...@apache.org wrote: > Author: markt > Date: Thu Mar 4 18:06:21 2010 > New Revision: 919100 > > URL: http://svn.apache.org/viewvc?rev=919100&view=rev > Log: > Lifecycle refactoring. > Part 1 of many. > Better define the start and stop methods as well as the overall component > lifecycle and the relationship between start/stop, component state and events. > Add a getState() method but it is commented out in this checkin to prevent > compilation errors. It will be uncommented once the method has been added to > the components that implement Lifecycle. I'm expecting a number of commits as I go through the classes that implement Lifecycle. I want to do this in small stages as the couple attempts I have made so far to do this in one go have ended up in a mess of exceptions on startup. The plan once start/stop refactoring is complete is to look at init/destroy and MBean support. I think there is an equal amount of scope there to clean up the existing code. Once start/stop is complete, I intend to take another look at the Servlet 3.0 dynamic configuration and get that working as intended and then do an 7.0.0 alpha release. Filip - do you have an ETA for the async stuff? I must confess I haven't even looked at it yet. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919102 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
Author: markt
Date: Thu Mar 4 18:07:59 2010
New Revision: 919102
URL: http://svn.apache.org/viewvc?rev=919102&view=rev
Log:
Lifecycle refactoring.
In an effort to reduce code duplication and improve consistency, provide a base
Lifecycle implementation. This will be used as the basis of the refactoring of
the components that implement Lifecycle
Added:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
Added: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=919102&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (added)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Thu Mar 4
18:07:59 2010
@@ -0,0 +1,260 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.util;
+
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.LifecycleState;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
+
+/**
+ * Base implementation of the {...@link Lifecycle} interface that implements
the
+ * state transition rules for {...@link Lifecycle#start()} and
+ * {...@link Lifecycle#stop()}
+ */
+public abstract class LifecycleBase implements Lifecycle {
+
+private static Log log = LogFactory.getLog(LifecycleBase.class);
+
+private static StringManager sm =
+StringManager.getManager("org.apache.catalina.util");
+
+
+/**
+ * Used to handle firing lifecycle events.
+ * TODO: Consider merging LifecycleSupport into this class.
+ */
+private LifecycleSupport lifecycle = new LifecycleSupport(this);
+
+
+/**
+ * The current state of the source component.
+ */
+private volatile LifecycleState state = LifecycleState.NEW;
+
+
+/**
+ * {...@inheritdoc}
+ */
+@Override
+public void addLifecycleListener(LifecycleListener listener) {
+lifecycle.addLifecycleListener(listener);
+}
+
+
+/**
+ * {...@inheritdoc}
+ */
+@Override
+public LifecycleListener[] findLifecycleListeners() {
+return lifecycle.findLifecycleListeners();
+}
+
+
+/**
+ * {...@inheritdoc}
+ */
+@Override
+public void removeLifecycleListener(LifecycleListener listener) {
+lifecycle.removeLifecycleListener(listener);
+}
+
+
+/**
+ * Allow sub classes to fire {...@link Lifecycle} events.
+ *
+ * @param type Event type
+ * @param data Data associated with event.
+ */
+protected void fireLifecycleEvent(String type, Object data) {
+lifecycle.fireLifecycleEvent(type, data);
+}
+
+
+/**
+ * {...@inheritdoc}
+ */
+@Override
+public final void start() throws LifecycleException {
+
+synchronized (this) {
+if(LifecycleState.STARTING_PREP.equals(state) ||
+LifecycleState.STARTING.equals(state) ||
+LifecycleState.STARTED.equals(state)) {
+
+if(log.isInfoEnabled()) {
+log.info(sm.getString("lifecycleBase.alreadyStarted",
+toString()));
+}
+
+return;
+}
+
+if (!state.equals(LifecycleState.NEW) &&
+!state.equals(LifecycleState.STOPPED)) {
+invalidTransition(Lifecycle.BEFORE_START_EVENT);
+}
+
+// Set state and fire event separately rather than via setState()
+// so event fires outside of sync boundary
+state = LifecycleState.STARTING_PREP;
+}
+
+lifecycle.fireLifecycleEvent(Lifecycle.BEFORE_START_EVENT, null);
+
+startInternal();
+
+if (state.equals(LifecycleState.FAILED) ||
+state.equals(LifecycleState.MUS
svn commit: r919100 - in /tomcat/trunk/java/org/apache/catalina: Lifecycle.java LifecycleState.java
Author: markt
Date: Thu Mar 4 18:06:21 2010
New Revision: 919100
URL: http://svn.apache.org/viewvc?rev=919100&view=rev
Log:
Lifecycle refactoring.
Part 1 of many.
Better define the start and stop methods as well as the overall component
lifecycle and the relationship between start/stop, component state and events.
Add a getState() method but it is commented out in this checkin to prevent
compilation errors. It will be uncommented once the method has been added to
the components that implement Lifecycle.
Added:
tomcat/trunk/java/org/apache/catalina/LifecycleState.java
Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=919100&r1=919099&r2=919100&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Thu Mar 4 18:06:21
2010
@@ -21,14 +21,52 @@
/**
* Common interface for component life cycle methods. Catalina components
- * may, but are not required to, implement this interface (as well as the
- * appropriate interface(s) for the functionality they support) in order to
- * provide a consistent mechanism to start and stop the component.
+ * may implement this interface (as well as the appropriate interface(s) for
+ * the functionality they support) in order to provide a consistent mechanism
+ * to start and stop the component.
+ *
+ * The valid state transitions for components that support Lifecycle are:
+ *
+ * <--
+ * | |
+ * start() |auto auto stop()|
+ * NEW --->--- STARTING_PREP -->- STARTING -->- STARTED -->---|
+ * | ||
+ * auto| ||
+ * -<- MUST_STOP --<--- ||
+ * |||
+ * ---<--^
+ * | |
+ * |auto autostart()|
+ * STOPPING_PREP -->- STOPPING -->- STOPPED -->
+ * ^
+ * |stop()
+ * |
+ * FAILED
+ *
+ * Any state can transition to FAILED.
+ *
+ * Calling start() while a component is in states STARTING_PREP, STARTING or
+ * STARTED has no effect.
+ *
+ * Calling stop() while a component is in states STOPPING_PREP, STOPPING or
+ * STOPPED has no effect.
+ *
+ * MUST_STOP is used to indicate that the {...@link #stop()} should be called
on
+ * the component as soon as {...@link start()} exits.
+ *
+ * Attempting any other transition will throw {...@link LifecycleException}.
+ *
+ *
+ * The {...@link LifecycleEvent}s fired during state changes are defined in the
+ * methods that trigger the changed. No {...@link LifecycleEvent}s are fired
if the
+ * attempted transition is not valid.
+ *
+ * TODO: Not all components may transition from STOPPED to STARTING_PREP
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-
public interface Lifecycle {
@@ -118,8 +156,21 @@
/**
* Prepare for the beginning of active use of the public methods of this
* component. This method should be called before any of the public
- * methods of this component are utilized. It should also send a
- * LifecycleEvent of type START_EVENT to any registered listeners.
+ * methods of this component are utilized. The following
+ * {...@link LifecycleEvent}s will be fired in the following order:
+ *
+ * BEFORE_START_EVENT: At the beginning of the method. It is as this
+ * point the state transitions to
+ * {...@link LifecycleState#STARTING_PREP}.
+ * START_EVENT: During the method once it is safe to call start() for
+ *any child components. It is at this point that the
+ *state transitions to {...@link
LifecycleState#STARTING}
+ *and that the public methods may be used.
+ * AFTER_START_EVENT: At the end of the method, immediately before it
+ * returns. It is at this point that the state
+ * transitions to {...@link
LifecycleState#STARTED}.
+ *
+ *
*
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
@@ -129,14 +180,35 @@
/**
* Gracefully terminate the active use of the public methods of this
- * component. Thi
svn commit: r919076 - in /tomcat/trunk/modules/jdbc-pool: build.properties.default doc/jdbc-pool.xml java/org/apache/tomcat/jdbc/pool/PoolProperties.java java/org/apache/tomcat/jdbc/pool/ProxyConnecti
Author: fhanik
Date: Thu Mar 4 17:21:41 2010
New Revision: 919076
URL: http://svn.apache.org/viewvc?rev=919076&view=rev
Log:
Add in and document more XA support
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=919076&r1=919075&r2=919076&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Mar 4 17:21:41
2010
@@ -27,8 +27,8 @@
# - Vesion Control Flags -
version.major=1
version.minor=0
-version.build=8
-version.patch=5
+version.build=9
+version.patch=0
version.suffix=
# - Default Base Path for Dependent Packages -
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=919076&r1=919075&r2=919076&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Thu Mar 4 17:21:41 2010
@@ -88,7 +88,7 @@
Get JMX notifications and log entries when connections are suspected
for being abandoned. This is similar to
the removeAbandonedTimeout but it doesn't take any
action, only reports the information.
This is achieved using the suspectTimeout
attribute.
- Connections can be retrieved from a java.sql.Driver or
a javax.sql.DataSource
+ Connections can be retrieved from a java.sql.Driver,
javax.sql.DataSource or javax.sql.XADataSource
This is achieved using the dataSource and
dataSourceJNDI attributes.
XA connection support
@@ -149,7 +149,8 @@
factory is required, and the value should be
org.apache.tomcat.jdbc.pool.DataSourceFactory
-Type should always be javax.sql.DataSource
+Type should always be javax.sql.DataSource or
javax.sql.XADataSource
+Depending on the type a
org.apache.tomcat.jdbc.pool.DataSource or a
org.apache.tomcat.jdbc.pool.XADataSource will be created.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=919076&r1=919075&r2=919076&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Mar 4 17:21:41 2010
@@ -749,6 +749,7 @@
boolean result = timer && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
result = result || (timer && getSuspectTimeout()>0);
result = result || (timer && isTestWhileIdle() &&
getValidationQuery()!=null);
+result = result || (timer && getMinEvictableIdleTimeMillis()>0);
return result;
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=919076&r1=919075&r2=919076&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Thu Mar 4 17:21:41 2010
@@ -68,13 +68,19 @@
}
public boolean isWrapperFor(Class iface) throws SQLException {
-return (iface.isInstance(connection.getConnection()));
+if (iface == XAConnection.class && connection.getXAConnection()!=null)
{
+return true;
+} else {
+return (iface.isInstance(connection.getConnection()));
+}
}
public Object unwrap(Class iface) throws SQLException {
if (iface == PooledConnection.class) {
return connection;
+}else if (iface == XAConnection.class) {
+return connection.getXAConnection();
} else if (isWrapperFor(iface)) {
return connection.getConnection();
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919030 - in /tomcat/tc5.5.x/trunk/connectors/procrun/bin: amd64/tomcat5.exe ia64/tomcat5.exe tomcat5.exe tomcat5w.exe
Author: mturk Date: Thu Mar 4 15:47:16 2010 New Revision: 919030 URL: http://svn.apache.org/viewvc?rev=919030&view=rev Log: Update latest procrun builds Modified: tomcat/tc5.5.x/trunk/connectors/procrun/bin/amd64/tomcat5.exe tomcat/tc5.5.x/trunk/connectors/procrun/bin/ia64/tomcat5.exe tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5.exe tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5w.exe Modified: tomcat/tc5.5.x/trunk/connectors/procrun/bin/amd64/tomcat5.exe URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/procrun/bin/amd64/tomcat5.exe?rev=919030&r1=919029&r2=919030&view=diff == Binary files - no diff available. Modified: tomcat/tc5.5.x/trunk/connectors/procrun/bin/ia64/tomcat5.exe URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/procrun/bin/ia64/tomcat5.exe?rev=919030&r1=919029&r2=919030&view=diff == Binary files - no diff available. Modified: tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5.exe URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5.exe?rev=919030&r1=919029&r2=919030&view=diff == Binary files - no diff available. Modified: tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5w.exe URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/procrun/bin/tomcat5w.exe?rev=919030&r1=919029&r2=919030&view=diff == Binary files - no diff available. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULTS][VOTE] Release build 6.0.25
On 3/4/10 3:13 AM, Henri Gomez wrote: A dependency on an 'unreleased' product ? I think he means Apache Geronimo. Bill - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919020 - in /tomcat/site/trunk: docs/security-5.html xdocs/security-5.xml
Author: kkolinko Date: Thu Mar 4 15:26:32 2010 New Revision: 919020 URL: http://svn.apache.org/viewvc?rev=919020&view=rev Log: update the security page, because the fix for CVE-2009-3548 was applied to 5.5 Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/xdocs/security-5.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=919020&r1=919019&r2=919020&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Thu Mar 4 15:26:32 2010 @@ -3,18 +3,18 @@ Apache Tomcat - Apache Tomcat 5.x vulnerabilities - - - + + + - - + + http://tomcat.apache.org/";> - + @@ -25,28 +25,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -172,11 +172,11 @@ - - + + - + Apache Tomcat 5.x vulnerabilities @@ -214,58 +214,14 @@ - + - + - - -Not fixed in Apache Tomcat 5.5.x - - - - - - - - - - -Note: It is expected that this issue will be fixed in 5.5.29 but the - patch has not yet received the necessary votes to be applied to the 5.5.x - code base. - - - -Low: Insecure default password - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3548";> - CVE-2009-3548 - - -The Windows installer defaults to a blank password for the administrative - user. If this is not changed during the install process, then by default - a user is created with the name admin, roles admin and manager and a - blank password. - -Affects: 5.5.0-5.5.28 - - - - - - - - - - - - - - - + Fixed in subversion for Apache Tomcat 5.5.x @@ -281,7 +237,7 @@ Note: These issues will be fixed in 5.5.29 but that version has not yet been released. - + Low: Arbitrary file deletion and/or alteration on deploy http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2693";> @@ -337,21 +293,37 @@ revision 902650. Affects: 5.5.0-5.5.28 - + + +Low: Insecure default password + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3548";> + CVE-2009-3548 + + +The Windows installer defaults to a blank password for the administrative + user. If this is not changed during the install process, then by default + a user is created with the name admin, roles admin and manager and a + blank password. + +Affects: 5.5.0-5.5.28 + +This was fixed in + http://svn.apache.org/viewvc?rev=919006&view=rev";> + revision 919006. - + - + - + Fixed in Apache Tomcat 5.5.28 @@ -466,14 +438,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.27 @@ -546,14 +518,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.26 @@ -621,14 +593,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.25, 5.0.SVN @@ -710,14 +682,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.24, 5.0.SVN @@ -747,14 +719,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.23, 5.0.SVN @@ -789,14 +761,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.22, 5.0.SVN @@ -850,14 +822,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.21, 5.0.SVN @@ -890,14 +862,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.21 @@ -942,14 +914,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.18, 5.0.SVN @@ -977,14 +949,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.17, 5.0.SVN @@ -1012,14 +984,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.16, 5.0.SVN @@ -1047,14 +1019,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.13, 5.0.SVN @@ -1102,14 +1074,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.7, 5.0.SVN @@ -1137,14 +1109,14 @@ - + - + - + Fixed in Apache Tomcat 5.5.1 @@ -1176,14 +1148,14 @@ - + - + - + Not a vulnerability in Tomcat @@ -1286,7 +1258,7 @@ - + @@ -1295,17 +1267,17 @@ - + - + Copyright © 1999-2010, The Apache Software Foundation - + "Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=919020&r1=919019&r2=919020&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (or
svn commit: r919006 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/resources/config.ini build/tomcat.nsi container/webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Mar 4 14:46:41 2010
New Revision: 919006
URL: http://svn.apache.org/viewvc?rev=919006&view=rev
Log:
Fix CVE-2009-3548. When installed via the Windows installer and
using defaults, don't create an administrative user with a blank
password. Additionally, the administrative user is only created if the
manager or host-manager web applications are selected for installation.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/resources/config.ini
tomcat/tc5.5.x/trunk/build/tomcat.nsi
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=919006&r1=919005&r2=919006&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 14:46:41 2010
@@ -67,13 +67,6 @@
kkolinko - Just a note: This issue won't affect configurations where
Jasper
runs with development=false.
-* Fix CVE-2009-3548 - Windows installer uses insecure default password
- Also removes some old commented-out code and changes some message strings.
- This patch file is a backport of revs. 834047, 836036, 836045, 836209
-
http://people.apache.org/~kkolinko/patches/2009-11-14_Installer_password_tc55.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48322
Single quote should be not be treated as a separator
http://svn.apache.org/viewvc?rev=830999&view=rev
Modified: tomcat/tc5.5.x/trunk/build/resources/config.ini
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/config.ini?rev=919006&r1=919005&r2=919006&view=diff
==
--- tomcat/tc5.5.x/trunk/build/resources/config.ini (original)
+++ tomcat/tc5.5.x/trunk/build/resources/config.ini Thu Mar 4 14:46:41 2010
@@ -20,7 +20,7 @@
[Field 3]
Type=Label
-text=Administrator Login
+text=Tomcat Administrator Login (optional)
left=0
right=300
top=30
@@ -29,14 +29,13 @@
[Field 4]
Type=Label
Text=User Name
-left=0
+left=10
right=150
top=50
bottom=65
[Field 5]
Type=Text
-State=admin
left=150
right=250
top=50
@@ -45,7 +44,7 @@
[Field 6]
Type=Label
Text=Password
-left=0
+left=10
right=150
top=70
bottom=85
Modified: tomcat/tc5.5.x/trunk/build/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tomcat.nsi?rev=919006&r1=919005&r2=919006&view=diff
==
--- tomcat/tc5.5.x/trunk/build/tomcat.nsi (original)
+++ tomcat/tc5.5.x/trunk/build/tomcat.nsi Thu Mar 4 14:46:41 2010
@@ -96,13 +96,13 @@
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container as a Windows service."
LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core."
-LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the
Tomcat service when the computer is started. This requires Windows NT 4.0,
Windows 2000 or Windows XP."
+LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the
Tomcat service when the computer is started."
LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat
native .dll for better performance and scalability in production environments."
-;LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat
source code."
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
-LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This include documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
-LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web
applications."
-LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web
application."
+LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This includes documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
+LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager
administrative web application."
+LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host
Manager administrative web application."
+LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
example web applications."
LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web
applications (WebDAV, balancer, etc)."
;LangString DESC_SecCompat ${LANG_ENGLISH} "Installs Java2 compatibility
package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or
later. It can b
svn commit: r919005 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Mar 4 14:45:24 2010 New Revision: 919005 URL: http://svn.apache.org/viewvc?rev=919005&view=rev Log: Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919005&r1=919004&r2=919005&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 14:45:24 2010 @@ -79,7 +79,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660 Vary should add to Vary header rather than over-write it http://svn.apache.org/viewvc?rev=918093&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545 @@ -132,11 +132,11 @@ Using a body with tags specified to have empty body content should cause an error http://svn.apache.org/viewvc?rev=918684&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Move source/target JDK versions to the main section of the manifest, because these values belong to the JAR file as the whole, not to some subset of it. http://svn.apache.org/viewvc?rev=918923&view=rev - +1: kkolinko + +1: kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918999 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java container/webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Mar 4 14:34:28 2010
New Revision: 918999
URL: http://svn.apache.org/viewvc?rev=918999&view=rev
Log:
Fix 'Error' part of https://issues.apache.org/bugzilla/show_bug.cgi?id=48584
Prevent the APR connector logging an error if the acceptor fails during
shutdown since this is expected.
Patch by mturk
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.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=918999&r1=918998&r2=918999&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 14:34:28 2010
@@ -122,11 +122,3 @@
Patch by markt
+1: kkolinko, rjung
-1:
-
-* Fix 'Error' part of https://issues.apache.org/bugzilla/show_bug.cgi?id=48584
- Prevent the APR connector logging an error if the acceptor fails during
- shutdown since this is expected.
- Patch by mturk
- http://svn.apache.org/viewvc?rev=918495&view=rev
- +1: kkolinko, rjung, mturk
- -1:
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=918999&r1=918998&r2=918999&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Thu Mar 4 14:34:28 2010
@@ -1005,7 +1005,7 @@
// Hand this socket off to an appropriate processor
getWorkerThread().assign(socket, true);
} catch (Throwable t) {
-log.error(sm.getString("endpoint.accept.fail"), t);
+if (running)
log.error(sm.getString("endpoint.accept.fail"), t);
}
// The processor will recycle itself when it finishes
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=918999&r1=918998&r2=918999&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Mar 4
14:34:28 2010
@@ -190,6 +190,10 @@
48581: Avoid security exception on first access. (markt)
+48584: Prevent the APR connector logging an error if the
+acceptor fails during shutdown since this is expected. (mturk)
+
+
CVE-2009-3555. Provide option to disable legacy SSL renegotiation.
(markt/costin)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918998 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung
Date: Thu Mar 4 14:32:05 2010
New Revision: 918998
URL: http://svn.apache.org/viewvc?rev=918998&view=rev
Log:
Vote, comment.
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=918998&r1=918997&r2=918998&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 14:32:05 2010
@@ -37,7 +37,7 @@
Reuses StringBuffer, uses char instead of single-char String, etc.
http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_ALV.patch
http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_FCALV.patch
- +1: kkolinko
+ +1: kkolinko, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
@@ -55,6 +55,7 @@
kkolinko: To reviewers: the patch looks scary, but the only thing it
actually does is to add "synchronized (name.intern()) {" around the
whole contents of the method.
+ rjung: Isn't there a possibility for deadlocks?
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47878
Return 404's rather than a permanent 500 if a JSP is deleted
@@ -70,19 +71,21 @@
Also removes some old commented-out code and changes some message strings.
This patch file is a backport of revs. 834047, 836036, 836045, 836209
http://people.apache.org/~kkolinko/patches/2009-11-14_Installer_password_tc55.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48322
Single quote should be not be treated as a separator
http://svn.apache.org/viewvc?rev=830999&view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
* Provide new option to allow = in cookie values
http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
+ rjung: it might be more reader friendly to explicitely add parentheses when
+ having || and && mixed in the same logical expression (see the "while" loop).
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
@@ -91,7 +94,7 @@
files used in storeconfig[-ha] module tests become broken in the -src.tar.gz
bundle.
http://people.apache.org/~kkolinko/patches/2010-01-05_tc55_bug47609.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918972 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: mturk Date: Thu Mar 4 12:46:33 2010 New Revision: 918972 URL: http://svn.apache.org/viewvc?rev=918972&view=rev Log: Vote 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=918972&r1=918971&r2=918972&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 12:46:33 2010 @@ -125,5 +125,5 @@ shutdown since this is expected. Patch by mturk http://svn.apache.org/viewvc?rev=918495&view=rev - +1: kkolinko, rjung + +1: kkolinko, rjung, mturk -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918969 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Mar 4 12:38:41 2010 New Revision: 918969 URL: http://svn.apache.org/viewvc?rev=918969&view=rev Log: Vote. 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=918969&r1=918968&r2=918969&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 12:38:41 2010 @@ -125,5 +125,5 @@ shutdown since this is expected. Patch by mturk http://svn.apache.org/viewvc?rev=918495&view=rev - +1: kkolinko + +1: kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48849] Tomcat Connector Default Maintenance Page
https://issues.apache.org/bugzilla/show_bug.cgi?id=48849 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #2 from Rainer Jung 2010-03-04 12:12:10 UTC --- The IIS reference part of the ISAPI connector docs contains a paragraph about using the "error_page" configuration introduced in version 1.2.27. It is a URL which can contain a "%d". The redirector will replace the %d with the HTTP status code and redirect the client to the resuting URL. In order to control which status codes use that feature you need to activate the mapping extension "use_server_errors". It is documented on the reference page about uriworkermap.properties. -- 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: svn commit: r917928 - in /tomcat/trunk: java/org/apache/tomcat/jni/SSL.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties webapps/do
On 03/04/2010 12:48 PM, Rainer Jung wrote: On 02.03.2010 10:14, mt...@apache.org wrote: Author: mturk Date: Tue Mar 2 09:14:44 2010 New Revision: 917928 URL: http://svn.apache.org/viewvc?rev=917928&view=rev Log: Port SSLInsecureRenegotiation from mod_ssl Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=917928&r1=917927&r2=917928&view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Tue Mar 2 09:14:44 2010 @@ -113,9 +113,12 @@ /* SSL_OP_ALL: various bug workarounds that should be rather harmless. * This used to be 0x000FL before 0.9.7. */ public static final int SSL_OP_ALL = 0x0FFF; - /* As server, disallow session resumption on renegotiation */ public static final int SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION = 0x0001; + /* Permit unsafe legacy renegotiation */ + public static final int SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION = 0x0004; + /* If set, always create a new key when using tmp_eddh parameters */ + public static final int SSL_OP_SINGLE_ECDH_USE = 0x0008; Is that intentional: ^^ Yep, intentional. It's just catching up the OpenSSL API since we are catching up anyhow. Could have probably go into a separate commit message as well. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918957 - in /tomcat/trunk/java/org/apache/naming: LocalStrings.properties NamingContext.java
Author: markt
Date: Thu Mar 4 12:05:06 2010
New Revision: 918957
URL: http://svn.apache.org/viewvc?rev=918957&view=rev
Log:
Revert r917784 and r905722 - changes associated with the invalid bug 48050
Modified:
tomcat/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings.properties?rev=918957&r1=918956&r2=918957&view=diff
==
--- tomcat/trunk/java/org/apache/naming/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings.properties Thu Mar 4
12:05:06 2010
@@ -19,7 +19,6 @@
selectorContext.noJavaUrl=This context must be accessed through a java: URL
selectorContext.methodUsingName=Call to method ''{0}'' with a Name of ''{1}''
selectorContext.methodUsingString=Call to method ''{0}'' with a String of
''{1}''
-namingContext.createSubContextInvalid=Unable to create context with name [{0}]
as a sub-context of the context named [{1}]
namingContext.contextExpected=Name is not bound to a Context
namingContext.failResolvingReference=Unexpected exception resolving reference
namingContext.nameNotBound=Name {0} is not bound in this Context
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=918957&r1=918956&r2=918957&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Thu Mar 4 12:05:06
2010
@@ -505,14 +505,11 @@
/**
* Creates and binds a new context. Creates a new context with the given
- * name and binds it in this context.
- *
- * @param name The name of the context to create; may not be empty. If the
- * name consists of a single component then the sub-context is
- * created with a prefix of the name of this context. If the
- * name has multiple components then name.prefix(name.size()-1)
- * must be the name of this context.
+ * name and binds it in the target context (that named by all but
+ * terminal atomic component of the name). All intermediate contexts and
+ * the target context must already exist.
*
+ * @param name the name of the context to create; may not be empty
* @return the newly created context
* @exception NameAlreadyBoundException if name is already bound
* @exception InvalidAttributesException if creation of the subcontext
@@ -523,25 +520,8 @@
throws NamingException {
checkWritable();
-String contextName = null;
-
-if (name.size() == 1) {
-if (this.name.endsWith("/")) {
-contextName = this.name + name.get(0);
-} else {
-contextName = this.name + "/" + name.get(0);
-}
-} else {
-if (!name.getPrefix(name.size()-1).toString().equals(name)) {
-throw new NamingException(
-sm.getString("namingContext.createSubContextInvalid",
-name, this.name));
-}
-contextName = name.toString();
-}
-
-Context newContext = new NamingContext(env, contextName);
-bind(name.getSuffix(name.size() -1), newContext);
+Context newContext = new NamingContext(env, this.name);
+bind(name, newContext);
return newContext;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48050] org.apache.naming.NamingContext's createSubcontext method returns Context with wrong name
https://issues.apache.org/bugzilla/show_bug.cgi?id=48050 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #4 from Mark Thomas 2010-03-04 12:01:54 UTC --- Doh! Of course. It is using the name to track if the overall context is read only or not. I'll revert the changes in trunk. -- 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: r918955 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Mar 4 12:01:15 2010 New Revision: 918955 URL: http://svn.apache.org/viewvc?rev=918955&view=rev Log: Withdraw 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=918955&r1=918954&r2=918955&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 12:01:15 2010 @@ -76,12 +76,6 @@ if we remove the SCP auto feature, then there should be something to replace it with (http://ant.apache.org/manual/OptionalTasks/scp.html) -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48050 - NamingContext.createSubcontext method returns Context with wrong name - http://people.apache.org/~markt/patches/2010-03-01-bug48050.patch - +1: markt,funkman - -1: kkolinko: https://issues.apache.org/bugzilla/show_bug.cgi?id=48050#c3 - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660 Vary should add to Vary header rather than over-write it http://svn.apache.org/viewvc?rev=918093&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48855] crash coyote.http11, http 502
https://issues.apache.org/bugzilla/show_bug.cgi?id=48855 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID Severity|critical|normal --- Comment #1 from Konstantin Kolinko 2010-03-04 11:58:31 UTC --- Bugzilla is not a support forum. Please use the Tomcat users mailing list. > We have synchronized the request.setHeader(…) A lot depends on how you did that and what the actual code is. In general, you must not access "response" object from several threads, or keep references to it beyond the request processing cycle, regardless of what methods of the request/response you are calling. E.g. your stacktraces are triggered by response.getWriter().write() and by response.reset() respectively. (reset() here is called to discard preceding output before showing an error page). Thus far, there were several similar reports on users@, but the error was always in the application code, not in Tomcat. See e.g. http://marc.info/?t=12665841451&r=1&w=2 and other similar threads. If you can provide some valid sample application that reproduces the issue, feel free to reopen it. -- 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: svn commit: r917928 - in /tomcat/trunk: java/org/apache/tomcat/jni/SSL.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties webapps/do
On 02.03.2010 10:14, mt...@apache.org wrote: Author: mturk Date: Tue Mar 2 09:14:44 2010 New Revision: 917928 URL: http://svn.apache.org/viewvc?rev=917928&view=rev Log: Port SSLInsecureRenegotiation from mod_ssl Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=917928&r1=917927&r2=917928&view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Tue Mar 2 09:14:44 2010 @@ -113,9 +113,12 @@ /* SSL_OP_ALL: various bug workarounds that should be rather harmless. * This used to be 0x000FL before 0.9.7. */ public static final int SSL_OP_ALL = 0x0FFF; - /* As server, disallow session resumption on renegotiation */ public static final int SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION = 0x0001; +/* Permit unsafe legacy renegotiation */ +public static final int SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION = 0x0004; +/* If set, always create a new key when using tmp_eddh parameters */ +public static final int SSL_OP_SINGLE_ECDH_USE = 0x0008; Is that intentional: ^^ The change should have been only about reneg or did I miss somthing? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Console for Tomcat
On 03.03.2010 00:14, Bill Stoddard wrote: On 3/2/10 1:33 PM, William A. Rowe Jr. wrote: On 3/2/2010 7:18 AM, Mark Thomas wrote: On 02/03/2010 00:20, Sandro Martini wrote: For a Full Administration Console (I don't see this since a long time) we have to see later, this is complex and requires many features ... This is the bit that, to me, offers an opportunity for real value. Do you think the effort could be interesting also for the Tomcat community ? Potentially. Something else to think about is handling multiple Tomcat instances. If you could manage tens of instances from a single client then that would get a lot of interest from the user community. This was pretty much the description of the incubating Lokahi effort, which sadly was mothballed, for now, due to lack of interest from the developer community. Lokahi did not generate much interest from the user community... unfortunately. As far as I understand Lokahi tried to manage both, the Apache Webserver and Apache Tomcat. Its goal was real enterprise type management, so e.g. it put all configuration data into a database. That's a huge step from were we are now (Tomcat manager webapp) and in the Lokahi domain the "user" community is typically operations people who are often relatively far from being a developer and contributing. Trying to aim at the middle ground might trigger more interest. Being able to remotely administer, but maybe not using a very high level configuration management. That's something one could also discuss on the users list. AFAIK one of the problematic parts of the old admin webapp was getting storeconfig into a working and maintainable state. In other words: how does one correctly save changes applied to a configuration by a console? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 5.5 release
On 02.03.2010 20:54, Filip Hanik - Dev Lists wrote: Time for another one folks? Should I tag end of this week? There has been a lot of code changes in the 5.5.x branch, so I would expect some regressions, (similar experience to 6.0.x). So after this one, we can roll a bit more frequently until things settle down +1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48855] New: crash coyote.http11, http 502
https://issues.apache.org/bugzilla/show_bug.cgi?id=48855 Summary: crash coyote.http11, http 502 Product: Tomcat 6 Version: 6.0.20 Platform: Other OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: a.dila...@bytesh.com We have a big problem in different tomcat 5, 6 Java servlet application invoked via apache mod_proxy return http 502 error, after a large number of request. In this occasion the first crash signal a double stack, I think this arrives from a 2 different threads, see “FIRST STACK”. After this error most of the request signal the error 502 and in the same moment in the catalina.out we find the second error see “SECOND STACK”. If we try to call directly the tomcat that error don’t appear, if we call the apache this appear. We have synchronized the request.setHeader(…) but nothing change, this error random comeback. thanks Aristide Di Lauro Mod_proxy configuration : ProxyPass /BH/ http://machine:8081/BH/ ProxyPassReverse /BH/ http:// machine:8081/BH/ --- FIRST STACK: --- java.lang.ArrayIndexOutOfBoundsException java.lang.ArrayIndexOutOfBoundsException at org.apache.tomcat.util.http.MimeHeaders.setValue(MimeHeaders.java:269) at org.apache.tomcat.util.http.MimeHeaders.getName(MimeHeaders.java:164) at org.apache.coyote.http11.Http11Processor.prepareResponse(Http11Processor.java:1578) at org.apache.coyote.http11.Http11Processor.prepareResponse(Http11Processor.java:1609) at org.apache.coyote.http11.Http11Processor.action(Http11Processor.java:944) at org.apache.coyote.http11.Http11Processor.action(Http11Processor.java:944) at org.apache.coyote.Response.action(Response.java:183) at org.apache.coyote.Response.action(Response.java:183) at org.apache.coyote.Response.sendHeaders(Response.java:379) at org.apache.coyote.Response.sendHeaders(Response.java:379) at org.apache.catalina.connector.OutputBuffer.doFlush(OutputBuffer.java:305) at org.apache.catalina.connector.OutputBuffer.doFlush(OutputBuffer.java:305) at org.apache.catalina.connector.OutputBuffer.flush(OutputBuffer.java:288) at org.apache.catalina.connector.OutputBuffer.flush(OutputBuffer.java:288) at org.apache.catalina.connector.CoyoteOutputStream.flush(CoyoteOutputStream.java:98) at org.apache.catalina.connector.CoyoteOutputStream.flush(CoyoteOutputStream.java:98) at sun.nio.cs.StreamEncoder$ConverterSE.implFlush(StreamEncoder.java:292) at sun.nio.cs.StreamEncoder$ConverterSE.implFlush(StreamEncoder.java:292) at sun.nio.cs.StreamEncoder.flush(StreamEncoder.java:202) at sun.nio.cs.StreamEncoder.flush(StreamEncoder.java:202) at java.io.OutputStreamWriter.flush(OutputStreamWriter.java:236) at java.io.OutputStreamWriter.flush(OutputStreamWriter.java:236) at java.io.PrintWriter.flush(PrintWriter.java:291) at java.io.PrintWriter.flush(PrintWriter.java:291) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.write(JS2Pckj.java:1194) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.write(JS2Pckj.java:1194) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.gestioneVisualizzazioneWAIT(JS2Pckj.java:216) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.gestioneVisualizzazioneWAIT(JS2Pckj.java:216) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.gestioneTemplateXML(JS2Pckj.java:192) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.gestioneTemplateXML(JS2Pckj.java:192) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.trattamentoStandard(JS2Pckj.java:295) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.trattamentoStandard(JS2Pckj.java:295) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.esegui(JS2Pckj.java:137) at bytesh.jsipert2.server.framework.pckj.JS2Pckj.esegui(JS2Pckj.java:137) at bytesh.jsipert2.server.framework.BHJS2GestioneDellaRichiesta.eseguiRichiesta(BHJS2GestioneDellaRichiesta.java:290) at bytesh.jsipert2.server.framework.BHJS2GestioneDellaRichiesta.eseguiRichiesta(BHJS2GestioneDellaRichiesta.java:290) at bytesh.bh.framework.server.orchBus.action.JS2OrchestratorBus.startScriptingJS2(JS2OrchestratorBus.java:123) at bytesh.bh.framework.server.orchBus.action.JS2OrchestratorBus.startScriptingJS2(JS2OrchestratorBus.java:123) at bytesh.bh.framework.server.orchBus.action.JS2OrchestratorBus.startScripting(JS2OrchestratorBus.java:40) at bytesh.bh.framework.server.orchBus.action.JS2OrchestratorBus.startScripting(JS2OrchestratorBus.java:40) at bytesh.bh.framework.server.orchBus.ByteOrchestratorBus.eseguiRichiesta(ByteOrchestratorBus.java:83) at bytesh.bh.framework.server.orchBus.ByteOrchestratorBus.eseguiRichiesta(ByteOrchestratorBus.java:83) at bytesh.bh.framework.server.ExecuteRequest.startACTION(ExecuteRequest.java:584) at bytesh.bh.frame
svn commit: r918927 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Mar 4 10:27:26 2010 New Revision: 918927 URL: http://svn.apache.org/viewvc?rev=918927&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=918927&r1=918926&r2=918927&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 10:27:26 2010 @@ -140,3 +140,9 @@ http://svn.apache.org/viewvc?rev=918684&view=rev +1: markt, kkolinko -1: + +* Move source/target JDK versions to the main section of the manifest, + because these values belong to the JAR file as the whole, not to some subset of it. + http://svn.apache.org/viewvc?rev=918923&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r918792 - /tomcat/trunk/java/org/apache/juli/FileHandler.java
2010/3/4 Mark Thomas : > On 04/03/2010 00:28, kkoli...@apache.org wrote: >> Followup to markt's r918594 >> Replace tabs with four spaces. No functional change. > > Sorry about that. Rebuilt my machine again and forgot to setup Eclipse > for spaces and svn line-endings. > It just happens. I am sure that I myself will forget to set those properties sometime. It is good that your computer is up and running. Happy coding! Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918923 - in /tomcat/trunk/res/META-INF: annotations-api.jar.manifest el-api.jar.manifest jsp-api.jar.manifest servlet-api.jar.manifest
Author: kkolinko Date: Thu Mar 4 10:19:52 2010 New Revision: 918923 URL: http://svn.apache.org/viewvc?rev=918923&view=rev Log: Move source/target JDK versions to the main section of the manifest, because these values belong to the JAR file as the whole, not to some subset of it. Modified: tomcat/trunk/res/META-INF/annotations-api.jar.manifest tomcat/trunk/res/META-INF/el-api.jar.manifest tomcat/trunk/res/META-INF/jsp-api.jar.manifest tomcat/trunk/res/META-INF/servlet-api.jar.manifest Modified: tomcat/trunk/res/META-INF/annotations-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/annotations-api.jar.manifest?rev=918923&r1=918922&r2=918923&view=diff == --- tomcat/trunk/res/META-INF/annotations-api.jar.manifest (original) +++ tomcat/trunk/res/META-INF/annotations-api.jar.manifest Thu Mar 4 10:19:52 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/ Specification-Title: Java API for Servlets (Annotations) @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet Implementation-Version: 3...@servlet.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/trunk/res/META-INF/el-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/el-api.jar.manifest?rev=918923&r1=918922&r2=918923&view=diff == --- tomcat/trunk/res/META-INF/el-api.jar.manifest (original) +++ tomcat/trunk/res/META-INF/el-api.jar.manifest Thu Mar 4 10:19:52 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/el/ Specification-Title: Expression Language @@ -7,5 +9,3 @@ Implementation-Title: javax.el Implementation-Version: 2...@el.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/trunk/res/META-INF/jsp-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jsp-api.jar.manifest?rev=918923&r1=918922&r2=918923&view=diff == --- tomcat/trunk/res/META-INF/jsp-api.jar.manifest (original) +++ tomcat/trunk/res/META-INF/jsp-api.jar.manifest Thu Mar 4 10:19:52 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/jsp/ Specification-Title: Java API for JavaServer Pages @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet.jsp Implementation-Version: 2...@jsp.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/trunk/res/META-INF/servlet-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.manifest?rev=918923&r1=918922&r2=918923&view=diff == --- tomcat/trunk/res/META-INF/servlet-api.jar.manifest (original) +++ tomcat/trunk/res/META-INF/servlet-api.jar.manifest Thu Mar 4 10:19:52 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/ Specification-Title: Java API for Servlets @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet Implementation-Version: 3...@servlet.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918920 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Mar 4 10:15:07 2010 New Revision: 918920 URL: http://svn.apache.org/viewvc?rev=918920&view=rev Log: veto 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=918920&r1=918919&r2=918920&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 10:15:07 2010 @@ -80,7 +80,7 @@ NamingContext.createSubcontext method returns Context with wrong name http://people.apache.org/~markt/patches/2010-03-01-bug48050.patch +1: markt,funkman - -1: + -1: kkolinko: https://issues.apache.org/bugzilla/show_bug.cgi?id=48050#c3 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660 Vary should add to Vary header rather than over-write it - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48050] org.apache.naming.NamingContext's createSubcontext method returns Context with wrong name
https://issues.apache.org/bugzilla/show_bug.cgi?id=48050 --- Comment #3 from Konstantin Kolinko 2010-03-04 10:13:54 UTC --- Please note, that this o.a.naming.NamingContext.name field is something internal: It is used to implement NamingContext.isWritable(), and it is *not* exposed through any public API. (though it is accessible to subclasses because of being protected) NamingContext.isWritable() is implemented as readOnlyContexts.containsKey(name) where readOnlyContexts is some Hashtable. Note that the exact name is checked for being in readOnlyContexts table, not some prefix of it. Thus, Context newContext = new NamingContext(env, this.name); bind(name, newContext); means that the new context 1) is bound to the name 'name' 2) shares the property of being read-only with the current context, thus this.name Thus, the current code is correct. The JavaDoc for NamingContext.name property is /** * Name of the associated Catalina Context. */ protected String name; It does not say that it is name of this context, but explicitly says that the name belongs to another object. -- 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: svn commit: r918792 - /tomcat/trunk/java/org/apache/juli/FileHandler.java
On 04/03/2010 00:28, kkoli...@apache.org wrote: > Author: kkolinko > Date: Thu Mar 4 00:28:47 2010 > New Revision: 918792 > > URL: http://svn.apache.org/viewvc?rev=918792&view=rev > Log: > Followup to markt's r918594 > Replace tabs with four spaces. No functional change. Sorry about that. Rebuilt my machine again and forgot to setup Eclipse for spaces and svn line-endings. Should be fixed for future commits. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918916 - /tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Thu Mar 4 09:49:04 2010 New Revision: 918916 URL: http://svn.apache.org/viewvc?rev=918916&view=rev Log: If subsection name is not unique, prefix the anchor name with the name of section that contains it. This is especially useful for the Tomcat configuration docs, where names such as "Introduction" or "Attributes" are not unique. See e.g. config/filter.html config/valve.html It is backport of r918914 from trunk Modified: tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=918916&r1=918915&r2=918916&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl Thu Mar 4 09:49:04 2010 @@ -219,6 +219,11 @@ + + + @@ -243,6 +248,11 @@ + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918914 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Thu Mar 4 09:47:35 2010 New Revision: 918914 URL: http://svn.apache.org/viewvc?rev=918914&view=rev Log: If subsection name is not unique, prefix the anchor name with the name of section that contains it. This is especially useful for the Tomcat configuration docs, where names such as "Introduction" or "Attributes" are not unique. See e.g. config/filter.html config/valve.html Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=918914&r1=918913&r2=918914&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Thu Mar 4 09:47:35 2010 @@ -219,6 +219,11 @@ + + + @@ -243,6 +248,11 @@ + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918904 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Mar 4 09:04:38 2010 New Revision: 918904 URL: http://svn.apache.org/viewvc?rev=918904&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=918904&r1=918903&r2=918904&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 09:04:38 2010 @@ -138,5 +138,5 @@ Using a body with tags specified to have empty body content should cause an error http://svn.apache.org/viewvc?rev=918684&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918895 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestJspDocumentParser.java webapp/bug47977.jspx webapp/bug48827.jspx
Author: kkolinko
Date: Thu Mar 4 08:49:38 2010
New Revision: 918895
URL: http://svn.apache.org/viewvc?rev=918895&view=rev
Log:
svn:eol-style, no functional change
(followup to r918682)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
(contents, props changed)
tomcat/trunk/test/webapp/bug47977.jspx (contents, props changed)
tomcat/trunk/test/webapp/bug48827.jspx (contents, props changed)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=918895&r1=918894&r2=918895&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Thu
Mar 4 08:49:38 2010
@@ -1,69 +1,69 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jasper.compiler;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-
-public class TestJspDocumentParser extends TomcatBaseTest {
-
-public void testBug47977() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir =
-new File("test/webapp");
-// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-Exception e = null;
-try {
-getUrl("http://localhost:"; + getPort() + "/test/bug47977.jspx");
-} catch (IOException ioe) {
-e = ioe;
-}
-
-// Failure is expected
-assertNotNull(e);
-}
-
-public void testBug48827() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir =
-new File("test/webapp");
-// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
-Exception e = null;
-try {
-getUrl("http://localhost:"; + getPort() + "/test/bug48827.jspx");
-} catch (IOException ioe) {
-e = ioe;
-}
-
-// Should not fail
-assertNull(e);
-}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jasper.compiler;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestJspDocumentParser extends TomcatBaseTest {
+
+public void testBug47977() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+Exception e = null;
+try {
+getUrl("http://localhost:"; + getPort() + "/test/bug47977.jspx");
+} catch (IOException ioe) {
+e = ioe;
+}
+
+// Failure is expected
+assertNotNull(e);
+}
+
+public void testBug48827() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("tes
svn commit: r918889 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Mar 4 08:27:06 2010 New Revision: 918889 URL: http://svn.apache.org/viewvc?rev=918889&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=918889&r1=91&r2=918889&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 4 08:27:06 2010 @@ -124,6 +124,11 @@ http://svn.apache.org/viewvc?rev=918792&view=rev (FileHandler: whitespace) http://svn.apache.org/viewvc?rev=918799&view=rev (FileHandler: try/finally) http://svn.apache.org/viewvc?rev=918787&view=rev (ClassLoaderLogManager: fix BZ48831) + http://svn.apache.org/viewvc?rev=918885&view=rev (ignore reset call from j.u.l.LogManager.Cleaner) + + here is the combined patch file + (revisions 910974,918594,918792,918799,918787,918885): + http://people.apache.org/~kkolinko/patches/2010-03-04_tc6_bug48831.patch +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULTS][VOTE] Release build 6.0.25
A dependency on an 'unreleased' product ? Le 4 mars 2010 à 04:04, Rex Wang a écrit : Hi, any plan when will 6.0.26 released? Our project has a dependency on it.. Thanks -Rex 2010/3/3 Mladen Turk On 03/03/2010 08:33 AM, jean-frederic clere wrote: Stable [3] Broken [2] So we go for a 6.0.26. Please commit the stuff voted in STATUS.txt And few ones that need votes :) E.g the trivial exception throwing fix for APR connector on shutdown. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Lei Wang (Rex) rwonly AT apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918885 - /tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Author: kkolinko
Date: Thu Mar 4 08:05:36 2010
New Revision: 918885
URL: http://svn.apache.org/viewvc?rev=918885&view=rev
Log:
Fix 1. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
Ignore the reset() call from java.util.logging.LogManager.Cleaner,
because we have our own shutdown hook that will take care.
There are three hooks that run at VM shutdown:
1. j.u.l.LogManager.Cleaner
2. o.a.j.ClassLoaderLogManager.Cleaner
3. o.a.c.startup.Catalina.CatalinaShutdownHook
2. vs. 3. was taken care by r910974 and r918594. This takes care of 1. vs.
(2.,3.)
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=918885&r1=918884&r2=918885&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Mar 4
08:05:36 2010
@@ -302,8 +302,14 @@
@Override
public void reset() throws SecurityException {
-ClassLoader classLoader = Thread.currentThread()
-.getContextClassLoader();
+Thread thread = Thread.currentThread();
+if (thread.getClass().getName().startsWith(
+"java.util.logging.LogManager$")) {
+// Ignore the call from java.util.logging.LogManager.Cleaner,
+// because we have our own shutdown hook
+return;
+}
+ClassLoader classLoader = thread.getContextClassLoader();
ClassLoaderLogInfo clLogInfo = getClassLoaderInfo(classLoader);
resetLoggers(clLogInfo);
super.reset();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
