DO NOT REPLY [Bug 49241] DataSourceFactory.parsePoolProperties() doesn't look for "suspectTimeout"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241 --- Comment #1 from Matt Passell 2010-05-01 21:03:50 EDT --- I'm already working on a fix for this. I'll try to add in any other missing properties I notice. I'll attach a patch when it's done. -- 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 49241] New: DataSourceFactory.parsePoolProperties() doesn't look for "suspectTimeout"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241 Summary: DataSourceFactory.parsePoolProperties() doesn't look for "suspectTimeout" Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Modules: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: mpass...@grovehillsoftware.com If you call the DataSourceFactory.parsePoolProperties() method, passing in a Properties object with the "suspectTimeout" property set, that key/value pair is never passed on to the PoolProperties.setSuspectTimeout() method. -- 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: r940089 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappLoader.java
I think that this commit broke the ability to stop and start a context. When I
start it after having stopped it, I get a
LifecycleException: An invalid Lifecycle transition was attempted
([before_start]) for component [WebappLoader[/testWeb]] in state [DESTROYED]
Sylvain
On 1 mai 2010, at 19:44, ma...@apache.org wrote:
> Author: markt
> Date: Sat May 1 17:44:26 2010
> New Revision: 940089
>
> URL: http://svn.apache.org/viewvc?rev=940089&view=rev
> Log:
> Remove the controller - MBean registration will always happen in
> init()/destroy() after Lifecycle refactoring
> Fix a handful of Eclipse/FindBugs warnings
>
> Modified:
>tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
>tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=940089&r1=940088&r2=940089&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Sat
> May 1 17:44:26 2010
> @@ -65,4 +65,5 @@ webappLoader.starting=Starting this Load
> webappLoader.stopping=Stopping this Loader
> webappLoader.failModifiedCheck=Error tracking modifications
> webappLoader.copyFailure=Failed to copy resources
> +webappLoader.mkdirFailure=Failed to create destination directory to copy
> resources
> webappLoader.namingFailure=Failed to access resource {0}
>
> Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=940089&r1=940088&r2=940089&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat May 1
> 17:44:26 2010
> @@ -271,8 +271,8 @@ public class WebappLoader extends Lifecy
>
> boolean oldDelegate = this.delegate;
> this.delegate = delegate;
> -support.firePropertyChange("delegate", new Boolean(oldDelegate),
> - new Boolean(this.delegate));
> +support.firePropertyChange("delegate", Boolean.valueOf(oldDelegate),
> + Boolean.valueOf(this.delegate));
>
> }
>
> @@ -332,8 +332,8 @@ public class WebappLoader extends Lifecy
> boolean oldReloadable = this.reloadable;
> this.reloadable = reloadable;
> support.firePropertyChange("reloadable",
> - new Boolean(oldReloadable),
> - new Boolean(this.reloadable));
> + Boolean.valueOf(oldReloadable),
> + Boolean.valueOf(this.reloadable));
>
> }
>
> @@ -542,7 +542,6 @@ public class WebappLoader extends Lifecy
> oname=new ObjectName(ctx.getEngineName() +
> ":type=Loader,path=" +
> path + ",host=" + ctx.getParent().getName());
> Registry.getRegistry(null, null).registerComponent(this,
> oname, null);
> -controller=oname;
> } catch (Exception e) {
> log.error("Error registering loader", e );
> }
> @@ -558,11 +557,8 @@ public class WebappLoader extends Lifecy
>
> @Override
> protected void destroyInternal() {
> -if( controller==oname ) {
> -// Self-registration, undo it
> -Registry.getRegistry(null, null).unregisterComponent(oname);
> -oname = null;
> -}
> +Registry.getRegistry(null, null).unregisterComponent(oname);
> +oname = null;
> }
>
> /**
> @@ -813,6 +809,7 @@ public class WebappLoader extends Lifecy
> String path = libDir.getCanonicalPath();
> classLoader.addPermission(path);
> } catch (IOException e) {
> +// Ignore
> }
> }
>
> @@ -825,6 +822,7 @@ public class WebappLoader extends Lifecy
> String path = libDir.getCanonicalPath();
> classLoader.addPermission(path);
> } catch (IOException e) {
> +// Ignore
> }
> }
> if (classesURL != null) {
> @@ -833,6 +831,7 @@ public class WebappLoader extends Lifecy
> String path = classesDir.getCanonicalPath();
> classLoader.addPermission(path);
> } catch (IOException e) {
> +
Re: [VOTE] Release Tomcat 7.0.0 based on Tomcat 7.0.0 RC1
On May 1, 2010, at 7:25 AM, Mark Thomas wrote: > > Thanks for the review. My bad. I saw we are using EPL for the JDT > compiler and assumed we'd be fine for this to. I'll see what I can do to > work around it or get the license changed. No problem. The issue seems to have originated in BCEL... David Jencks chased down some of the history... On Apr 30, 2010, at 5:40 PM, David Jencks wrote: > Mark Thomas changed the license in rev 934219 on april 14 2010. That change > and rev 934220 seem to indicate that the tomcat community thinks including > EPL source in apache svn and releases is fine. The tomcat copies are > modified from the bcel "originals" including: > > - changing the package name (rev 887296, 887302) (this could be done with > maven-shade-plugin from binaries, were they to have been aleady released > which AFAICT they aren't) > - removing unused methods ( rev 887610, 887613) > > These seem to me to be functional modifications and so decidedly outside the > acceptable uses of CPL/EPL licensed source in apache. > > These files aren't in the latest bcel tag. As seen below the bcel source has > the CPL license. BCEL needs to fix this, right? > > http://svn.apache.org/repos/asf/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java > http://svn.apache.org/repos/asf/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java > > I'm having some trouble interpreting bcel svn history but I think these were > added in rev 411580 as part of a GSOC project. I work for IBM and as IBM seems to be the original copyright holder, maybe can get a relicensed version of the files contributed. Once we track down the history of the file, will see what can be done... --kevan
svn commit: r940089 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappLoader.java
Author: markt
Date: Sat May 1 17:44:26 2010
New Revision: 940089
URL: http://svn.apache.org/viewvc?rev=940089&view=rev
Log:
Remove the controller - MBean registration will always happen in
init()/destroy() after Lifecycle refactoring
Fix a handful of Eclipse/FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=940089&r1=940088&r2=940089&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Sat
May 1 17:44:26 2010
@@ -65,4 +65,5 @@ webappLoader.starting=Starting this Load
webappLoader.stopping=Stopping this Loader
webappLoader.failModifiedCheck=Error tracking modifications
webappLoader.copyFailure=Failed to copy resources
+webappLoader.mkdirFailure=Failed to create destination directory to copy
resources
webappLoader.namingFailure=Failed to access resource {0}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=940089&r1=940088&r2=940089&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat May 1
17:44:26 2010
@@ -271,8 +271,8 @@ public class WebappLoader extends Lifecy
boolean oldDelegate = this.delegate;
this.delegate = delegate;
-support.firePropertyChange("delegate", new Boolean(oldDelegate),
- new Boolean(this.delegate));
+support.firePropertyChange("delegate", Boolean.valueOf(oldDelegate),
+ Boolean.valueOf(this.delegate));
}
@@ -332,8 +332,8 @@ public class WebappLoader extends Lifecy
boolean oldReloadable = this.reloadable;
this.reloadable = reloadable;
support.firePropertyChange("reloadable",
- new Boolean(oldReloadable),
- new Boolean(this.reloadable));
+ Boolean.valueOf(oldReloadable),
+ Boolean.valueOf(this.reloadable));
}
@@ -542,7 +542,6 @@ public class WebappLoader extends Lifecy
oname=new ObjectName(ctx.getEngineName() +
":type=Loader,path=" +
path + ",host=" + ctx.getParent().getName());
Registry.getRegistry(null, null).registerComponent(this,
oname, null);
-controller=oname;
} catch (Exception e) {
log.error("Error registering loader", e );
}
@@ -558,11 +557,8 @@ public class WebappLoader extends Lifecy
@Override
protected void destroyInternal() {
-if( controller==oname ) {
-// Self-registration, undo it
-Registry.getRegistry(null, null).unregisterComponent(oname);
-oname = null;
-}
+Registry.getRegistry(null, null).unregisterComponent(oname);
+oname = null;
}
/**
@@ -813,6 +809,7 @@ public class WebappLoader extends Lifecy
String path = libDir.getCanonicalPath();
classLoader.addPermission(path);
} catch (IOException e) {
+// Ignore
}
}
@@ -825,6 +822,7 @@ public class WebappLoader extends Lifecy
String path = libDir.getCanonicalPath();
classLoader.addPermission(path);
} catch (IOException e) {
+// Ignore
}
}
if (classesURL != null) {
@@ -833,6 +831,7 @@ public class WebappLoader extends Lifecy
String path = classesDir.getCanonicalPath();
classLoader.addPermission(path);
} catch (IOException e) {
+// Ignore
}
}
}
@@ -840,6 +839,7 @@ public class WebappLoader extends Lifecy
}
} catch (MalformedURLException e) {
+// Ignore
}
}
@@ -903,7 +903,9 @@ public class WebappLoader extends Lifecy
} else {
classRepository = new File(workDir, classesPath);
-classRepository.mkdirs();
+if (!cla
Re: svn commit: r940038 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
On 01/05/2010 17:18, Konstantin Kolinko wrote: > 2010/5/1 Mark Thomas : >> On 01/05/2010 16:15, Konstantin Kolinko wrote: >>> 2010/5/1 : >>> Why are you removing the above try/catch? >> >> It was added to catch LifecycleException when I made Catalina implement >> Lifecycle. When I removed that interface, I changed this to Exception >> but I could have / should have just removed it. So I did. >> > > Ah, I see. > > I reverted that, using some more robust code, and proposed for 6.0.x. Like it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r940038 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
2010/5/1 Mark Thomas : > On 01/05/2010 16:15, Konstantin Kolinko wrote: >> 2010/5/1 : >> Why are you removing the above try/catch? > > It was added to catch LifecycleException when I made Catalina implement > Lifecycle. When I removed that interface, I changed this to Exception > but I could have / should have just removed it. So I did. > Ah, I see. I reverted that, using some more robust code, and proposed for 6.0.x. 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: r940068 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat May 1 16:14:42 2010 New Revision: 940068 URL: http://svn.apache.org/viewvc?rev=940068&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=940068&r1=940067&r2=940068&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 1 16:14:42 2010 @@ -150,6 +150,7 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko -1: + Additional patch: Mark ResourceEntry.loadedClass as volatile. http://svn.apache.org/viewvc?rev=927877&view=rev +1: kkolinko, markt @@ -315,3 +316,15 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=25381 +1: kkolinko -1: + +* If any error happens in shutdown hook, do not forget to shutdown the + logging subsystem. + + We have to take care of it, because logging shutdown hook is already + disabled at that place. This way the unwritten messages in the cache will + not be lost. Also if any more messages will come later, Handler.reportError() + will write the first one of them to stderr, thus they will leave us a trace, + instead of being lost in a buffer. + http://svn.apache.org/viewvc?rev=940064&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940064 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
Author: kkolinko
Date: Sat May 1 16:00:29 2010
New Revision: 940064
URL: http://svn.apache.org/viewvc?rev=940064&view=rev
Log:
Log any unexpected errors that might occur during server shutdown from the
shutdown hook,
and do not forget to shutdown (read: flush) the logging subsystem.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=940064&r1=940063&r2=940064&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat May 1
16:00:29 2010
@@ -778,16 +778,19 @@ public class Catalina {
@Override
public void run() {
-
-if (getServer() != null) {
-Catalina.this.stop();
-}
-
-// If JULI is used, shut JULI down *after* the server shuts down
-// so log messages aren't lost
-LogManager logManager = LogManager.getLogManager();
-if (logManager instanceof ClassLoaderLogManager) {
-((ClassLoaderLogManager) logManager).shutdown();
+try {
+if (getServer() != null) {
+Catalina.this.stop();
+}
+} catch (Throwable ex) {
+log.error(sm.getString("catalina.shutdownHookFail"), ex);
+} finally {
+// If JULI is used, shut JULI down *after* the server shuts
down
+// so log messages aren't lost
+LogManager logManager = LogManager.getLogManager();
+if (logManager instanceof ClassLoaderLogManager) {
+((ClassLoaderLogManager) logManager).shutdown();
+}
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=940064&r1=940063&r2=940064&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Sat
May 1 16:00:29 2010
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
contextConfig.applicationUrl=Unable to determine URL for application web.xml
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940057 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Author: markt Date: Sat May 1 15:44:33 2010 New Revision: 940057 URL: http://svn.apache.org/viewvc?rev=940057&view=rev Log: Make md volatile to be sure there are no threading issues Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=940057&r1=940056&r2=940057&view=diff == --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Sat May 1 15:44:33 2010 @@ -112,7 +112,7 @@ public abstract class RealmBase extends /** * The MessageDigest object for digesting user credentials (passwords). */ -protected MessageDigest md = null; +protected volatile MessageDigest md = null; /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940056 - /tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Author: markt Date: Sat May 1 15:41:46 2010 New Revision: 940056 URL: http://svn.apache.org/viewvc?rev=940056&view=rev Log: I can't see any reason why a Realm shouldn't be re-startable by default. Individual Realms can always override this. Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=940056&r1=940055&r2=940056&view=diff == --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Sat May 1 15:41:46 2010 @@ -997,8 +997,6 @@ public abstract class RealmBase extends // Clean up allocated resources md = null; - -setState(LifecycleState.MUST_DESTROY); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r940038 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
On 01/05/2010 16:15, Konstantin Kolinko wrote:
> 2010/5/1 :
>> Author: markt
>> Date: Sat May 1 14:26:50 2010
>> New Revision: 940038
>>
>> URL: http://svn.apache.org/viewvc?rev=940038&view=rev
>> Log:
>> Minor clean-up having reviewed the diff between current code and the code
>> prior to the Lifecycle re-factoring
>>
>
>> @@ -780,11 +780,7 @@ public class Catalina {
>> public void run() {
>>
>> if (getServer() != null) {
>> -try {
>> -Catalina.this.stop();
>> -} catch (Exception e) {
>> -log.error(sm.getString("catalina.shutdownHookFail"), e);
>> -}
>> +Catalina.this.stop();
>> }
>>
>
> Why are you removing the above try/catch?
It was added to catch LifecycleException when I made Catalina implement
Lifecycle. When I removed that interface, I changed this to Exception
but I could have / should have just removed it. So I did.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49092] util.IntrospectionUtils.PATH_SEPARATOR should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=49092 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-05-01 11:21:13 EDT --- Fixed. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940055 - /tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Author: markt
Date: Sat May 1 15:20:31 2010
New Revision: 940055
URL: http://svn.apache.org/viewvc?rev=940055&view=rev
Log:
Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49092
Make constant final
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=940055&r1=940054&r2=940055&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Sat May 1 15:20:31 2010
@@ -231,7 +231,8 @@ public final class IntrospectionUtils {
}
}
-public static String PATH_SEPARATOR = System.getProperty("path.separator");
+public static final String PATH_SEPARATOR =
+System.getProperty("path.separator");
/**
* Adds classpath entries from a vector of URL's to the "tc_path_add"
System
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49234] JMX Descriptor Modifications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234 --- Comment #1 from Mark Thomas 2010-05-01 11:16:58 EDT --- username and password are meant to be read/write, otherwise looks good. Please update your patch and I'll apply 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: r940038 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
2010/5/1 :
> Author: markt
> Date: Sat May 1 14:26:50 2010
> New Revision: 940038
>
> URL: http://svn.apache.org/viewvc?rev=940038&view=rev
> Log:
> Minor clean-up having reviewed the diff between current code and the code
> prior to the Lifecycle re-factoring
>
> @@ -780,11 +780,7 @@ public class Catalina {
> public void run() {
>
> if (getServer() != null) {
> - try {
> - Catalina.this.stop();
> - } catch (Exception e) {
> - log.error(sm.getString("catalina.shutdownHookFail"), e);
> - }
> + Catalina.this.stop();
> }
>
Why are you removing the above try/catch?
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49240] Error thrown during detection of ServletContainerInitializer's
https://issues.apache.org/bugzilla/show_bug.cgi?id=49240 Pid changed: What|Removed |Added Attachment #25387|0 |1 is obsolete|| --- Comment #2 from Pid 2010-05-01 11:08:22 EDT --- Created an attachment (id=25388) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25388) Fixes thrown Error during SCI detection Patch doesn't need to warn for every NoClassDefFoundError, debug is a better logging level. -- 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: r940038 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
Author: markt
Date: Sat May 1 14:26:50 2010
New Revision: 940038
URL: http://svn.apache.org/viewvc?rev=940038&view=rev
Log:
Minor clean-up having reviewed the diff between current code and the code prior
to the Lifecycle re-factoring
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=940038&r1=940037&r2=940038&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat May 1
14:26:50 2010
@@ -96,6 +96,12 @@ public class Catalina {
/**
+ * The server component we are starting or stopping.
+ */
+protected Server server = null;
+
+
+/**
* Are we starting a new server?
*/
protected boolean starting = false;
@@ -120,12 +126,6 @@ public class Catalina {
/**
- * The Server object for this Tomcat instance
- */
-protected Server server = null;
-
-
-/**
* Is naming enabled ?
*/
protected boolean useNaming = true;
@@ -780,11 +780,7 @@ public class Catalina {
public void run() {
if (getServer() != null) {
-try {
-Catalina.this.stop();
-} catch (Exception e) {
-log.error(sm.getString("catalina.shutdownHookFail"), e);
-}
+Catalina.this.stop();
}
// If JULI is used, shut JULI down *after* the server shuts down
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=940038&r1=940037&r2=940038&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Sat
May 1 14:26:50 2010
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
contextConfig.applicationUrl=Unable to determine URL for application web.xml
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940036 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: markt
Date: Sat May 1 14:18:05 2010
New Revision: 940036
URL: http://svn.apache.org/viewvc?rev=940036&view=rev
Log:
Get the shutdown hook working again.
Now LifecycleBase uses synchronized methods, Catalina can't extend it else the
shutdown hook can't function.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=940036&r1=940035&r2=940036&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat May 1
14:18:05 2010
@@ -32,10 +32,8 @@ import java.util.logging.LogManager;
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleState;
import org.apache.catalina.Server;
import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.util.LifecycleBase;
import org.apache.juli.ClassLoaderLogManager;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.digester.Digester;
@@ -67,7 +65,7 @@ import org.xml.sax.InputSource;
* @version $Id$
*/
-public class Catalina extends LifecycleBase {
+public class Catalina {
/**
@@ -557,16 +555,10 @@ public class Catalina extends LifecycleB
}
-@Override
-protected void initInternal() {
-// NOOP
-}
-
/**
* Start a new server instance.
*/
-@Override
-protected void startInternal() {
+public void start() {
if (getServer() == null) {
load();
@@ -579,8 +571,6 @@ public class Catalina extends LifecycleB
long t1 = System.nanoTime();
-setState(LifecycleState.STARTING);
-
// Start the new server
try {
getServer().start();
@@ -615,10 +605,8 @@ public class Catalina extends LifecycleB
}
if (await) {
-setState(LifecycleState.STARTED);
-fireLifecycleEvent(AFTER_START_EVENT, null);
await();
-setState(LifecycleState.MUST_STOP);
+stop();
}
}
@@ -627,11 +615,7 @@ public class Catalina extends LifecycleB
/**
* Stop an existing server instance.
*/
-@Override
-protected void stopInternal() {
-
-fireLifecycleEvent(STOP_EVENT, null);
-setState(LifecycleState.STOPPING);
+public void stop() {
try {
// Remove the ShutdownHook first so that server.stop()
@@ -662,11 +646,6 @@ public class Catalina extends LifecycleB
}
-@Override
-protected void destroyInternal() {
-// NOOP
-}
-
/**
* Await and shutdown.
*/
@@ -803,7 +782,7 @@ public class Catalina extends LifecycleB
if (getServer() != null) {
try {
Catalina.this.stop();
-} catch (LifecycleException e) {
+} catch (Exception e) {
log.error(sm.getString("catalina.shutdownHookFail"), e);
}
}
@@ -814,9 +793,7 @@ public class Catalina extends LifecycleB
if (logManager instanceof ClassLoaderLogManager) {
((ClassLoaderLogManager) logManager).shutdown();
}
-
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940034 - /tomcat/trunk/java/org/apache/catalina/Lifecycle.java
Author: markt Date: Sat May 1 14:12:34 2010 New Revision: 940034 URL: http://svn.apache.org/viewvc?rev=940034&view=rev Log: Clarify 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=940034&r1=940033&r2=940034&view=diff == --- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original) +++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Sat May 1 14:12:34 2010 @@ -58,7 +58,7 @@ package org.apache.catalina; * STARTED has no effect. * * Calling start() while a component is in state NEW will cause init() to be - * called immediately the start() method is entered. + * called immediately after the start() method is entered. * * Calling stop() while a component is in states STOPPING_PREP, STOPPING or * STOPPED has no effect. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r940031 - in /tomcat/trunk/java/org/apache/catalina: core/StandardService.java startup/Catalina.java startup/Embedded.java
Author: markt
Date: Sat May 1 14:08:47 2010
New Revision: 940031
URL: http://svn.apache.org/viewvc?rev=940031&view=rev
Log:
Clean up start code. Catalina no longer implements Service. The model is now:
Bootstrap sorts out the class loaders, Catalina does the remaining plumbing and
holds a reference to a Server object which in turn contains 1 or more services
etc. Still need to fix the shutdown hook.
Modified:
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
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=940031&r1=940030&r2=940031&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sat May 1
14:08:47 2010
@@ -504,20 +504,16 @@ public class StandardService extends Lif
}
}
-if( oname==controller ) {
-// we registered ourself on init().
-// That should be the typical case - this object is just for
-// backward compat, nobody should bother to load it explicitly
-Registry.getRegistry(null, null).unregisterComponent(oname);
-Executor[] executors = findExecutors();
-for (int i = 0; i < executors.length; i++) {
-try {
-ObjectName executorObjectName =
-new ObjectName(domain + ":type=Executor,name=" +
executors[i].getName());
-Registry.getRegistry(null,
null).unregisterComponent(executorObjectName);
-} catch (Exception e) {
-// Ignore (invalid ON, which cannot happen)
-}
+
+Registry.getRegistry(null, null).unregisterComponent(oname);
+Executor[] executors = findExecutors();
+for (int i = 0; i < executors.length; i++) {
+try {
+ObjectName executorObjectName =
+new ObjectName(domain + ":type=Executor,name=" +
executors[i].getName());
+Registry.getRegistry(null,
null).unregisterComponent(executorObjectName);
+} catch (Exception e) {
+// Ignore (invalid ON, which cannot happen)
}
}
}
@@ -534,15 +530,8 @@ public class StandardService extends Lif
try {
// Hack - Server should be deprecated...
Container engine=this.getContainer();
-
-if (engine == null) {
-// TODO - Get this form elsewhere
-domain = "Catalina";
-} else {
-domain = engine.getName();
-}
-oname=new ObjectName(domain +
":type=Service,serviceName="+name);
-this.controller=oname;
+domain = engine.getName();
+oname=new ObjectName(domain + ":type=Service");
Registry.getRegistry(null, null)
.registerComponent(this, oname, null);
@@ -590,7 +579,6 @@ public class StandardService extends Lif
protected String domain;
protected String suffix;
protected ObjectName oname;
-protected ObjectName controller;
protected MBeanServer mserver;
public ObjectName getObjectName() {
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=940031&r1=940030&r2=940031&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat May 1
14:08:47 2010
@@ -33,10 +33,15 @@ import java.util.logging.LogManager;
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.Server;
import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.juli.ClassLoaderLogManager;
+import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.Rule;
+import org.apache.tomcat.util.log.SystemLogHandler;
+import org.apache.tomcat.util.res.StringManager;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -62,11 +67,22 @@ import org.xml.sax.InputSource;
* @version $Id$
*/
-public class Catalina extends Embedded {
+public class Catalina extends LifecycleBase {
+
+
+/**
+ * The string manager for this package.
+ */
+
svn commit: r940012 - /tomcat/trunk/java/org/apache/catalina/Lifecycle.java
Author: markt Date: Sat May 1 13:43:03 2010 New Revision: 940012 URL: http://svn.apache.org/viewvc?rev=940012&view=rev Log: Document must destroy state 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=940012&r1=940011&r2=940012&view=diff == --- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original) +++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Sat May 1 13:43:03 2010 @@ -40,15 +40,17 @@ package org.apache.catalina; * | | | | * | ---< ^ * | | | - * | | autoauto start() | - * |STOPPING_PREP --->-- STOPPING --->-- STOPPED --> - * | ^| ^ - * | |stop() | | - * | | destroy()| | - * | |destroy() | | - * | FAILED >-- DESTROYED <--- | - * | | - * --->-->- + * | | auto auto start() | + * |STOPPING_PREP -->- STOPPING -->- STOPPED >-- + * | ^ | | ^ + * | | auto | | | + * | |stop()MUST_DESTROY--<--- | | + * | || | | + * | ||auto | | + * | |destroy() \|/ destroy() | | + * | FAILED >-- DESTROYED <- | + * | | + * --->-->-- * * Any state can transition to FAILED. * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49218] Fix support for META-INF/resources
https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
--- Comment #5 from Konstantin Kolinko 2010-05-01
08:13:02 EDT ---
(In reply to comment #4)
TestStandardContextResources calling resourceF.jsp in r939650 checks for wrong
value. It should look for "resourceF.jsp in resources.jar".
Besides that, it really uncovered a bug. The test fails because of the
following:
5. In BaseDirContext#lookup():
altDirContext.lookup("META-INF/resources/" + name) does not return null, but
throws a NamingException, which aborts the for( : altDirContexts) cycle.
So, either lookup for resourceF.jsp or for resourceF.jsp will fail, depending
on the order in altDirContexts (the spec says that the order is arbitrary).
6. Also in BaseDirContext#lookup():
doLookup(name) call is also documented to throw NamingException.
Either it does not throw it and the doLookup method signature has to be updated
(or at least add a JavaDoc there), or the code is broken.
--
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 49240] Error thrown during detection of ServletContainerInitializer's
https://issues.apache.org/bugzilla/show_bug.cgi?id=49240 --- Comment #1 from Pid 2010-05-01 08:02:44 EDT --- Created an attachment (id=25387) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25387) Fixes thrown Error during ServletContainerInitializer's return if an exception is thrown, use the webapp classloader directly -- 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: r939985 - /tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
Author: kkolinko
Date: Sat May 1 11:59:54 2010
New Revision: 939985
URL: http://svn.apache.org/viewvc?rev=939985&view=rev
Log:
Fix wrapped and thus broken $Id$. Use $Revision$ instead, because it is shorter.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java?rev=939985&r1=939984&r2=939985&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
Sat May 1 11:59:54 2010
@@ -30,8 +30,7 @@ import javax.servlet.http.HttpServletRes
* Test Mock with wrong Annotation!
*
* @author Peter Rossbach
- * @version $Id: DuplicateMappingParamServlet.java 939221 2010-04-29 07:30:29Z
- * kkolinko $
+ * @version $Revision$
*/
@WebServlet(value = "/annotation/overwrite", urlPatterns = { "/param2" }, name
= "param", initParams = {
@WebInitParam(name = "foo", value = "Hello"),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Tomcat 7.0.0 based on Tomcat 7.0.0 RC1
A little later than it should have been. The result of this vote was broken due to a number of licensing issues. RC2 will follow once these have been resolved. Mark On 14/04/2010 11:34, Mark Thomas wrote: > All, > > After the experience of the recent 6.0.x releases, I wanted to try an > alternative approach and use explicit release candidates for 7.0.x. I'm > expecting to tweak the release process as we go. > > The first Tomcat 7 release candiate is ready for testing. 7.0.0-RC1 can > be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.0-RC1/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1/ > > Please test this release candidate and provide feedback. > > Please run all of your tests against this candidate and report all > failures. I'd like to avoid the test, stop at first failure, new RC, > test, stop at first failure, new RC etc. cycle. > > And now for the important part: > > The 7.0.0-RC1 tag is > [ ] Broken - do not release > [ ] Alpha - go ahead and release 7.0.0 Stable based on 7.0.0-RC1 > [ ] Beta - go ahead and release 7.0.0 Beta based on 7.0.0-RC1 > [ ] Stable - go ahead and release 7.0.0 Stable based on 7.0.0-RC1 > > The following issues were noted: > - > > > Thanks, > > Mark > > > > - > 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
DO NOT REPLY [Bug 49240] New: Error thrown during detection of ServletContainerInitializer's
https://issues.apache.org/bugzilla/show_bug.cgi?id=49240 Summary: Error thrown during detection of ServletContainerInitializer's Product: Tomcat 7 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: bugzi...@pidster.com ContextConfig.checkHandlesTypes() throws a NoClassDefFoundError, which isn't caught, when the class being analysed is initialised if the class, or a class that it references(?), is not present in the classpath. E.g. When a mysql connector/j jar (v5.x) is scanned, an attempt to load the following class occurs: com.mchange.v2.c3p0.QueryConnectionTester java.lang.NoClassDefFoundError: com/mchange/v2/c3p0/QueryConnectionTester at java.lang.ClassLoader.defineClass1(Native Method) at java.lang.ClassLoader.defineClass(ClassLoader.java:698) at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:124) at java.net.URLClassLoader.defineClass(URLClassLoader.java:260) at java.net.URLClassLoader.access$000(URLClassLoader.java:56) at java.net.URLClassLoader$1.run(URLClassLoader.java:195) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:188) at java.lang.ClassLoader.loadClass(ClassLoader.java:315) at java.lang.ClassLoader.loadClass(ClassLoader.java:250) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:247) Also Class.forName is used here, referencing the WebappClassLoader, instead of calling WebappClassLoader.loadClass() directly. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Tomcat 7.0.0 based on Tomcat 7.0.0 RC1
On 30/04/2010 23:37, Kevan Miller wrote: > > On Apr 14, 2010, at 5:41 PM, Mark Thomas wrote: > >> On 14/04/2010 21:31, Mark Thomas wrote: >>> On 14/04/2010 21:06, sebb wrote: 2 files in BCEL have IBM headers; these headers are presumably OK, but the NOTICE file probably needs to mention IBM. Not sure why the BCEL source archive does not do so in its NOTICE file. That might be an error. >>> Hmm. I might be able to strip down what we use from BCEL to get rid of >>> those. >> >> Easier said than done. I'll add the necessary updates to LICENSE & NOTICE. > > > I'm assuming that this vote has been cancelled. And apologies for jumping in > so late -- just read this thread (motivated by discussion on geronimo dev > list). It was, but I didn't make it official. I'll do that in a sec. > IMO, these files are not valid source files for an Apache release. I see the > two files in question were/are CPL licensed and you have elected to > distribute the files under EPL, instead. Either license seems problematic. > So, I'm not sure why it would matter... Both licenses are Category B licenses > (according to http://www.apache.org/legal/resolved.html ). Unless you feel > this source falls under the Category B exemption (which I don't think they > do), they should not be included in a release: > > "For small amounts of source that is directly consumed by the ASF product at > runtime in source form, and for which that source is unmodified and unlikely > to be changed anyway (say, by virtue of being specified by a standard), > inclusion of appropriately labeled source is also permitted. An example of > this is the web-facesconfig_1_0.dtd, whose inclusion is mandated by the JSR > 127: JavaServer Faces specification." Thanks for the review. My bad. I saw we are using EPL for the JDT compiler and assumed we'd be fine for this to. I'll see what I can do to work around it or get the license changed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r939972 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: kkolinko Date: Sat May 1 10:46:59 2010 New Revision: 939972 URL: http://svn.apache.org/viewvc?rev=939972&view=rev Log: TC 4.1 runs on JDK 1.3 and later, needs 1.4 to build a release /tomcat/archive/tc4.1.x/tags/TOMCAT_4_1_40/container/RUNNING.txt TC 3.2 README says to use JDK 1.1 or later, recommends 1.2.2+ /tomcat/archive/tc3.3.x/tags/tc3.3.2.final/container/README Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=939972&r1=939971&r2=939972&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Sat May 1 10:46:59 2010 @@ -261,7 +261,7 @@ and the respective Apache Tomcat version 4.1.40 (archived) -1.2 +1.3 @@ -276,7 +276,7 @@ and the respective Apache Tomcat version 3.3.2 (archived) -1.2? +1.1 Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=939972&r1=939971&r2=939972&view=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Sat May 1 10:46:59 2010 @@ -41,14 +41,14 @@ and the respective Apache Tomcat version 2.3/1.2 4.1.x (archived) 4.1.40 (archived) - 1.2 + 1.3 2.2/1.1 3.3.x (archived) 3.3.2 (archived) - 1.2? + 1.1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Java Servlet 3.0, Java Server Pages 2.2 & Expression Languag... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 4 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-01052010.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01052010-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-01052010-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-01052010.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/srv/gump/public/workspa ce/apache-commons/dbcp -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01052010.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomca t-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/ eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-01052010.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-
