buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2599 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1224910 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1224904 - in /tomcat/sandbox/trunk-mvn-build: tomcat-catalina/src/main/java/org/apache/catalina/authenticator/ tomcat-catalina/src/main/java/org/apache/catalina/connector/ tomcat-catalina
Author: olamy Date: Tue Dec 27 12:50:38 2011 New Revision: 1224904 URL: http://svn.apache.org/viewvc?rev=1224904&view=rev Log: move fr i18n properties file to tomcat-i18n-fr module Added: tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/javax/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/javax/servlet/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/javax/servlet/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/javax/servlet/http/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/javax/servlet/http/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/http/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/authenticator/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/connector/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/connector/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/connector/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/core/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/core/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/filters/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/filters/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/filters/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/loader/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/loader/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/loader/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/manager/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/mbeans/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/mbeans/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/mbeans/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/realm/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/security/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resources/org/apache/catalina/servlets/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-fr/src/main/resourc
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : 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: 18 mins 30 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-27122011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-27122011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-27122011-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-27122011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-27122011.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-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-tr unk/tomcat-deps/tomcat-dbcp-27122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-27122011.jar:/srv/gump/public/workspace/junit/dist/junit-27122011.jar
svn commit: r1224911 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko Date: Tue Dec 27 13:59:27 2011 New Revision: 1224911 URL: http://svn.apache.org/viewvc?rev=1224911&view=rev Log: Merged revision 1224910 from tomcat/trunk: Further fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=52184 Apply a separate instance of UserDataHelper to the "maxParameterCount reached" message, so that its threshold is calculated independently of other parameter errors. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 27 13:59:27 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-11
svn commit: r1224896 - in /tomcat/sandbox/trunk-mvn-build/tomcat-tests: ./ src/test/java/org/apache/catalina/startup/ src/test/java/org/apache/tomcat/util/net/
Author: olamy
Date: Tue Dec 27 11:26:38 2011
New Revision: 1224896
URL: http://svn.apache.org/viewvc?rev=1224896&view=rev
Log:
start fixing some tests due to path change
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/LoggingBaseTest.java
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TestSsl.java
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml?rev=1224896&r1=1224895&r2=1224896&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml Tue Dec 27 11:26:38 2011
@@ -89,6 +89,12 @@
${project.version}
+ org.apache.tomcat.webapps
+ examples
+ ${project.version}
+ war
+
+
junit
junit
4.10
@@ -99,6 +105,17 @@
+
+
+src/test/resources
+
+
+src/test/java
+
+ **/*.properties
+
+
+
org.apache.maven.plugins
@@ -112,6 +129,68 @@
true
+
+
+bio-test
+
+ test
+
+test
+
+
+
java.util.logging.SimpleFormatter
+${project.build.directory}
+
+true
+
+
+
+
+
+
+nio-test
+
+ test
+
+test
+
+
+
java.util.logging.SimpleFormatter
+${project.build.directory}
+
+true
+Nio
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-dependency-plugin
+2.4
+
+
+unpack-examples-war
+
+ unpack
+
+compile
+
+
+
+ org.apache.tomcat.webapps
+ examples
+ ${project.version}
+ war
+ false
+
${project.build.directory}/examples
+
+
+
+
+
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/LoggingBaseTest.java?rev=1224896&r1=1224895&r2=1224896&view=diff
==
---
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/LoggingBaseTest.java
Tue Dec 27 11:26:38 2011
@@ -56,7 +56,7 @@ public abstract class LoggingBaseTest {
*/
public File getBuildDirectory() {
return new File(System.getProperty("tomcat.test.tomcatbuild",
-"output/build"));
+"target"));
}
/**
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TestSsl.java?rev=1224896&r1=1224895&r2=1224896&view=diff
==
---
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TestSsl.java
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/tomcat/util/net/TestSsl.java
Tue Dec 27 11:26:38 2011
@@ -52,7 +52,7 @@ public class TestSsl extends TomcatBaseT
Tomcat tomcat = getTomcatInstance();
-File appDir = new File(getBuildDirectory(), "webapps/examples");
+File appDir = new File(getBuildDirectory(), "examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
TesterSupport.initSsl(tomcat);
@@ -69,7 +69,7 @@ public class TestSsl extends TomcatBaseT
Tomcat tomcat = getTomcatInstance();
-File appDir = new File(getBuildDirectory(), "webapps/examples");
+File appDir = new File(getBuildDirectory(), "examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
TesterSupport.initSsl(tomcat, "localhost-copy1.jks", "changeit",
@@ -95,7 +95,7 @@
[jira] [Created] (MTOMCAT-112) file path inside ${basedir}/src/main/tomcatconf is not preserved
file path inside ${basedir}/src/main/tomcatconf is not preserved
Key: MTOMCAT-112
URL: https://issues.apache.org/jira/browse/MTOMCAT-112
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat6
Affects Versions: 2.0
Environment: $ uname --all
Linux 3.0.0-14-generic-pae #23-Ubuntu SMP Mon Nov 21 22:07:10 UTC 2011 i686
i686 i386 GNU/Linux
$ mvn -version
Apache Maven 3.0.3 (r1075438; 2011-02-28 14:31:09-0300)
Maven home: /home/veronez/install/java/apache-maven-3.0.3
Java version: 1.6.0_23, vendor: Sun Microsystems Inc.
Java home: /usr/lib/jvm/java-6-openjdk/jre
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "3.0.0-14-generic-pae", arch: "i386", family: "unix"
Reporter: Fabio Cechinel Veronez
Assignee: Olivier Lamy
Hello
I have created a file under ${basedir}/src/main/tomcatconf using the folder
structure /Catalina/localhost/context#subcontext.xml
I expected to have this files copied to
/target/tomcat/conf/Catalina/localhost/context#subcontext.xml but instead it is
copied to /target/tomcat/conf/context#subcontext.xml.
My intention is to create subcontext to map resources to an folder located
outside of my application. As explained at
http://harkiran-howtos.blogspot.com/2009/08/map-external-directory-into-your.html.
Ps.: I'm not sure if it is a bug or expected behavior, i would sent this
question to a mail list but i couldn't find it... sorry if i miss posted it
here.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224940 - /tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml
Author: olamy
Date: Tue Dec 27 16:25:52 2011
New Revision: 1224940
URL: http://svn.apache.org/viewvc?rev=1224940&view=rev
Log:
osgi metadata for tomcat-juli
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml?rev=1224940&r1=1224939&r2=1224940&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml Tue Dec 27 16:25:52 2011
@@ -23,10 +23,33 @@
org.apache.tomcat
tomcat-parent
7.0.24-SNAPSHOT
+../pom.xml
+ bundle
tomcat-juli
Tomcat Core Logging Package
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+org.apache.juli
+${project.version}
+
+
org.apache.juli;version=${project.version},org.apache.juli.logging;version=${project.version}
+
+
+ J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224939 - in /tomcat/sandbox/trunk-mvn-build/tomcat-tests: pom.xml src/test/java/org/apache/catalina/loader/TestVirtualContext.java
Author: olamy
Date: Tue Dec 27 16:11:40 2011
New Revision: 1224939
URL: http://svn.apache.org/viewvc?rev=1224939&view=rev
Log:
fix test failure due to resources path changed
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml?rev=1224939&r1=1224938&r2=1224939&view=diff
==
--- tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml Tue Dec 27 16:11:40 2011
@@ -147,6 +147,7 @@
+
true
Nio
+ -->
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java?rev=1224939&r1=1224938&r2=1224939&view=diff
==
---
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/loader/TestVirtualContext.java
Tue Dec 27 16:11:40 2011
@@ -68,15 +68,15 @@ public class TestVirtualContext extends
VirtualWebappLoader loader = new
VirtualWebappLoader(ctx.getParentClassLoader());
loader.setVirtualClasspath(//
-"test/webapp-3.0-virtual-webapp/target/classes;" + //
-"test/webapp-3.0-virtual-library/target/classes;" + //
-
"test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes;" + //
-
"test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+
getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/target/classes;" + //
+
getBaseTestResourcesPath()+"/webapp-3.0-virtual-library/target/classes;" + //
+
getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes;"
+ //
+
getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes");
ctx.setLoader(loader);
-String extraMappings =
"/=test/webapp-3.0-virtual-webapp/src/main/webapp2" + //
-",/other=test/webapp-3.0-virtual-webapp/src/main/misc" + //
-",/WEB-INF/classes=test/webapp-3.0-virtual-webapp/target/classes";
+String extraMappings =
"/="+getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp2" +
//
+
",/other="+getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/misc"
+ //
+
",/WEB-INF/classes="+getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/target/classes";
VirtualDirContext resources = new VirtualDirContext();
resources.setExtraResourcePaths(extraMappings);
ctx.setResources(resources);
@@ -132,19 +132,19 @@ public class TestVirtualContext extends
"/test/classpathGetResources.jsp?path=rsrc/").toString();
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc")
> 0);
+
allUrls.indexOf(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc")
> 0);
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc")
> 0);
+
allUrls.indexOf(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc")
> 0);
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc")
> 0);
+
allUrls.indexOf(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc")
> 0);
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/target/classes/rsrc") > 0);
+
allUrls.indexOf(getBaseTestResourcesPath()+"/webapp-3.0-virtual-webapp/target/classes/rsrc")
> 0);
assertTrue(
allUrls,
-
allUrls.indexOf("/test/webapp-3.0-virtual-library/target/classes/rsrc") > 0);
+
allUrls.indexOf(getBaseTestResourcesPath()+"/webapp-3.0-virtual-library/target/classes/rsrc")
> 0);
// check that there's no duplicate in the URLs
String[] allUrlsArray = allUrls.split("\\s+");
@@ -157,7 +157,7 @@ public class TestVirtualContext extends
svn commit: r1224942 - in /tomcat/sandbox/trunk-mvn-build/tomcat-tests: pom.xml src/test/java/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java
Author: olamy Date: Tue Dec 27 16:38:56 2011 New Revision: 1224942 URL: http://svn.apache.org/viewvc?rev=1224942&view=rev Log: fix test failure due to resources path changed Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/coyote/http11/filters/TestFlushableGZIPOutputStream.java Modified: tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml?rev=1224942&r1=1224941&r2=1224942&view=diff == --- tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml (original) +++ tomcat/sandbox/trunk-mvn-build/tomcat-tests/pom.xml Tue Dec 27 16:38:56 2011 @@ -130,6 +130,7 @@ + true - + -->
Re: Move to Maven? (WAS: Re: Publishing process for JARs for Maven Central)
Hi guys, I switched to: http://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build/ and prepare a set of update for OSGi. Unfortunately, it seems that the sandbox is not open to all committer: git svn dcommit Committing to https://svn.apache.org/repos/asf/tomcat/sandbox/trunk-mvn-build ... RA layer request failed: Server sent unexpected return value (403 Forbidden) in response to CHECKOUT request for '/repos/asf/!svn/ver/1224904/tomcat/sandbox/trunk-mvn-build/tomcat-juli/pom.xml' at /usr/lib/git-core/git-svn line 579 Is it a way to open sandbox (at leat the trunk-mvn-build to all ASF committer ? It will allow me to commit my OSGi changes directly (without submitting a patch to olamy each time). Thanks, Regards JB On 12/23/2011 09:51 AM, Olivier Lamy wrote: Hello, Distro is now ok (at least for unix platform) (common-daemon and tomcat-native now included). Some unit test has been fixed (was broken due to path changes), I'm now at 45 failures on 533 tests (some path changes to fix). Now I have some fixes to do: * version build date in docs included in distro * windauze packaging 2011/12/22 Olivier Lamy: Hello, I have added the distro packaging (commons-daemon* and tomcat-native.tar.gz not yet done). I still have weird issues which I don't' yet understand: when runing unit test from the top module mvn clean install -Dtest=TestCompositeELResolver GRAVE: Error loading jar:file:/Users/olamy/dev/sources/tomcat/tomcat70/tomcat-catalina/target/tomcat-catalina-7.0.24-SNAPSHOT.jar!/org/apache/catalina/mbeans/mbeans-descriptors.xml or using the generated distro mvn clean install -DskipTests I have added for testing convenience an exploded distro so: cd apache-tomcat/target/apache-tomcat-7.0.24-SNAPSHOT-bin/apache-tomcat-7.0.24-SNAPSHOT/bin/ same error in catalina.out 22 d<8E>c. 2011 14:21:04 org.apache.tomcat.util.modeler.Registry loadDescriptors GRAVE: Error loading jar:file:/Users/olamy/dev/sources/tomcat/tomcat70/apache-tomcat/target/apache-tomcat-7.0.24-SNAPSHOT-bin/apache-tomcat-7.0.24-SNAPSHOT/lib/catalina.jar!/org/apache/catalina/mbeans/mbeans-descriptors.xml I will start debugging. For enable debugging in your ide (after the first install of all dependent modules), you can use: mvn clean install -Dtest=TestCompositeELResolver -pl :tomcat-tests -Dmaven.surefire.debug=true debug port will be 5005. Someone with ideas on the exact cause of this ? 2011/12/21 Olivier Lamy: Hello, I have started some stuff here: https://github.com/olamy/tomcat70. * sources have been to appropriate modules. * I'm now working on some test which fail (some tests need webapp examples) * distro not yet done. * repackaging of dbcp pool, commons-logging is done using shading technology * I will work with jbonofre (who is karaf committer) to add necessary stuff to osgiing. NOTE: It's really work in progress not finish (so pull requests will be accepted :-) ) 2011/12/20 Mark Thomas: On 20/12/2011 08:17, Antonio Petrelli wrote: 2011/12/19 Mladen Turk On 12/19/2011 07:04 PM, Henri Gomez wrote: Exactly. Since any change would require a learning curve and it seems we don't have that many (read none) maven experts in the house, Gradle could be equally considered, given that it seems more advanced in customization. I know well Maven but Olivier (Lamy) is a Maven expert, so there is friend in the business. And there is a full Maven PMC not too far ready to provide advices and help. Not counting Tomcat consumers ASF projects like OpenEJB. All I have seen so far is talk and talk and more talk. There is trunk, branches, sandbox, so anyone is free to make a proposal and if things work, I'll be the first one supporting it. I already forked my own repository from GitHub. I hope to start it after the holidays. I would be very interested in seeing what a Mavenised build of trunk looks like. While I may come across as anti-Maven, that is not my position. I am anti *any* disruptive change that causes more disruption then benefit it brings and right now I see more disruption than I do benefit. I am also wary (from my experience of infrastructure at the ASF) of folks pushing strongly for a switch to something better, promising to help with the switch and promising to support things moving forwards and then melting away just as their support is really needed. A demonstration of a fully Mavenised build of Tomcat trunk (or 7.0.x, 6.0.x or 5.5.x) at GitHub would help considerably: - we would be able to see how all the potential wrinkles (down-loading JDT, building a packages renamed DBCP, building a package renamed Commons logging, etc) were handled in Maven - we'd be able to judge how much simpler the build process was - Maven newbies like me could try building it, debugging with it and developing with it to see how easy we found it - the work required to create it would demonstrate a commitment to supporting this change I should stress that a working Mavenised build of a version of Tomcat
svn commit: r1224910 - in /tomcat/trunk/java/org/apache/tomcat/util/http: LocalStrings.properties Parameters.java
Author: kkolinko
Date: Tue Dec 27 13:55:41 2011
New Revision: 1224910
URL: http://svn.apache.org/viewvc?rev=1224910&view=rev
Log:
Further fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=52184
Apply a separate instance of UserDataHelper to the "maxParameterCount reached"
message,
so that its threshold is calculated independently of other parameter errors.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224910&r1=1224909&r2=1224910&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Tue
Dec 27 13:55:41 2011
@@ -20,6 +20,7 @@ parameters.decodeFail.info=Character dec
parameters.emptyChunk=Empty parameter chunk ignored
parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at
byte [{1}] with a value of [{2}] ignored
parameters.maxCountFail=More than the maximum number of request parameters
(GET plus POST) for a single request ([{0}]) were detected. Any parameters
beyond this limit have been ignored. To change this limit, set the
maxParameterCount attribute on the Connector.
+parameters.maxCountFail.fallToDebug=\n Note: further occurrences of this error
will be logged at DEBUG level.
parameters.multipleDecodingFail=Character decoding failed. A total of [{0}]
failures were detected but only the first was logged. Enable debug level
logging for this logger to log all failures.
parameters.noequal=Parameter starting at position [{0}] and ending at position
[{1}] with a value of [{0}] was not followed by an '=' character
parameters.fallToDebug=\n Note: further occurrences of Parameter errors will
be logged at DEBUG level.
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1224910&r1=1224909&r2=1224910&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue Dec 27
13:55:41 2011
@@ -44,6 +44,8 @@ public final class Parameters {
private static final UserDataHelper userDataLog = new UserDataHelper(log);
+private static final UserDataHelper maxParamCountLog = new
UserDataHelper(log);
+
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http");
@@ -381,7 +383,14 @@ public final class Parameters {
// Hitting limit stops processing further params but does
// not cause request to fail.
parseFailed = true;
-log.info(ise.getMessage());
+UserDataHelper.Mode logMode =
maxParamCountLog.getNextMode();
+if (logMode != null) {
+String message = ise.getMessage();
+if (logMode.fallToDebug()) {
+message +=
sm.getString("parameters.maxCountFail.fallToDebug");
+}
+maxParamCountLog.log(logMode, message);
+}
break;
}
} catch (IOException e) {
@@ -398,8 +407,7 @@ public final class Parameters {
"parameters.decodeFail.info",
tmpName.toString(), tmpValue.toString());
if (logMode.fallToDebug()) {
-message += sm
-.getString("parameters.fallToDebug");
+message +=
sm.getString("parameters.fallToDebug");
}
userDataLog.log(logMode, message, e);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52386] Move to a Maven Build
https://issues.apache.org/bugzilla/show_bug.cgi?id=52386 --- Comment #10 from David Rault 2011-12-27 09:32:05 UTC --- +1 -- pretty please ! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224952 - in /tomcat/sandbox/trunk-mvn-build: tomcat-catalina-ha/src/main/java/org/apache/catalina/ha/session/ tomcat-catalina-ha/src/main/java/org/apache/catalina/ha/tcp/ tomcat-catalina
Author: olamy Date: Tue Dec 27 17:28:14 2011 New Revision: 1224952 URL: http://svn.apache.org/viewvc?rev=1224952&view=rev Log: move es i18n files to tomcat-i18n-es module Added: tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/el/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/el/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-el-api/src/main/java/javax/el/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/servlet/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/servlet/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/servlet/http/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/javax/servlet/http/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/src/main/java/javax/servlet/http/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/authenticator/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/connector/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/connector/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/core/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/core/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/filters/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/filters/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/filters/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ha/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ha/session/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ha/session/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/apache/catalina/ha/session/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ha/tcp/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina-ha/src/main/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/loader/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/loader/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/manager/ tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/manager/LocalStrings_es.properties - copied unchanged from r1222868, tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/sandbox/trunk-mvn-build/tomcat-i18n-es/src/main/resources/org/apache/catalina/manager/host/ tomcat/sandbox/tr
svn commit: r1224955 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: olamy
Date: Tue Dec 27 17:36:19 2011
New Revision: 1224955
URL: http://svn.apache.org/viewvc?rev=1224955&view=rev
Log:
fix path
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1224955&r1=1224954&r2=1224955&view=diff
==
---
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Dec 27 17:36:19 2011
@@ -106,7 +106,7 @@ public class TestFormAuthenticator exten
private FormAuthClient() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File(getBuildDirectory(), "webapps/examples");
+File appDir = new File(getBuildDirectory(), "/examples");
Context ctx = tomcat.addWebapp(null, "/examples",
appDir.getAbsolutePath());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224980 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
Author: olamy
Date: Tue Dec 27 19:10:34 2011
New Revision: 1224980
URL: http://svn.apache.org/viewvc?rev=1224980&view=rev
Log:
fix path in test
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java?rev=1224980&r1=1224979&r2=1224980&view=diff
==
---
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
Tue Dec 27 19:10:34 2011
@@ -27,6 +27,7 @@ import java.security.Principal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.naming.Context;
@@ -228,7 +229,7 @@ public class TestTomcat extends TomcatBa
public void testSingleWebapp() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File(getBuildDirectory(), "webapps/examples");
+File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -236,6 +237,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
+// this test is Locale sensitive so can fail on fr,es machines
assertTrue(res.toString().indexOf("Hello World!") > 0);
}
@@ -243,7 +245,7 @@ public class TestTomcat extends TomcatBa
public void testJsps() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File(getBuildDirectory(), "webapps/examples");
+File appDir = new File(getBuildDirectory(), "examples");
// app dir is relative to server home
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
@@ -361,7 +363,7 @@ public class TestTomcat extends TomcatBa
String contextPath = "/examples";
-File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+File appDir = new File(getBuildDirectory(), contextPath);
// app dir is relative to server home
org.apache.catalina.Context ctx =
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224982 - /tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml
Author: olamy Date: Tue Dec 27 19:16:47 2011 New Revision: 1224982 URL: http://svn.apache.org/viewvc?rev=1224982&view=rev Log: fix include of .properties in tomcat-jasper-el Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml?rev=1224982&r1=1224981&r2=1224982&view=diff == --- tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml (original) +++ tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml Tue Dec 27 19:16:47 2011 @@ -38,6 +38,14 @@ + + +src/main/java + + **/*.properties + + + org.apache.felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1224955 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
2011/12/27 :
> Author: olamy
> Date: Tue Dec 27 17:36:19 2011
> New Revision: 1224955
>
> URL: http://svn.apache.org/viewvc?rev=1224955&view=rev
> Log:
> fix path
>
> Modified:
>
> tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
>
>
> private FormAuthClient() throws Exception {
> Tomcat tomcat = getTomcatInstance();
> - File appDir = new File(getBuildDirectory(), "webapps/examples");
> + File appDir = new File(getBuildDirectory(), "/examples");
Are you on Linux? The above should be just "examples".
> Context ctx = tomcat.addWebapp(null, "/examples",
> appDir.getAbsolutePath());
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1224955 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
2011/12/27 Konstantin Kolinko :
> 2011/12/27 :
>> Author: olamy
>> Date: Tue Dec 27 17:36:19 2011
>> New Revision: 1224955
>>
>> URL: http://svn.apache.org/viewvc?rev=1224955&view=rev
>> Log:
>> fix path
>>
>> Modified:
>>
>> tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
>>
>>
>> private FormAuthClient() throws Exception {
>> Tomcat tomcat = getTomcatInstance();
>> - File appDir = new File(getBuildDirectory(), "webapps/examples");
>> + File appDir = new File(getBuildDirectory(), "/examples");
>
> Are you on Linux? The above should be just "examples".
yes.
See change in getBuildDirectory() (return "target")
As with a maven structure, the examples webapp is now on his own
project, the war is expanded before test phase to target/examples and
various resources are available in this path.
>
>> Context ctx = tomcat.addWebapp(null, "/examples",
>> appDir.getAbsolutePath());
>>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1225000 - /tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
Author: markt
Date: Tue Dec 27 20:17:00 2011
New Revision: 1225000
URL: http://svn.apache.org/viewvc?rev=1225000&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52303
Allow web applications that do not have a login configuration to
participate in a SSO session. Patch provided by Brian Burch.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java?rev=1225000&r1=1224999&r2=1225000&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
Tue Dec 27 20:17:00 2011
@@ -18,11 +18,13 @@ package org.apache.catalina.authenticato
import java.io.IOException;
+import java.security.Principal;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.Session;
@@ -40,16 +42,42 @@ public final class NonLoginAuthenticator
/**
- * Authenticate the user making this request, based on the specified
- * login configuration. Return true if any specified
- * constraint has been satisfied, or false if we have
- * created a response challenge already.
+ * Authenticate the user making this request, based on the fact that no
+ * login-config has been defined for the container.
*
- * @param request Request we are processing
- * @param response Response we are populating
- * @param configLogin configuration describing how authentication
- * should be performed
+ * This implementation means "login the user even though there is no
+ * self-contained way to establish a security Principal for that user".
+ *
+ * This method is called by the AuthenticatorBase super class to
+ * establish a Principal for the user BEFORE the container security
+ * constraints are examined, i.e. it is not yet known whether the user
+ * will eventually be permitted to access the requested resource.
+ * Therefore, it is necessary to always return true to
+ * indicate the user has not failed authentication.
*
+ * There are two cases:
+ *
+ * - without SingleSignon: a Session instance does not yet exist
+ *and there is no auth-method to authenticate the
+ *user, so leave Request's Principal as null.
+ *note: AuthenticatorBase will later examine the security constraints
+ * to determine whether the resource is accessible by a user
+ * without a security Principal and Role (i.e. unauthenticated).
+ *
+ * - with SingleSignon: if the user has already authenticated via
+ * another container (using its own login configuration), then
+ * associate this Session with the SSOEntry so it inherits the
+ * already-established security Principal and associated Roles.
+ * note: This particular session will become a full member of the
+ * SingleSignOnEntry Session collection and so will potentially
+ * keep the SSOE "alive", even if all the other properly
+ * authenticated Sessions expire first... until it expires too.
+ *
+ * @param request Request we are processing
+ * @param response Response we are creating
+ * @param config Login configuration describing how authentication
+ * should be performed
+ * @return boolean to indicate whether the user is authenticated
* @exception IOException if an input/output error occurs
*/
@Override
@@ -58,24 +86,51 @@ public final class NonLoginAuthenticator
LoginConfig config)
throws IOException {
-/* Associating this request's session with an SSO would allow
-coordinated session invalidation, but should the session for
-a webapp that the user didn't log into be invalidated when
-another session is logged out?
-String ssoId = (String) request.getNote(Constants.REQ_SSOID_NOTE);
-if (ssoId != null)
-associate(ssoId, getSession(request, true));
-*/
-
-if (containerLog.isDebugEnabled()) {
-containerLog.debug("User authentication is not required");
+Principal principal = request.getUserPrincipal();
+if (principal != null) {
+// excellent... we have already authenticated the client somehow,
+// probably from another container that has a login-config
+if (containerLog.isDebugEnabled())
+containerLog.debug("Already authenticated as '"
+
DO NOT REPLY [Bug 52303] NonLoginAuthenticator does not honour session timeout with SingleSignOn Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=52303 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2011-12-27 20:25:25 UTC --- Many thanks for the patch. It looks good to me. The patch has been applied to trunk and 7.0.x and will be included in 7.0.24 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52316] AccessLog does not log size for files sent with sendfile
https://issues.apache.org/bugzilla/show_bug.cgi?id=52316 --- Comment #1 from Mark Thomas 2011-12-27 20:29:08 UTC --- Since sendfile sends the data asynchronously on a separate thread, the access log can never know exactly how many bytes are sent without destroying the benefits of sendfile. I lean towards logging the bytes intended to be sent (calculated from the request attributes). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
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/2600 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1225000 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1225010 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/NonLoginAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Tue Dec 27 20:44:20 2011 New Revision: 1225010 URL: http://svn.apache.org/viewvc?rev=1225010&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52303 Allow web applications that do not have a login configuration to participate in a SSO session. Patch provided by Brian Burch. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 27 20:44:20 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,
Re: svn commit: r1224955 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
2011/12/27 Olivier Lamy :
> 2011/12/27 Konstantin Kolinko :
>> 2011/12/27 :
>>> Author: olamy
>>> Date: Tue Dec 27 17:36:19 2011
>>> New Revision: 1224955
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1224955&view=rev
>>> Log:
>>> fix path
>>>
>>> Modified:
>>>
>>> tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/authenticator/TestFormAuthenticator.java
>>>
>>>
>>> private FormAuthClient() throws Exception {
>>> Tomcat tomcat = getTomcatInstance();
>>> - File appDir = new File(getBuildDirectory(),
>>> "webapps/examples");
>>> + File appDir = new File(getBuildDirectory(), "/examples");
>>
>> Are you on Linux? The above should be just "examples".
> yes.
> See change in getBuildDirectory() (return "target")
> As with a maven structure, the examples webapp is now on his own
> project, the war is expanded before test phase to target/examples and
> various resources are available in this path.
I just mean s/ "/examples" / "examples" / without the leading slash in
the relative filesystem path.
(To my surprise the current code works. I mean concatenation of paths
just ignores the leading '/', not honoring the path concatenation
rules of the OS. Well, that has a reason.)
>
>>
>>> Context ctx = tomcat.addWebapp(null, "/examples",
>>> appDir.getAbsolutePath());
>>>
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1225000 - /tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
1. I think the AuthenticatoBase#cache flag should be honored.
That is: I think session.setPrincipal() should not be called unless
the flag is true.
I wonder whether we can call AuthenticatoBase#register(), like
FormAuthenticator does. The #register() method honors the cache flag,
but a problem is that it updates sso information.
The cache flag is true by default, so that does not change anything for OP.
2. Constants.FORM_PRINCIPAL_NOTE is specific to FormAuthenticator.
Should it be used here?
Though it seems there is no direct harm from that.
3. Javadoc formatting for the method needs some and .
2011/12/28 :
> Author: markt
> Date: Tue Dec 27 20:17:00 2011
> New Revision: 1225000
>
> URL: http://svn.apache.org/viewvc?rev=1225000&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52303
> Allow web applications that do not have a login configuration to
> participate in a SSO session. Patch provided by Brian Burch.
>
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java?rev=1225000&r1=1224999&r2=1225000&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
> Tue Dec 27 20:17:00 2011
> @@ -18,11 +18,13 @@ package org.apache.catalina.authenticato
>
>
> import java.io.IOException;
> +import java.security.Principal;
>
> import javax.servlet.http.HttpServletResponse;
>
> import org.apache.catalina.connector.Request;
> import org.apache.catalina.deploy.LoginConfig;
> +import org.apache.catalina.Session;
>
>
>
> @@ -40,16 +42,42 @@ public final class NonLoginAuthenticator
>
>
> /**
> - * Authenticate the user making this request, based on the specified
> - * login configuration. Return true if any specified
> - * constraint has been satisfied, or false if we have
> - * created a response challenge already.
> + * Authenticate the user making this request, based on the fact that no
> + * login-config has been defined for the container.
> *
> - * @param request Request we are processing
> - * @param response Response we are populating
> - * @param config Login configuration describing how authentication
> - * should be performed
> + * This implementation means "login the user even though there is no
> + * self-contained way to establish a security Principal for that user".
> + *
> + * This method is called by the AuthenticatorBase super class to
> + * establish a Principal for the user BEFORE the container security
> + * constraints are examined, i.e. it is not yet known whether the user
> + * will eventually be permitted to access the requested resource.
> + * Therefore, it is necessary to always return true to
> + * indicate the user has not failed authentication.
> *
> + * There are two cases:
> + *
> + * - without SingleSignon: a Session instance does not yet exist
> + * and there is no auth-method to authenticate the
> + * user, so leave Request's Principal as null.
> + * note: AuthenticatorBase will later examine the security constraints
> + * to determine whether the resource is accessible by a user
> + * without a security Principal and Role (i.e. unauthenticated).
> + *
> + * - with SingleSignon: if the user has already authenticated via
> + * another container (using its own login configuration), then
> + * associate this Session with the SSOEntry so it inherits the
> + * already-established security Principal and associated Roles.
> + * note: This particular session will become a full member of the
> + * SingleSignOnEntry Session collection and so will potentially
> + * keep the SSOE "alive", even if all the other properly
> + * authenticated Sessions expire first... until it expires too.
> + *
> + * @param request Request we are processing
> + * @param response Response we are creating
> + * @param config Login configuration describing how authentication
> + * should be performed
> + * @return boolean to indicate whether the user is authenticated
> * @exception IOException if an input/output error occurs
> */
> @Override
> @@ -58,24 +86,51 @@ public final class NonLoginAuthenticator
> LoginConfig config)
> throws IOException {
>
> - /* Associating this request's session with an SSO would allow
> - coordinated session invalidation, but should the ses
[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 102 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: 28 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:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-28122011.jar:/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:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-28122011.jar:/srv/gump/public/workspace/junit/dist/junit-28122011.jar:/srv/gump /public/workspace/junit/dist/junit-dep-28122011.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-28122011/guava-28122011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-28122011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-28122011.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-28122011.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-28122011-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-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 [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2106 files [checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java:29: Wrong order for 'org.apache.catalina.Session' import. BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:447: Got 1 errors and 0 warnings. Total time: 27 seconds - 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 1228122011, vmgump.apache.org:vmgump:1228122011 Gump E-mail Identifier (unique within run) #22. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 102 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: 28 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-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:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-28122011.jar:/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:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-28122011.jar:/srv/gump/public/workspace/junit/dist/junit-28122011.jar:/srv/gump /public/workspace/junit/dist/junit-dep-28122011.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-28122011/guava-28122011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-28122011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-28122011.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-28122011.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-28122011-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 [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2099 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java:27: Wrong order for 'org.apache.catalina.Session' import. [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java:50: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:447: Got 2 errors and 0 warnings. Total time: 28 seconds - 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 1228122011, vmgump.apache.org:vmgump:1228122011 Gump E-mail Identifier (unique within run) #23. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For addit
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 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: 18 mins 35 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-28122011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28122011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28122011-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-28122011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-28122011.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-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-tr unk/tomcat-deps/tomcat-dbcp-28122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28122011.jar:/srv/gump/public/workspace/junit/dist/j
DO NOT REPLY [Bug 52386] Move to a Maven Build
https://issues.apache.org/bugzilla/show_bug.cgi?id=52386 --- Comment #11 from Jason Brittain 2011-12-28 04:51:06 UTC --- +1, even though I personally prefer Ant, most companies have switched to Maven, and it has become more important for Tomcat's build to integrate seamlessly in that build environment. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
