gmane.comp.jakarta.tomcat.devel
http://blog.gmane.org/gmane.comp.jakarta.tomcat.devel
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
[Tomcat Wiki] Update of "PoweredBy" by Marus Amend
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120560
<pre>Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.
The "PoweredBy" page has been changed by Marus Amend:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=415&rev2=416
=== TheServerSide.com ===
{{http://www.theserverside.com/skin/images/header_logotype.gif}} [[http://www.theserverside.com/tss?service=direct/0/NewsThread/threadViewer.markNoisy.link&sp=l28395&sp=l136428|Tomcat is among the market leaders]] in this survey by [[http://www.theserverside.com|TheServerSide.com]].
- {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} [http://www.pc-service-langen.de] provides IT-Service] and Open Source Solutions in Frankfurt am Main Germany
+ {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} [[http://www.pc-service-langen.de |IT-Service ]] and Open Source Solutions in Frankfurt am Main Germany
== <<Anchor(more)>> ==
== More Stuff ==
</pre>Apache Wiki2012-05-26T10:54:35[Tomcat Wiki] Update of "PoweredBy" by Marus Amend
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120559
<pre>Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.
The "PoweredBy" page has been changed by Marus Amend:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=414&rev2=415
=== TheServerSide.com ===
{{http://www.theserverside.com/skin/images/header_logotype.gif}} [[http://www.theserverside.com/tss?service=direct/0/NewsThread/threadViewer.markNoisy.link&sp=l28395&sp=l136428|Tomcat is among the market leaders]] in this survey by [[http://www.theserverside.com|TheServerSide.com]].
- {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} PC-Service-Langen provides[http://www.pc-service-langen.de/|IT-Service] and Open Source Solutions in Frankfurt am Main Germany
+ {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} [http://www.pc-service-langen.de] provides IT-Service] and Open Source Solutions in Frankfurt am Main Germany
== <<Anchor(more)>> ==
== More Stuff ==
</pre>Apache Wiki2012-05-26T10:46:45[Tomcat Wiki] Update of "PoweredBy" by Marus Amend
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120558
<pre>Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.
The "PoweredBy" page has been changed by Marus Amend:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=413&rev2=414
=== TheServerSide.com ===
{{http://www.theserverside.com/skin/images/header_logotype.gif}} [[http://www.theserverside.com/tss?service=direct/0/NewsThread/threadViewer.markNoisy.link&sp=l28395&sp=l136428|Tomcat is among the market leaders]] in this survey by [[http://www.theserverside.com|TheServerSide.com]].
- {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} PC-Service-Langen provides[[attachment:http://www.pc-service-langen.de/|IT-Service]] and Open Source Solutions in Frankfurt am Main Germany
+ {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} PC-Service-Langen provides[http://www.pc-service-langen.de/|IT-Service] and Open Source Solutions in Frankfurt am Main Germany
== <<Anchor(more)>> ==
== More Stuff ==
</pre>Apache Wiki2012-05-26T10:44:01[Tomcat Wiki] Update of "PoweredBy" by Marus Amend
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120557
<pre>Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.
The "PoweredBy" page has been changed by Marus Amend:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=412&rev2=413
=== TheServerSide.com ===
{{http://www.theserverside.com/skin/images/header_logotype.gif}} [[http://www.theserverside.com/tss?service=direct/0/NewsThread/threadViewer.markNoisy.link&sp=l28395&sp=l136428|Tomcat is among the market leaders]] in this survey by [[http://www.theserverside.com|TheServerSide.com]].
+ {{http://www.pc-service-langen.de/_pics/774/Fotolia_18063805_S.jpg|Computer Service für Unternehmen, Freibrufler und Privatanwender. Anfahrt zm Ortstarif im Raum Frankfurt, Darmstadt, Offenbach|height="182px",width="170px"}} PC-Service-Langen provides[[attachment:http://www.pc-service-langen.de/|IT-Service]] and Open Source Solutions in Frankfurt am Main Germany
+
- <<Anchor(more)>>
+ == <<Anchor(more)>> ==
-
== More Stuff ==
* A [[http://developers.slashdot.org/article.pl?sid=02/08/19/2042235&tid=108|SlashDot]] discussion about using Tomcat in production.
</pre>Apache Wiki2012-05-26T10:25:40[GUMP< at >vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120556
<pre>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 general< at >gump.apache.org.
Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects,
and has been outstanding for 10 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1,
...
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar.
-INFO- Failed with reason build failed
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 sec
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.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/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:commons-beanutils-gump-25052012.xml:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:commons-validato
r-gump-25052012.jar:junit-gump-25052012.jar:junit-dep-gump-25052012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-12.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons
/logging/target/commons-logging-26052012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-26052012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26052012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26052012-dep.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
---------------------------------------------
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml
download-validate:
proxyflags:
setproxy:
testexist:
[echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar
downloadzip:
validate:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:458: java.lang.NoClassDefFoundError: org/apache/commons/beanutils/Converter
at com.puppycrawl.tools.checkstyle.CheckStyleTask.createChecker(CheckStyleTask.java:371)
at com.puppycrawl.tools.checkstyle.CheckStyleTask.realExecute(CheckStyleTask.java:300)
at com.puppycrawl.tools.checkstyle.CheckStyleTask.execute(CheckStyleTask.java:262)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:392)
at org.apache.tools.ant.Target.performTasks(Target.java:413)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1399)
at org.apache.tools.ant.Project.executeTarget(Project.java:1368)
at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1251)
at org.apache.tools.ant.Main.runBuild(Main.java:811)
at org.apache.tools.ant.Main.startAnt(Main.java:217)
at org.apache.tools.ant.Main.start(Main.java:180)
at org.apache.tools.ant.Main.main(Main.java:268)
Caused by: java.lang.ClassNotFoundException: org.apache.commons.beanutils.Converter
at java.net.URLClassLoader$1.run(URLClassLoader.java:217)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:205)
at java.lang.ClassLoader.loadClass(ClassLoader.java:321)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:294)
at java.lang.ClassLoader.loadClass(ClassLoader.java:266)
... 19 more
Total time: 1 second
---------------------------------------------
To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml
============================== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 58020026052012, vmgump.apache.org:vmgump:58020026052012
Gump E-mail Identifier (unique within run) #28.
--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]
</pre>Bill Barker2012-05-26T03:26:19[GUMP< at >vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120555
<pre>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 general< at >gump.apache.org.
Project tomcat-tc7.0.x-validate has an issue affecting its community integration.
This issue affects 1 projects,
and has been outstanding for 10 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0,
...
Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar.
-INFO- Failed with reason build failed
The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 2 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.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/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:commons-beanutils-gump-25052012.xml:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:commons-validato
r-gump-25052012.jar:junit-gump-25052012.jar:junit-dep-gump-25052012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-12.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons
/logging/target/commons-logging-26052012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-26052012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26052012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-26052012-dep.jar
---------------------------------------------
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml
download-validate:
proxyflags:
setproxy:
testexist:
[echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar
downloadzip:
validate:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
BUILD FAILED
/srv/gump/public/workspace/tomcat-7.0.x/build.xml:447: java.lang.NoClassDefFoundError: org/apache/commons/beanutils/Converter
at com.puppycrawl.tools.checkstyle.CheckStyleTask.createChecker(CheckStyleTask.java:371)
at com.puppycrawl.tools.checkstyle.CheckStyleTask.realExecute(CheckStyleTask.java:300)
at com.puppycrawl.tools.checkstyle.CheckStyleTask.execute(CheckStyleTask.java:262)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291)
at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:392)
at org.apache.tools.ant.Target.performTasks(Target.java:413)
at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1399)
at org.apache.tools.ant.Project.executeTarget(Project.java:1368)
at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
at org.apache.tools.ant.Project.executeTargets(Project.java:1251)
at org.apache.tools.ant.Main.runBuild(Main.java:811)
at org.apache.tools.ant.Main.startAnt(Main.java:217)
at org.apache.tools.ant.Main.start(Main.java:180)
at org.apache.tools.ant.Main.main(Main.java:268)
Caused by: java.lang.ClassNotFoundException: org.apache.commons.beanutils.Converter
at java.net.URLClassLoader$1.run(URLClassLoader.java:217)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:205)
at java.lang.ClassLoader.loadClass(ClassLoader.java:321)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:294)
at java.lang.ClassLoader.loadClass(ClassLoader.java:266)
... 19 more
Total time: 1 second
---------------------------------------------
To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml
- Atom: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml
============================== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 58020026052012, vmgump.apache.org:vmgump:58020026052012
Gump E-mail Identifier (unique within run) #27.
--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]
</pre>Bill Barker2012-05-26T03:26:16buildbot success in ASF Buildbot on tomcat-trunk
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120554
<pre>The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot.
Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/2990
Buildbot URL: http://ci.apache.org/
Buildslave for this Build: bb-vm_ubuntu
Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1342805
Blamelist: markt
Build succeeded!
sincerely,
-The Buildbot
</pre>buildbot< at >apache.org2012-05-25T21:30:07svn commit: r1342808 - in /tomcat/tc7.0.x/trunk: ./ res/maven/
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120551
<pre>Author: markt
Date: Fri May 25 20:48:34 2012
New Revision: 1342808
URL: http://svn.apache.org/viewvc?rev=1342808&view=rev
Log:
BZ53034. Improve POM license info
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342805
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-annotations-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Annotations Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Definition of interfaces shared by Catalina and Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ant</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Ant tasks for remote management</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ha</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat High Availability Implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-jmx-remote</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Remote JMX listener</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ws</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat JNDI Factory for Web Services</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-coyote</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Connectors and HTTP parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-dbcp</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Database Connection Pooling package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-el-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Expression language package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-core</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-jasper</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>JULI logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-logging-log4j</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>log4j logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-extras-juli-adapters</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Adapters to plug in other logging frameworks in Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-extras-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Replacement for Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-es</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Spanish translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-fr</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>French translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-ja</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Japanese translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jasper-el</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Jasper Expression Language Impl</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jasper</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcats JSP Parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jdbc</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat JDBC Pool Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom Fri May 25 20:48:34 2012
< at >< at > -21,17 +21,22 < at >< at >
<artifactId>tomcat-jsp-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>JSP package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 applies to all files apart from
+ jsp_2_2.xsd to which the CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
<dependencies>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom Fri May 25 20:48:34 2012
< at >< at > -21,17 +21,26 < at >< at >
<artifactId>tomcat-servlet-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>javax.servlet package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 applies to all files apart from
+ javaee_5.xsd, javaee_web_services_1_2.xsd,
+ javaee_web_services_client_1_2.xsd, javaee_6.xsd,
+ javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd,
+ web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the
+ CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
</project>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-tribes</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Group Communication Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom Fri May 25 20:48:34 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-util</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Common code shared by Catalina and Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
</pre>markt< at >apache.org2012-05-25T20:48:35svn commit: r1342805 - /tomcat/trunk/res/maven/
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120550
<pre>Author: markt
Date: Fri May 25 20:45:42 2012
New Revision: 1342805
URL: http://svn.apache.org/viewvc?rev=1342805&view=rev
Log:
BZ53034. Improve POM license info
Modified:
tomcat/trunk/res/maven/tomcat-annotations-api.pom
tomcat/trunk/res/maven/tomcat-api.pom
tomcat/trunk/res/maven/tomcat-catalina-ant.pom
tomcat/trunk/res/maven/tomcat-catalina-ha.pom
tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
tomcat/trunk/res/maven/tomcat-catalina-ws.pom
tomcat/trunk/res/maven/tomcat-catalina.pom
tomcat/trunk/res/maven/tomcat-coyote.pom
tomcat/trunk/res/maven/tomcat-dbcp.pom
tomcat/trunk/res/maven/tomcat-el-api.pom
tomcat/trunk/res/maven/tomcat-embed-core.pom
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom
tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom
tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom
tomcat/trunk/res/maven/tomcat-extras-juli.pom
tomcat/trunk/res/maven/tomcat-i18n-es.pom
tomcat/trunk/res/maven/tomcat-i18n-fr.pom
tomcat/trunk/res/maven/tomcat-i18n-ja.pom
tomcat/trunk/res/maven/tomcat-jasper-el.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/res/maven/tomcat-jdbc.pom
tomcat/trunk/res/maven/tomcat-jni.pom
tomcat/trunk/res/maven/tomcat-jsp-api.pom
tomcat/trunk/res/maven/tomcat-juli.pom
tomcat/trunk/res/maven/tomcat-servlet-api.pom
tomcat/trunk/res/maven/tomcat-spdy.pom
tomcat/trunk/res/maven/tomcat-tribes.pom
tomcat/trunk/res/maven/tomcat-util.pom
Modified: tomcat/trunk/res/maven/tomcat-annotations-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-annotations-api.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-annotations-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-annotations-api.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-annotations-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Annotations Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-api.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-api.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Definition of interfaces shared by Catalina and Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-catalina-ant.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ant.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ant.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ant.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ant</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Ant tasks for remote management</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-catalina-ha.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ha.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ha.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ha.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ha</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat High Availability Implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-jmx-remote</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Remote JMX listener</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-catalina-ws.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ws.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ws.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ws.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina-ws</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat JNDI Factory for Web Services</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-catalina.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-catalina</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-coyote.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-coyote.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-coyote</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Connectors and HTTP parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-dbcp.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-dbcp.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-dbcp.pom (original)
+++ tomcat/trunk/res/maven/tomcat-dbcp.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-dbcp</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Database Connection Pooling package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-el-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-el-api.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-el-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-el-api.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-el-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Expression language package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-embed-core.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-core.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-core.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-core.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-core</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-jasper</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>JULI logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-embed-logging-log4j</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>log4j logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom (original)
+++ tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-extras-juli-adapters</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Adapters to plug in other logging frameworks in Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-extras-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-extras-juli.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-extras-juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-extras-juli.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-extras-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Replacement for Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-i18n-es.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-es.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-es.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-es.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-es</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Spanish translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-i18n-fr.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-fr.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-fr.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-fr.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-fr</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>French translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-i18n-ja.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-i18n-ja.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-i18n-ja.pom (original)
+++ tomcat/trunk/res/maven/tomcat-i18n-ja.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-i18n-ja</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Japanese translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-jasper-el.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper-el.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper-el.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper-el.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jasper-el</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Jasper Expression Language Impl</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jasper</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcats JSP Parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-jdbc.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jdbc.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jdbc.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jdbc.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jdbc</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat JDBC Pool Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-jni.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jni.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jni.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jni.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-jni</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Interface code to the native connector</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-jsp-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jsp-api.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jsp-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jsp-api.pom Fri May 25 20:45:42 2012
< at >< at > -21,17 +21,22 < at >< at >
<artifactId>tomcat-jsp-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>JSP package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 applies to all files apart from
+ jsp_2_2.xsd to which the CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
<dependencies>
Modified: tomcat/trunk/res/maven/tomcat-juli.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-juli.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-juli.pom (original)
+++ tomcat/trunk/res/maven/tomcat-juli.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-juli</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-servlet-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-servlet-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Fri May 25 20:45:42 2012
< at >< at > -21,17 +21,26 < at >< at >
<artifactId>tomcat-servlet-api</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>javax.servlet package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version 1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 applies to all files apart from
+ javaee_5.xsd, javaee_web_services_1_2.xsd,
+ javaee_web_services_client_1_2.xsd, javaee_6.xsd,
+ javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd,
+ web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the
+ CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
</project>
Modified: tomcat/trunk/res/maven/tomcat-spdy.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-spdy.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-spdy.pom (original)
+++ tomcat/trunk/res/maven/tomcat-spdy.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-spdy</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>SPDY implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-tribes.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-tribes.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-tribes.pom (original)
+++ tomcat/trunk/res/maven/tomcat-tribes.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-tribes</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Tomcat Group Communication Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/trunk/res/maven/tomcat-util.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-util.pom?rev=1342805&r1=1342804&r2=1342805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-util.pom (original)
+++ tomcat/trunk/res/maven/tomcat-util.pom Fri May 25 20:45:42 2012
< at >< at > -21,7 +21,7 < at >< at >
<artifactId>tomcat-util</artifactId>
<version>< at >MAVEN.DEPLOY.VERSION< at ></version>
<description>Common code shared by Catalina and Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
</pre>markt< at >apache.org2012-05-25T20:45:44svn commit: r1342797 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120548
<pre>Author: markt
Date: Fri May 25 20:21:30 2012
New Revision: 1342797
URL: http://svn.apache.org/viewvc?rev=1342797&view=rev
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52055. Ensure ChunkedInputFilter is correctly recycled.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342795
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1342797&r1=1342796&r2=1342797&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Fri May 25 20:21:30 2012
< at >< at > -245,6 +245,7 < at >< at > public class ChunkedInputFilter implemen
pos = 0;
lastValid = 0;
endChunk = false;
+ needCRLFParse = false;
trailingHeaders.recycle();
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1342797&r1=1342796&r2=1342797&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 20:21:30 2012
< at >< at > -57,6 +57,10 < at >< at >
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>52055</bug>: An additional fix to ensure that the
+ ChunkedInputFilter is correctly recycled. (markt)
+ </fix>
+ <fix>
<bug>53021</bug>: Correct WebSocket protocol version detection. (pero)
</fix>
<add>
</pre>markt< at >apache.org2012-05-25T20:21:30svn commit: r1342795 - /tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120547
<pre>Author: markt
Date: Fri May 25 20:17:33 2012
New Revision: 1342795
URL: http://svn.apache.org/viewvc?rev=1342795&view=rev
Log:
Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52055. Ensure ChunkedInputFilter is correctly recycled.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1342795&r1=1342794&r2=1342795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Fri May 25 20:17:33 2012
< at >< at > -245,6 +245,7 < at >< at > public class ChunkedInputFilter implemen
pos = 0;
lastValid = 0;
endChunk = false;
+ needCRLFParse = false;
trailingHeaders.recycle();
}
</pre>markt< at >apache.org2012-05-25T20:17:33[Bug 53297] New: jsessionid not setting
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120545
<pre>https://issues.apache.org/bugzilla/show_bug.cgi?id=53297
Priority: P2
Bug ID: 53297
Assignee: dev< at >tomcat.apache.org
Summary: jsessionid not setting
Severity: critical
Classification: Unclassified
Reporter: wkn0< at >cdc.gov
Hardware: PC
Status: NEW
Version: 6.0.35
Component: Catalina
Product: Tomcat 6
jsessionid is not getting added to setResquestSession ID,
parseSessionId function is deprecated, and new function parsePathParameters is
not setting the jsesionid
String sessionID =
request.getPathParameter(Globals.SESSION_PARAMETER_NAME);
System.out.println("Session ID" + sessionID);
if (sessionID != null) {
request.setRequestedSessionId(sessionID);
request.setRequestedSessionURL(true);
}
</pre>bugzilla< at >apache.org2012-05-25T19:05:01svn commit: r1342717 - in /tomcat/trunk/java/org/apache: catalina/websocket/ coyote/ajp/ coyote/http11/ coyote/http11/upgrade/ tomcat/util/net/
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120542
<pre>Author: markt
Date: Fri May 25 16:39:46 2012
New Revision: 1342717
URL: http://svn.apache.org/viewvc?rev=1342717&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53074
Make WebSocket connections use infinite read timeouts by default.
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java (original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Fri May 25 16:39:46 2012
< at >< at > -43,7 +43,6 < at >< at > public abstract class StreamInbound impl
private int outboundCharBufferSize = WsOutbound.DEFAULT_BUFFER_SIZE;
-
public int getOutboundByteBufferSize() {
return outboundByteBufferSize;
}
< at >< at > -231,4 +230,17 < at >< at > public abstract class StreamInbound impl
* connection.
*/
protected abstract void onTextData(Reader r) throws IOException;
+
+ /**
+ * This default implementation sets the read timeout to infinite and expects
+ * the WebSocket application to close the connection when it is no longer
+ * required. Applications wishing to set an explicit timeout may override
+ * this method and return a value of their choice.
+ *
+ * < at >return The read timeout in milliseconds or -1 for infinite
+ */
+ < at >Override
+ public int getReadTimeout() {
+ return -1;
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri May 25 16:39:46 2012
< at >< at > -127,7 +127,8 < at >< at > public class AjpAprProtocol extends Abst
recycledProcessors.offer(processor);
if (addToPoller) {
((AprEndpoint)proto.endpoint).getPoller().add(
- socket.getSocket().longValue(), true);
+ socket.getSocket().longValue(),
+ proto.endpoint.getKeepAliveTimeout());
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri May 25 16:39:46 2012
< at >< at > -231,7 +231,8 < at >< at > public class Http11AprProtocol extends A
recycledProcessors.offer(processor);
if (addToPoller && proto.endpoint.isRunning()) {
((AprEndpoint)proto.endpoint).getPoller().add(
- socket.getSocket().longValue(), true);
+ socket.getSocket().longValue(),
+ proto.endpoint.getKeepAliveTimeout());
}
}
< at >< at > -273,11 +274,13 < at >< at > public class Http11AprProtocol extends A
socket.setAsync(true);
} else if (processor.isComet() && proto.endpoint.isRunning()) {
((AprEndpoint) proto.endpoint).getCometPoller().add(
- socket.getSocket().longValue(), false);
+ socket.getSocket().longValue(),
+ proto.endpoint.getSoTimeout());
} else {
// Upgraded
((AprEndpoint) proto.endpoint).getPoller().add(
- socket.getSocket().longValue(), false);
+ socket.getSocket().longValue(),
+ (processor.getUpgradeInbound().getReadTimeout()));
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java Fri May 25 16:39:46 2012
< at >< at > -31,6 +31,9 < at >< at > public class UpgradeAprProcessor extends
UpgradeInbound upgradeInbound) {
super(upgradeInbound);
+ Socket.timeoutSet(wrapper.getSocket().longValue(),
+ upgradeInbound.getReadTimeout());
+
this.socket = wrapper.getSocket().longValue();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java Fri May 25 16:39:46 2012
< at >< at > -32,6 +32,12 < at >< at > public class UpgradeBioProcessor extends
UpgradeInbound upgradeInbound) throws IOException {
super(upgradeInbound);
+ int timeout = upgradeInbound.getReadTimeout();
+ if (timeout < 0) {
+ timeout = 0;
+ }
+ wrapper.getSocket().setSoTimeout(timeout);
+
this.inputStream = wrapper.getSocket().getInputStream();
this.outputStream = wrapper.getSocket().getOutputStream();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java Fri May 25 16:39:46 2012
< at >< at > -33,4 +33,12 < at >< at > public interface UpgradeInbound {
SocketState onData() throws IOException;
void setUpgradeOutbound(UpgradeOutbound upgradeOutbound);
+
+ /**
+ * Allow the upgraded protocol to define the read timeout to be used with
+ * the upgraded connection.
+ *
+ * < at >return The read timeout in milliseconds or -1 for infinite
+ */
+ int getReadTimeout();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java Fri May 25 16:39:46 2012
< at >< at > -36,6 +36,8 < at >< at > public class UpgradeNioProcessor extends
UpgradeInbound upgradeInbound, NioSelectorPool pool) {
super(upgradeInbound);
+ wrapper.setTimeout(upgradeInbound.getReadTimeout());
+
this.nioChannel = wrapper.getSocket();
this.pool = pool;
this.maxRead = nioChannel.getBufHandler().getReadBuffer().capacity();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1342717&r1=1342716&r2=1342717&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri May 25 16:39:46 2012
< at >< at > -1181,14 +1181,16 < at >< at > public class AprEndpoint extends Abstrac
}
/**
- * Add specified socket and associated pool to the poller. The socket will
- * be added to a temporary array, and polled first after a maximum amount
- * of time equal to pollTime (in most cases, latency will be much lower,
- * however).
+ * Add specified socket and associated pool to the poller. The socket
+ * will be added to a temporary array, and polled first after a maximum
+ * amount of time equal to pollTime (in most cases, latency will be much
+ * lower, however).
*
- * < at >param socket to add to the poller
+ * < at >param socket to add to the poller
+ * < at >param timeout read timeout (in milliseconds) to use with this
+ * socket. Use -1 for infinite timeout
*/
- public void add(long socket, boolean keepAlive) {
+ public void add(long socket, int timeout) {
synchronized (this) {
// Add socket to the list. Newly added sockets will wait
// at most for pollTime before being polled
< at >< at > -1202,11 +1204,7 < at >< at > public class AprEndpoint extends Abstrac
return;
}
addSocket[addCount] = socket;
- if (keepAlive) {
- addSocketTimeout[addCount] = getKeepAliveTimeout();
- } else {
- addSocketTimeout[addCount] = getSoTimeout();
- }
+ addSocketTimeout[addCount] = timeout;
addCount++;
// TODO: interrupt poll ?
this.notify();
< at >< at > -1259,10 +1257,14 < at >< at > public class AprEndpoint extends Abstrac
int successCount = 0;
try {
for (int i = (addCount - 1); i >= 0; i--) {
+ int timeout = addSocketTimeout[i];
+ if (timeout > 0) {
+ // Convert milliseconds to microseconds
+ timeout = timeout * 1000;
+ }
int rv = Poll.addWithTimeout(
connectionPollset, addSocket[i],
- Poll.APR_POLLIN,
- addSocketTimeout[i] * 1000);
+ Poll.APR_POLLIN, timeout);
if (rv == Status.APR_SUCCESS) {
successCount++;
} else {
< at >< at > -1644,7 +1646,8 < at >< at > public class AprEndpoint extends Abstrac
Socket.timeoutSet(state.socket, socketProperties.getSoTimeout() * 1000);
// If all done put the socket back in the poller for
// processing of further requests
- getPoller().add(state.socket, true);
+ getPoller().add(state.socket,
+ getKeepAliveTimeout());
} else {
// Close the socket since this is
// the end of not keep-alive request.
< at >< at > -1737,7 +1740,8 < at >< at > public class AprEndpoint extends Abstrac
synchronized (socket) {
if (!deferAccept) {
if (setSocketOptions(socket.getSocket().longValue())) {
- getPoller().add(socket.getSocket().longValue(), false);
+ getPoller().add(socket.getSocket().longValue(),
+ getSoTimeout());
} else {
// Close socket and pool
destroySocket(socket.getSocket().longValue());
</pre>markt< at >apache.org2012-05-25T16:39:47Possible IIS SPDY Redirector for Tomcat
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120540
<pre>Hello! (this time I hope the e-mail is complete ;-)
Some time ago, I wrote about a possible alternative IIS AJP Connector implementation [1] that is written in C# and uses the new IIS 7/8 module pipeline, which allows to insert managed modules (.Net) in the request pipeline.
However, Mladen Turk pointed me to the SPDY protocol which could also be used for server-to-server communication as a possible replacement for AJP (which was also mentioned in the Thread "SPDY support" by Costin Manolache).
Since I had some spare time again, I started to try an implementation of an SPDY Client / Redirector for IIS 7.x/8.x which is also written in C# (using .Net Framework 4.0), which is based on SPDY Protocol Draft 3 [2]. It is a 3-layered SPDY client with a very basic IIS module that uses the client to forward requests. You can find the source code at the SVN repo here: https://kinderbasar-luhe.de:8543/svn/PreisserNormaleProjekte/SpdyConnector/
Note that there is a Java part (Eclipse project, it is a workaround to use TLS NPN) and a .Net part (Microsoft Visual Studio 2010 project). Of course, it still needs a lot of work to be done (and probably has also a number of bugs ;-) ).
If you like the connector, I would be happy to contribute it to the Apache Software Foundation (however there currently are some problems which prevent this - see below).
The architecture of that SPDY client / IIS module is the following (each layer has only dependencies to the layer(s) above):
1. SPDY Connector (protocol)
------------------------------------
2. SPDY Processor (multiplexer)
------------------------------------
3. SPDY HTTP Processor (HTTP layer)
------------------------------------
4. IIS Module (for forwarding requests)
1. "SPDY Connector" implements the SPDY protocol (without HTTP). This means e.g. it has methods to send specific frames, and it has events that are raised when other specific frames are received. It does not do any multiplexing. It is intended to be accessed by only 2 different threads (one for reading and one for writing).
2. "SPDY Processor" uses the SPDY connector and adds multiplexing to it. This means it can be accessed by several threads to get a SPDY stream and read from it / write to it. The SPDY Processor serializes these calls to the SPDY Connector.
3. "SPDY HTTP Processsor" adds an HTTP layer to the SPDY processor (e.g. it translates normal HTTP headers to SPDY ones).
4. "IIS Module" contains a class that implements System.Web.IHttpModule interface so that it can be inserted into IIS's request pipeline. It is responsible for redirecting HTTP requests using one or more SPDY HTTP Processors.
This architecture also allows to use the SPDY client as a regular client (without IIS). I also noticed a "Websockets over SPDY" proposal which I think should not be hard to implement (IIS 8 supports WebSockets, but I haven't dealt with IIS 8 websockets yet).
However, I got to some problems when I was implementing the SPDY client:
1. .Net has no support for the TLS NPN (next protocol negotiation) extension which is required by SPDY, and there seems to be no library for supporting it (at least I couldn't find one). Therefore I had to create a Java TLS tunnel which uses the NPN extension from Jetty [3]. This is similar to "stunnel" with the addition that it uses NPN to negotiate "spdy/3" as protocol. You can find it in https://kinderbasar-luhe.de:8543/svn/PreisserNormaleProjekte/SpdyConnector/Java/NpnSpdyTunnel/.
2. SPDY uses zlib for header compression. Although .Net has some support for compression in the System.IO.Compression namespace, it doesn't seem to have support for the operations required by SPDY (setting a Zlib Dictionary and using SYNC_FLUSH between header frames). (However I must admit that I don't have much knowledge about these compression technologies, so I might be wrong).
Therefore I used "ZLIB.NET" [4] which is a managed .Net implementation of zlib. However it seems to be based on an older version, and I had to hack the code which checks if the correct dictionary is set (it seemed that the adler32() function computed a wrong value for the dictionary) for the compression to work. Also, I don't know if the library can be distributed with apache licences.
Note that because of 1., the .Net SPDY client currently doesn't use any SSL/TLS, because it will connect to the Java NPN tunnel, which negotiates spdy/3 and does the encryption.
I tested the SPDY client with Google servers which use "spdy/3" for some time now. However I couldn't test it with Tomcat, as it seems that it is currently implementing spdy/2, but not spdy/3 (please correct me if I'm saying something wrong).
If you would like to test the SPDY client with IIS 7.x (Windows Server 2008 or Windows Server 2008 R2) or IIS 8.x (Windows Server 2012), you would need to do the following:
0. Ensure that the Microsoft .Net Framework 4.0 (Full) is installed. Also ensure that Role "Webserver (IIS)" with Role Service ".Net Extensibility" is enabled on the server, and that
the IIS application pool which you would like to try the redirector with is using the Framework 4.0 and "Integrated" Managed Pipeline Mode.
1. Compile and run the Java NPN tunnel. When you run it, you need to set the Boot classpath to the Jetty NPN library, e.g.
-Xbootclasspath/p:"npn-boot-8.1.2.v20120308.jar"
2. To use the SPDY IIS module, I recommend to compile it so that the compiled assembly can be used in IIS. To compile the project, run the following C# Compiler command if the current directory is the project directory (.../SpdyConnector/.Net/SPDY-Redirector/SPDY_Redirector):
C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe /out:SpdyRedirectorModule.dll /target:library /define:DEBUG /platform:anycpu /recurse:*.cs
It will generate the assembly "SpdyRedirectorModule.dll" in the current directory. Note that because .Net is intended to be platform-independent (like Java), the assembly can be used both on 32 bit and 64 bit environments.
3. Create a "bin" folder in the IIS web application where you would like to use the SPDY client. E.g. on a default IIS installation, this would be "C:\inetpub\wwwroot". Copy the SpdyRedirectorModule.dll into that "bin" folder.
4. Open the IIS manager. Navigate to the web application / virtual host where you copied the file (e.g. "Default Web Site"). Then open the item "Modules".
5. Click on "Add managed module...". In the combobox, type "Preisser.Spdy.SpdyRedirector.IisModule.SpdyHttpIisModule" (without quotes), and enter a name for it. Make sure "Invoke only for requests to ASP.Net managed applications etc" is not selected. Then click OK, and when a message appears that the type could not be found in referenced libraries, click Yes. (Note that on IIS 8, the combobox should already contain the module, and such a warning should not appear when adding it.)
6. Open a URL like "http://localhost/mail/help/intl/de/tips.html". You should now see a Google Mail page appear. (It contains several images that are also loaded from localhost).
7. If you close the Java NPN SPDY tunnel and open the URL again, the following text should appear:
HTTP 503
The request could not be served because the remote server was not available.
(when starting the Java NPN Spdy tunnel again, the URL should also work again).
Note that the current SPDY client / redirector supports only basic functionalities (e.g. it does not support POST requests). The most work probably would need to be done in the IIS module (to decide which request should be redirected, to also support other HTTP methods besides GET, etc.). Also, the SPDY client currently doesn't support streams which are initiated by server, and is not optimized for efficiency.
The .Net SPDY client will connect to "localhost:8443" where it expects the Java NPN SPDY tunnel to listen. That will establish a connection to "mail.google.com" which supports spdy/3.
Costin Manolache mentioned in the thread "SPDY support" [5] that for SPDY proxy mode to work, Tomcat would need to read and trust additional information from X- headers, like remote IP etc. Maybe Tomcat could use a "SPDY proxy mode", that in comparison to "real SPDY mode", allows to configure if header compression and TLS NPN should be used? (As it would be no real SPDY used by a Browser, it could be modified in such a way, if the other endpoint (e.g. the IIS Spdy redirector) also is implemented in that way). This would allow to not require NPN support so that the IIS SPDY redirector could be used without that Java NPN SPDY tunnel to directly connect to Tomcat (e.g. using TLS without NPN extension would be supported natively by .Net).
One thing that also came to my mind while experimenting with the SPDY connector, is that the AJP protocol has a packet "GET_BODY_CHUNK". The server (Tomcat) sends this to the front-end (Httpd, IIS) so that they send the next request body chunk. If I understood correctly, this allows Tomcat to send an HTTP response immediately, before reading all the request data. However, the current SPDY redirector would first send the complete request body to Tomcat/SPDY server, before reading any response body to send to the client. I guess an additional thread per request would be needed for that behavior, so that one thread can transfer the request body to the SPDY server and the other thread can transfer the response body to IIS.
I think when comparing AJP with SPDY as protocol for server-to-server-communication, a major advantage of SPDY is that only one TCP connection is used for several concurrent HTTP requests. In AJP, each connection can only serve one request at a time. Also, SPDY allows support for WebSockets which I don't know if it is possible with AJP.
The SPDY client also supports flow control (which was added in SPDY/3) so that if a slow client connects to IIS, IIS does not have to buffer the complete request body received by Tomcat before it can send it to the client, while concurrently serving other HTTP requests over that SPDY connection (however I didn't test if flow-control correctly works when sending a POST request to the server).
Note that C# (language) and .Net (Runtime, class libraries) are very similar to Java - so for anyone who knows Java, it should be easy to follow the C# code of that SPDY client. ;-)
Please let me know what you think.
Thanks!
Regards,
Konstantin Preißer
[1] http://markmail.org/message/livcbkoa4b7bl7yq
[2] http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
[3] http://wiki.eclipse.org/Jetty/Feature/NPN
[4] http://www.componentace.com/zlib_.NET.htm
[5] http://markmail.org/message/c7pvtquoinzwapst
</pre>Konstantin Preißer2012-05-25T16:08:55IIS SPDY Redirector for Tomcat
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120538
<pre>Hello!
Some time ago, I wrote about a possible alternative IIS AJP Connector implementation [1] that is written in C# and uses the new IIS 7/8 module pipeline, which allows to insert managed modules (.Net) in the request pipeline.
</pre>Konstantin Preißer2012-05-25T13:41:38svn commit: r1342517 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120533
<pre>Author: olamy
Date: Fri May 25 06:45:48 2012
New Revision: 1342517
URL: http://svn.apache.org/viewvc?rev=1342517&view=rev
Log:
httpsConnector.localPort needed here
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1342517&r1=1342516&r2=1342517&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Fri May 25 06:45:48 2012
< at >< at > -975,7 +975,7 < at >< at > public abstract class AbstractRunMojo
{
session.getExecutionProperties().put( "tomcat.maven.https.port",
Integer.toString( httpsConnector.getLocalPort() ) );
- portProperties.put( "tomcat.maven.https.port", Integer.toString( connector.getLocalPort() ) );
+ portProperties.put( "tomcat.maven.https.port", Integer.toString( httpsConnector.getLocalPort() ) );
System.setProperty( "tomcat.maven.https.port", Integer.toString( httpsConnector.getLocalPort() ) );
}
</pre>olamy< at >apache.org2012-05-25T06:45:49svn commit: r1342515 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/context.xml webapps/docs/jndi-resources-howto.xml
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120530
<pre>Author: kkolinko
Date: Fri May 25 06:41:02 2012
New Revision: 1342515
URL: http://svn.apache.org/viewvc?rev=1342515&view=rev
Log:
CTR: documentation
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289
Clarify ResourceLink example that uses getConnection(username, password)
Backport of r1342498 r1342503 from trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342498,1342503
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1342515&r1=1342514&r2=1342515&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 25 06:41:02 2012
< at >< at > -179,6 +179,11 < at >< at >
docs.oracle.com site, instead of obsolete ones (download.oracle.com,
java.sun.com). (kkolinko)
</update>
+ <update>
+ <bug>53289</bug>: Clarify <code>ResourceLink</code> example that
+ uses DataSource.getConnection(username, password) method. Not all
+ data source implementations support it. (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1342515&r1=1342514&r2=1342515&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Fri May 25 06:41:02 2012
< at >< at > -925,16 +925,27 < at >< at >
</attribute>
</attributes>
- <p>Shared Data Source Example</p>
+ <p>Shared Data Source Example:</p>
+ <p><strong>Warning:</strong> This feature works only if the global DataSource
+supports <code>getConnection(username, password)</code> method.
+<a href="http://commons.apache.org/dbcp/">Apache Commons DBCP</a> pool that
+Tomcat uses by default does not support it. See its Javadoc for
+<code>BasicDataSource</code> class.
+<a href="http://tomcat.apache.org/tomcat-7.0-doc/jdbc-pool.html">Apache Tomcat JDBC pool</a>
+(included with Tomcat 7 and later) does support it,
+but by default this support is disabled and can be enabled by
+<code>alternateUsernameAllowed</code> attribute. See its documentation
+for details. The example below uses Apache Tomcat JDBC pool.</p>
<source>
&lt;GlobalNamingResources&gt;
...
&lt;Resource name=&quot;sharedDataSource&quot;
global=&quot;sharedDataSource&quot;
type=&quot;javax.sql.DataSource&quot;
+ factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
+ alternateUsernameAllowed=&quot;true&quot;
username=&quot;bar&quot;
password=&quot;barpass&quot;
-
...
...
&lt;/GlobalNamingResources&gt;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342515&r1=1342514&r2=1342515&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 06:41:02 2012
< at >< at > -110,7 +110,7 < at >< at > element:</p>
<li><a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a> -
Add a link to a resource defined in the global JNDI context. Use resource
links to give a web application access to a resource defined in
- the<a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
+ the <a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
child element of the <a href="config/server.html">&lt;Server&gt;</a>
element.</li>
<li><a href="config/context.html#Transaction">&lt;Transaction&gt;</a> -
</pre>kkolinko< at >apache.org2012-05-25T06:41:02svn commit: r1342511 - in /tomcat/tc7.0.x/trunk: ./ modules/ webapps/docs/changelog.xml webapps/docs/config/context.xml webapps/docs/jndi-resources-howto.xml
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120529
<pre>Author: kkolinko
Date: Fri May 25 06:28:10 2012
New Revision: 1342511
URL: http://svn.apache.org/viewvc?rev=1342511&view=rev
Log:
Merged revisions r1342498 r1342503 from tomcat/trunk, updated jdbc-pool external to r1342500:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289
Clarified ResourceLink example that uses getConnection(username, password)
Improved JDBC pool documentation on jdbcInterceptors and alternateUsernameAllowed attributes.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/modules/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342498,1342503
Propchange: tomcat/tc7.0.x/trunk/modules/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri May 25 06:28:10 2012
< at >< at > -1 +1 < at >< at >
-^/tomcat/trunk/modules/jdbc-pool< at >1340861 jdbc-pool
+^/tomcat/trunk/modules/jdbc-pool< at >1342500 jdbc-pool
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 25 06:28:10 2012
< at >< at > -186,6 +186,11 < at >< at >
of <code>connectionTimeout</code> attribute for AJP protocol
connectors. (kkolinko)
</fix>
+ <update>
+ <bug>53289</bug>: Clarify <code>ResourceLink</code> example that
+ uses DataSource.getConnection(username, password) method. Not all
+ data source implementations support it. (kkolinko)
+ </update>
<fix>
Fix several trivial HTML markup errors in sample servlets. (kkolinko)
</fix>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Fri May 25 06:28:10 2012
< at >< at > -1196,16 +1196,26 < at >< at >
</attribute>
</attributes>
- <p>Shared Data Source Example</p>
+ <p>Shared Data Source Example:</p>
+ <p><strong>Warning:</strong> This feature works only if the global DataSource
+supports <code>getConnection(username, password)</code> method.
+<a href="http://commons.apache.org/dbcp/">Apache Commons DBCP</a> pool that
+Tomcat uses by default does not support it. See its Javadoc for
+<code>BasicDataSource</code> class.
+<a href="../jdbc-pool.html">Apache Tomcat JDBC pool</a> does support it,
+but by default this support is disabled and can be enabled by
+<code>alternateUsernameAllowed</code> attribute. See its documentation
+for details.</p>
<source>
&lt;GlobalNamingResources&gt;
...
&lt;Resource name=&quot;sharedDataSource&quot;
global=&quot;sharedDataSource&quot;
type=&quot;javax.sql.DataSource&quot;
+ factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
+ alternateUsernameAllowed=&quot;true&quot;
username=&quot;bar&quot;
password=&quot;barpass&quot;
-
...
...
&lt;/GlobalNamingResources&gt;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1342511&r1=1342510&r2=1342511&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri May 25 06:28:10 2012
< at >< at > -110,7 +110,7 < at >< at > element:</p>
<li><a href="config/context.html#Resource Links">&lt;ResourceLink&gt;</a> -
Add a link to a resource defined in the global JNDI context. Use resource
links to give a web application access to a resource defined in
- the<a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
+ the <a href="config/globalresources.html">&lt;GlobalNamingResources&gt;</a>
child element of the <a href="config/server.html">&lt;Server&gt;</a>
element.</li>
<li><a href="config/context.html#Transaction">&lt;Transaction&gt;</a> -
</pre>kkolinko< at >apache.org2012-05-25T06:28:11svn commit: r1342503 - /tomcat/trunk/webapps/docs/config/context.xml
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120528
<pre>Author: kkolinko
Date: Fri May 25 06:10:23 2012
New Revision: 1342503
URL: http://svn.apache.org/viewvc?rev=1342503&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53289
Clarify ResourceLink example that uses getConnection(username, password)
Modified:
tomcat/trunk/webapps/docs/config/context.xml
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1342503&r1=1342502&r2=1342503&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Fri May 25 06:10:23 2012
< at >< at > -1196,16 +1196,26 < at >< at >
</attribute>
</attributes>
- <p>Shared Data Source Example</p>
+ <p>Shared Data Source Example:</p>
+ <p><strong>Warning:</strong> This feature works only if the global DataSource
+supports <code>getConnection(username, password)</code> method.
+<a href="http://commons.apache.org/dbcp/">Apache Commons DBCP</a> pool that
+Tomcat uses by default does not support it. See its Javadoc for
+<code>BasicDataSource</code> class.
+<a href="../jdbc-pool.html">Apache Tomcat JDBC pool</a> does support it,
+but by default this support is disabled and can be enabled by
+<code>alternateUsernameAllowed</code> attribute. See its documentation
+for details.</p>
<source>
&lt;GlobalNamingResources&gt;
...
&lt;Resource name=&quot;sharedDataSource&quot;
global=&quot;sharedDataSource&quot;
type=&quot;javax.sql.DataSource&quot;
+ factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
+ alternateUsernameAllowed=&quot;true&quot;
username=&quot;bar&quot;
password=&quot;barpass&quot;
-
...
...
&lt;/GlobalNamingResources&gt;
</pre>kkolinko< at >apache.org2012-05-25T06:10:24svn commit: r1342500 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120527
<pre>Author: kkolinko
Date: Fri May 25 05:41:39 2012
New Revision: 1342500
URL: http://svn.apache.org/viewvc?rev=1342500&view=rev
Log:
Documentation improvements:
Add Table of Contents.
Amend documentation of jdbcInterceptors attribute, especially that extra
whitepaces are ignored. Use this feature to wrap long values.
Lessen indent of code samples to reduce width of the document.
Fix documentation of username and password attributes, mentioning alternateUsernameAllowed feature.
Fix method name typo in InterruptedException handling example.
Modified:
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
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=1342500&r1=1342499&r2=1342500&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri May 25 05:41:39 2012
< at >< at > -29,6 +29,9 < at >< at >
<body>
+<section name="Table of Contents">
+<toc/>
+</section>
<section name="Introduction">
< at >< at > -194,13 +197,19 < at >< at >
<attribute name="username" required="true">
<p>(String) The connection username to be passed to our JDBC driver to establish a connection.
- Note, at this point, <code>DataSource.getConnection(username,password)</code> is not using the credentials passed into the method.
+ Note that method <code>DataSource.getConnection(username,password)</code>
+ by default will not use credentials passed into the method,
+ but will use the ones configured here. See <code>alternateUsernameAllowed</code>
+ property for more details.
</p>
</attribute>
<attribute name="password" required="true">
<p>(String) The connection password to be passed to our JDBC driver to establish a connection.
- Note, at this point, <code>DataSource.getConnection(username,password)</code> is not using the credentials passed into the method.
+ Note that method <code>DataSource.getConnection(username,password)</code>
+ by default will not use credentials passed into the method,
+ but will use the ones configured here. See <code>alternateUsernameAllowed</code>
+ property for more details.
</p>
</attribute>
< at >< at > -352,13 +361,26 < at >< at >
</attribute>
<attribute name="jdbcInterceptors" required="false">
- <p>(String) A semicolon separated list of classnames extending <code>org.apache.tomcat.jdbc.pool.JdbcInterceptor</code> class.
- These interceptors will be inserted as an interceptor into the chain of operations on a <code>java.sql.Connection</code> object.
- The default value is <code>null</code>.<br/>
+ <p>(String) A semicolon separated list of classnames extending
+ <code>org.apache.tomcat.jdbc.pool.JdbcInterceptor</code> class.
+ See <a href="#Configuring_JDBC_interceptors">Configuring JDBC interceptors</a>
+ below for more detailed description of syntaz and examples.
+ </p>
+ <p>
+ These interceptors will be inserted as an interceptor into the chain
+ of operations on a <code>java.sql.Connection</code> object.
+ The default value is <code>null</code>.
+ </p>
+ <p>
Predefined interceptors:<br/>
- <code>org.apache.tomcat.jdbc.pool.interceptor.ConnectionState</code> - keeps track of auto commit, read only, catalog and transaction isolation level.<br/>
- <code>org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer</code> - keeps track of opened statements, and closes them when the connection is returned to the pool.<br/>
- More predefined interceptors are described in detail in the <a href="#JDBC_interceptors">JDBC Interceptors section</a>.<br/>
+ <code>org.apache.tomcat.jdbc.pool.interceptor.<br />ConnectionState</code>
+ - keeps track of auto commit, read only, catalog and transaction isolation level.<br/>
+ <code>org.apache.tomcat.jdbc.pool.interceptor.<br />StatementFinalizer</code>
+ - keeps track of opened statements, and closes them when the connection is returned to the pool.
+ </p>
+ <p>
+ More predefined interceptors are described in detail in the
+ <a href="#JDBC_interceptors">JDBC Interceptors section</a>.
</p>
</attribute>
< at >< at > -436,11 +458,17 < at >< at >
<p>(boolean) By default, the jdbc-pool will ignore the
<a href="http://docs.oracle.com/javase/6/docs/api/javax/sql/DataSource.html#getConnection(java.lang.String,%20java.lang.String)"><code>DataSource.getConnection(username,password)</code></a>
call, and simply return a previously pooled connection under the globally configured properties <code>username</code> and <code>password</code>, for performance reasons.
- The pool can however be used with different credentials each time a connection is used. Should you request a connection with the credentials user1/password1 and the connection
- was previously connected using user2/password2, the connection will be closed, and reopened with the requested credentials. This way, the pool size is still managed
- on a global level, and not on a per schema level. To enable the functionality described in the
+ </p>
+ <p>
+ The pool can however be configured to allow use of different credentials
+ each time a connection is requested. To enable the functionality described in the
<a href="http://docs.oracle.com/javase/6/docs/api/javax/sql/DataSource.html#getConnection(java.lang.String,%20java.lang.String)"><code>DataSource.getConnection(username,password)</code></a>
- call, simply set the property <code>alternateUsernameAllowed</code> to true. <br/>
+ call, simply set the property <code>alternateUsernameAllowed</code>
+ to <code>true</code>.<br />
+ Should you request a connection with the credentials user1/password1 and the connection
+ was previously connected using different user2/password2, the connection will be closed,
+ and reopened with the requested credentials. This way, the pool size is still managed
+ on a global level, and not on a per schema level. <br/>
The default value is <code>false</code>.<br/>
This property was added as an enhancement to <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=50025">bug 50025</a>.
</p>
< at >< at > -485,21 +513,33 < at >< at >
</subsection>
<subsection name="Configuring JDBC interceptors">
<p>Configuring JDBC interceptors is done using the <b>jdbcInterceptors</b> property.
- The property contains a list of semi colon separated class names. If the classname is not fully qualified it will be prefixed with the
- <code>org.apache.tomcat.jdbc.pool.interceptor.</code> prefix.<br/>
- Example:<br/>
+ The property contains a list of semicolon separated class names. If the
+ classname is not fully qualified it will be prefixed with the
+ <code>org.apache.tomcat.jdbc.pool.interceptor.</code> prefix.
+ </p>
+ <p>Example:<br/>
<code>
- jdbcInterceptors=&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;
+ jdbcInterceptors=&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+ org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;
</code>
<br/>
is the same as
<br/>
- <code> jdbcInterceptors=&quot;ConnectionState;StatementFinalizer&quot;</code><br/>
- Interceptors can have properties as well. These would be configured within the paranthesis of the class names.
- Example:<br/>
+ <code> jdbcInterceptors=&quot;ConnectionState;StatementFinalizer&quot;</code>
+ </p>
+ <p>
+ Interceptors can have properties as well. Properties for an interceptor
+ are specified within parentheses after the class name. Several properties
+ are separated by commas.
+ </p>
+ <p>Example:<br/>
<code>
jdbcInterceptors=&quot;ConnectionState;StatementFinalizer(useEquals=true)&quot;
- </code><br/>
+ </code>
+ </p>
+ <p>
+ Extra whitespace characters around class names, property names and values
+ are ignored.
</p>
</subsection>
<subsection name="org.apache.tomcat.jdbc.pool.JdbcInterceptor">
< at >< at > -597,93 +637,92 < at >< at >
<p>Other examples of Tomcat configuration for JDBC usage can be found <a href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html">in the Tomcat documentation</a>. </p>
<subsection name="Plain Ol' Java">
<p>Here is a simple example of how to create and use a data source.</p>
- <source>
- import java.sql.Connection;
- import java.sql.ResultSet;
- import java.sql.Statement;
-
- import org.apache.tomcat.jdbc.pool.DataSource;
- import org.apache.tomcat.jdbc.pool.PoolProperties;
-
- public class SimplePOJOExample {
-
- public static void main(String[] args) throws Exception {
- PoolProperties p = new PoolProperties();
- p.setUrl("jdbc:mysql://localhost:3306/mysql");
- p.setDriverClassName("com.mysql.jdbc.Driver");
- p.setUsername("root");
- p.setPassword("password");
- p.setJmxEnabled(true);
- p.setTestWhileIdle(false);
- p.setTestOnBorrow(true);
- p.setValidationQuery("SELECT 1");
- p.setTestOnReturn(false);
- p.setValidationInterval(30000);
- p.setTimeBetweenEvictionRunsMillis(30000);
- p.setMaxActive(100);
- p.setInitialSize(10);
- p.setMaxWait(10000);
- p.setRemoveAbandonedTimeout(60);
- p.setMinEvictableIdleTimeMillis(30000);
- p.setMinIdle(10);
- p.setLogAbandoned(true);
- p.setRemoveAbandoned(true);
- p.setJdbcInterceptors(&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;&quot;+
- &quot;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;);
- DataSource datasource = new DataSource();
- datasource.setPoolProperties(p);
-
- Connection con = null;
- try {
- con = datasource.getConnection();
- Statement st = con.createStatement();
- ResultSet rs = st.executeQuery("select * from user");
- int cnt = 1;
- while (rs.next()) {
- System.out.println((cnt++)+". Host:" +rs.getString("Host")+
- " User:"+rs.getString("User")+" Password:"+rs.getString("Password"));
- }
- rs.close();
- st.close();
- } finally {
- if (con!=null) try {con.close();}catch (Exception ignore) {}
- }
+<source>
+ import java.sql.Connection;
+ import java.sql.ResultSet;
+ import java.sql.Statement;
+
+ import org.apache.tomcat.jdbc.pool.DataSource;
+ import org.apache.tomcat.jdbc.pool.PoolProperties;
+
+ public class SimplePOJOExample {
+
+ public static void main(String[] args) throws Exception {
+ PoolProperties p = new PoolProperties();
+ p.setUrl("jdbc:mysql://localhost:3306/mysql");
+ p.setDriverClassName("com.mysql.jdbc.Driver");
+ p.setUsername("root");
+ p.setPassword("password");
+ p.setJmxEnabled(true);
+ p.setTestWhileIdle(false);
+ p.setTestOnBorrow(true);
+ p.setValidationQuery("SELECT 1");
+ p.setTestOnReturn(false);
+ p.setValidationInterval(30000);
+ p.setTimeBetweenEvictionRunsMillis(30000);
+ p.setMaxActive(100);
+ p.setInitialSize(10);
+ p.setMaxWait(10000);
+ p.setRemoveAbandonedTimeout(60);
+ p.setMinEvictableIdleTimeMillis(30000);
+ p.setMinIdle(10);
+ p.setLogAbandoned(true);
+ p.setRemoveAbandoned(true);
+ p.setJdbcInterceptors(
+ &quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;&quot;+
+ &quot;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;);
+ DataSource datasource = new DataSource();
+ datasource.setPoolProperties(p);
+
+ Connection con = null;
+ try {
+ con = datasource.getConnection();
+ Statement st = con.createStatement();
+ ResultSet rs = st.executeQuery("select * from user");
+ int cnt = 1;
+ while (rs.next()) {
+ System.out.println((cnt++)+". Host:" +rs.getString("Host")+
+ " User:"+rs.getString("User")+" Password:"+rs.getString("Password"));
}
+ rs.close();
+ st.close();
+ } finally {
+ if (con!=null) try {con.close();}catch (Exception ignore) {}
+ }
+ }
- }
- </source>
+ }
+</source>
</subsection>
<subsection name="As a Resource">
<p>And here is an example on how to configure a resource for JNDI lookups</p>
- <source>
- &lt;Resource name=&quot;jdbc/TestDB&quot;
- auth=&quot;Container&quot;
- type=&quot;javax.sql.DataSource&quot;
- factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
- testWhileIdle=&quot;true&quot;
- testOnBorrow=&quot;true&quot;
- testOnReturn=&quot;false&quot;
- validationQuery=&quot;SELECT 1&quot;
- validationInterval=&quot;30000&quot;
- timeBetweenEvictionRunsMillis=&quot;30000&quot;
- maxActive=&quot;100&quot;
- minIdle=&quot;10&quot;
- maxWait=&quot;10000&quot;
- initialSize=&quot;10&quot;
- removeAbandonedTimeout=&quot;60&quot;
- removeAbandoned=&quot;true&quot;
- logAbandoned=&quot;true&quot;
- minEvictableIdleTimeMillis=&quot;30000&quot;
- jmxEnabled=&quot;true&quot;
- jdbcInterceptors=
-&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;
- username=&quot;root&quot;
- password=&quot;password&quot;
- driverClassName=&quot;com.mysql.jdbc.Driver&quot;
- url=&quot;jdbc:mysql://localhost:3306/mysql&quot;/&gt;
-
-
- </source>
+<source>
+&lt;Resource name=&quot;jdbc/TestDB&quot;
+ auth=&quot;Container&quot;
+ type=&quot;javax.sql.DataSource&quot;
+ factory=&quot;org.apache.tomcat.jdbc.pool.DataSourceFactory&quot;
+ testWhileIdle=&quot;true&quot;
+ testOnBorrow=&quot;true&quot;
+ testOnReturn=&quot;false&quot;
+ validationQuery=&quot;SELECT 1&quot;
+ validationInterval=&quot;30000&quot;
+ timeBetweenEvictionRunsMillis=&quot;30000&quot;
+ maxActive=&quot;100&quot;
+ minIdle=&quot;10&quot;
+ maxWait=&quot;10000&quot;
+ initialSize=&quot;10&quot;
+ removeAbandonedTimeout=&quot;60&quot;
+ removeAbandoned=&quot;true&quot;
+ logAbandoned=&quot;true&quot;
+ minEvictableIdleTimeMillis=&quot;30000&quot;
+ jmxEnabled=&quot;true&quot;
+ jdbcInterceptors=&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+ org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer&quot;
+ username=&quot;root&quot;
+ password=&quot;password&quot;
+ driverClassName=&quot;com.mysql.jdbc.Driver&quot;
+ url=&quot;jdbc:mysql://localhost:3306/mysql&quot;/&gt;
+</source>
</subsection>
<subsection name="Asynchronous Connection Retrieval">
< at >< at > -695,23 +734,22 < at >< at >
<li>You will have to cast the data source to <code>org.apache.tomcat.jdbc.pool.DataSource</code></li>
</ol>
An example of using the async feature is show below.
- <source>
-
- Connection con = null;
- try {
- Future&lt;Connection&gt; future = datasource.getConnectionAsync();
- while (!future.isDone()) {
- System.out.println("Connection is not yet available. Do some background work");
- try {
- Thread.sleep(100); //simulate work
- }catch (InterruptedException x) {
- Thread.currentThread().interrupted();
- }
- }
- con = future.get(); //should return instantly
- Statement st = con.createStatement();
- ResultSet rs = st.executeQuery("select * from user");
- </source>
+<source>
+ Connection con = null;
+ try {
+ Future&lt;Connection&gt; future = datasource.getConnectionAsync();
+ while (!future.isDone()) {
+ System.out.println("Connection is not yet available. Do some background work");
+ try {
+ Thread.sleep(100); //simulate work
+ }catch (InterruptedException x) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ con = future.get(); //should return instantly
+ Statement st = con.createStatement();
+ ResultSet rs = st.executeQuery("select * from user");
+</source>
</p>
</subsection>
<subsection name="Interceptors">
< at >< at > -722,82 +760,79 < at >< at >
the pool itself will not reset them.</p>
<p>An interceptor has to extend the <code>org.apache.tomcat.jdbc.pool.JdbcInterceptor</code> class. This class is fairly simple,
You will need to have a no arg constructor</p>
- <source>
-
- public JdbcInterceptor() {
- }
- </source>
+<source>
+ public JdbcInterceptor() {
+ }
+</source>
<p>
When a connection is borrowed from the pool, the interceptor can initialize or in some other way react to the event by implementing the
- <source>
-
- public abstract void reset(ConnectionPool parent, PooledConnection con);
- </source>
+<source>
+ public abstract void reset(ConnectionPool parent, PooledConnection con);
+</source>
method. This method gets called with two parameters, a reference to the connection pool itself <code>ConnectionPool parent</code>
and a reference to the underlying connection <code>PooledConnection con</code>.
</p>
<p>
When a method on the <code>java.sql.Connection</code> object is invoked, it will cause the
- <source>
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
- </source>
+<source>
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+</source>
method to get invoked. The <code>Method method</code> is the actual method invoked, and <code>Object[] args</code> are the arguments.
To look at a very simple example, where we demonstrate how to make the invokation to <code>java.sql.Connection.close()</code> a noop
if the connection has been closed
- <source>
-
- if (CLOSE_VAL==method.getName()) {
- if (isClosed()) return null; //noop for already closed.
- }
- return super.invoke(proxy,method,args);
- </source>
+<source>
+ if (CLOSE_VAL==method.getName()) {
+ if (isClosed()) return null; //noop for already closed.
+ }
+ return super.invoke(proxy,method,args);
+</source>
There is an observation being made. It is the comparison of the method name. One way to do this would be to do
<code>&quot;close&quot;.equals(method.getName())</code>.
Above we see a direct reference comparison between the method name and <code>static final String</code> reference.
According to the JVM spec, method names and static final String end up in a shared constant pool, so the reference comparison should work.
One could of course do this as well:
- <source>
-
- if (compare(CLOSE_VAL,method)) {
- if (isClosed()) return null; //noop for already closed.
- }
- return super.invoke(proxy,method,args);
- </source>
+<source>
+ if (compare(CLOSE_VAL,method)) {
+ if (isClosed()) return null; //noop for already closed.
+ }
+ return super.invoke(proxy,method,args);
+</source>
The <code>compare(String,Method)</code> will use the <code>useEquals</code> flag on an interceptor and do either reference comparison or
a string value comparison when the <code>useEquals=true</code> flag is set.
</p>
<p>Pool start/stop<br/>
When the connection pool is started or closed, you can be notifed. You will only be notified once per interceptor class
even though it is an instance method. and you will be notified using an interceptor currently not attached to a pool.
- <source>
- public void poolStarted(ConnectionPool pool) {
- }
-
- public void poolClosed(ConnectionPool pool) {
- }
- </source>
+<source>
+ public void poolStarted(ConnectionPool pool) {
+ }
+
+ public void poolClosed(ConnectionPool pool) {
+ }
+</source>
When overriding these methods, don't forget to call super if you are extending a class other than <code>JdbcInterceptor</code>
</p>
<p>Configuring interceptors<br/>
Interceptors are configured using the <code>jdbcInterceptors</code> property or the <code>setJdbcInterceptors</code> method.
An interceptor can have properties, and would be configured like this
- <source>
- String jdbcInterceptors=&quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState(useEquals=true,fast=yes)&quot;
- </source>
+<source>
+ String jdbcInterceptors=
+ &quot;org.apache.tomcat.jdbc.pool.interceptor.ConnectionState(useEquals=true,fast=yes)&quot;
+</source>
</p>
<p>Interceptor properties<br/>
Since interceptors can have properties, you need to be able to read the values of these properties within your
interceptor. Taking an example like the one above, you can override the <code>setProperties</code> method.
- <source>
- public void setProperties(Map&lt;String, InterceptorProperty&gt; properties) {
- super.setProperties(properties);
- final String myprop = &quot;myprop&quot;;
- InterceptorProperty p1 = properties.get(myprop);
- if (p1!=null) {
- setMyprop(Long.parseLong(p1.getValue()));
- }
- }
- </source>
+<source>
+ public void setProperties(Map&lt;String, InterceptorProperty&gt; properties) {
+ super.setProperties(properties);
+ final String myprop = &quot;myprop&quot;;
+ InterceptorProperty p1 = properties.get(myprop);
+ if (p1!=null) {
+ setMyprop(Long.parseLong(p1.getValue()));
+ }
+ }
+</source>
</p>
</subsection>
<subsection name="Getting the actual JDBC connection">
< at >< at > -805,10 +840,10 < at >< at >
We also create interceptors in these wrappers to be able to perform certain functions.
If there is a need to retrieve the actual connection, one can do so using the <code>javax.sql.PooledConnection</code>
interface.
- <source>
- Connection con = datasource.getConnection();
- Connection actual = ((javax.sql.PooledConnection)con).getConnection();
- </source>
+<source>
+ Connection con = datasource.getConnection();
+ Connection actual = ((javax.sql.PooledConnection)con).getConnection();
+</source>
</p>
</subsection>
< at >< at > -819,24 +854,24 < at >< at >
<p>Other examples of Tomcat configuration for JDBC usage can be found <a href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html">in the Tomcat documentation</a>. </p>
<subsection name="Building from source">
<p>Building is pretty simple. The pool has a dependency on <code>tomcat-juli.jar</code> and in case you want the <code>SlowQueryReportJmx</code></p>
- <source>
- javac -classpath tomcat-juli.jar \
- -d . \
- org/apache/tomcat/jdbc/pool/*.java \
- org/apache/tomcat/jdbc/pool/interceptor/*.java \
- org/apache/tomcat/jdbc/pool/jmx/*.java
- </source>
+<source>
+ javac -classpath tomcat-juli.jar \
+ -d . \
+ org/apache/tomcat/jdbc/pool/*.java \
+ org/apache/tomcat/jdbc/pool/interceptor/*.java \
+ org/apache/tomcat/jdbc/pool/jmx/*.java
+</source>
<p>
A build file can be found in the Tomcat <a href="http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/">source repository</a>.
</p>
<p>
As a convenience, a build file is also included where a simple build command will generate all files needed.
- <source>
- ant download (downloads dependencies)
- ant build (compiles and generates .jar files)
- ant dist (creates a release package)
- ant test (runs tests, expects a test database to be setup)
- </source>
+<source>
+ ant download (downloads dependencies)
+ ant build (compiles and generates .jar files)
+ ant dist (creates a release package)
+ ant test (runs tests, expects a test database to be setup)
+</source>
</p>
<p>
The system is structured for a Maven build, but does generate release artifacts. Just the library itself.
</pre>kkolinko< at >apache.org2012-05-25T05:41:40[GUMP< at >vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
http://comments.gmane.org/gmane.comp.jakarta.tomcat.devel/120526
<pre>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 general< at >gump.apache.org.
Project tomcat-trunk-test has an issue affecting its community integration.
This issue affects 1 projects,
and has been outstanding for 12 runs.
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 : Tomcat 8.x, a web server implementing Java Servlet 3.1,
...
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: 23 mins 18 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-25052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-25052012-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-25052012.jar -Dtomcat-db
cp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/
srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-25052012.jar test
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: /usr/lib/jvm/java-6-openjdk/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.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.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/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv
/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.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/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/l
ib/tomcat-util.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-25052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-25052012.jar:/srv/gump/public/workspace/junit/dist/junit-25052012.jar
---------------------------------------------
[junit] at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42)
[junit] at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
[junit] at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
[junit] at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30)
[junit] at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:269)
[junit] at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:69)
[junit] at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:48)
[junit] at org.junit.runners.ParentRunner$3.run(ParentRunner.java:237)
[junit] at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:61)
[junit] at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:235)
[junit] at org.junit.runners.ParentRunner.access$000(ParentRunner.java:51)
[junit] at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:228)
[junit] at org.junit.runners.ParentRunner.run(ParentRunner.java:306)
[junit] at junit.framework.JUnit4TestAdapter.run(JUnit4TestAdapter.java:39)
[junit] at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:520)
[junit] at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.launch(JUnitTestRunner.java:1060)
[junit] at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:911)
[junit] May 25, 2012 5:31:41 AM org.apache.coyote.AbstractProtocol start
[junit] INFO: Starting ProtocolHandler ["http-nio-127.0.0.1-auto-2-49537"]
[junit] May 25, 2012 5:31:41 AM org.apache.coyote.AbstractProtocol pause
[junit] INFO: Pausing ProtocolHandler ["http-nio-127.0.0.1-auto-2-49537"]
[junit] May 25, 2012 5:31:41 AM org.apache.catalina.core.StandardService stopInternal
[junit] INFO: Stopping service Tomcat
[junit] May 25, 2012 5:31:41 AM org.apache.catalina.core.ApplicationContext log
[junit] INFO: SessionListener: contextDestroyed()
[junit] May 25, 2012 5:31:41 AM org.apache.catalina.core.ApplicationContext log
[junit] INFO: ContextListener: contextDestroyed()
[junit] May 25, 2012 5:31:41 AM org.apache.coyote.AbstractProtocol stop
[junit] INFO: Stopping ProtocolHandler ["http-nio-127.0.0.1-auto-2-49537"]
[junit] May 25, 2012 5:31:41 AM org.apache.coyote.AbstractProtocol destroy
[junit] INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-2-49537"]
[junit] Running org.apache.tomcat.util.res.TestStringManager
[junit] Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 0.025 sec
[junit] Running org.apache.tomcat.util.scan.TestJarScanner
[junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.281 sec
[junit] May 25, 2012 5:31:43 AM org.apache.coyote.AbstractProtocol destroy
[junit] INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-1"]
[junit] Running org.apache.tomcat.util.threads.TestLimitLatch
[junit] Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 2.446 sec
test-apr-exists:
test-apr:
test:
BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:1149: Some tests completed with a Failure. See /srv/gump/public/workspace/tomcat-trunk/output/build/logs for details, search for "FAILED".
Total time: 23 minutes 17 seconds
---------------------------------------------
To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/rss.xml
- Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/atom.xml
============================== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 54000025052012, vmgump.apache.org:vmgump:54000025052012
Gump E-mail Identifier (unique within run) #47.
--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]
</pre>Bill Barker2012-05-25T05:31:56Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.comp.jakarta.tomcat.devel