svn commit: r1231856 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ test/org/apache/catalina/
Author: rjung Date: Mon Jan 16 08:17:31 2012 New Revision: 1231856 URL: http://svn.apache.org/viewvc?rev=1231856view=rev Log: Fix svn:eol-style for three recent source files. Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (contents, props changed) tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestQueryTimeoutInterceptor.java (contents, props changed) tomcat/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java (contents, props changed) Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1231856r1=1231855r2=1231856view=diff == --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java Mon Jan 16 08:17:31 2012 @@ -1,56 +1,56 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the License); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.tomcat.jdbc.pool.interceptor; - -import java.lang.reflect.Method; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Map; - -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty; - -public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { -private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); -int timeout; - -@Override -public void setProperties(MapString,InterceptorProperty properties) { -super.setProperties(properties); -timeout = properties.get(queryTimeout).getValueAsInt(-1); -} - -@Override -public Object createStatement(Object proxy, Method method, Object[] args, Object statement, long time) { -if (statement instanceof Statement timeout 0) { -Statement s = (Statement)statement; -try { -s.setQueryTimeout(timeout); -}catch (SQLException x) { -log.warn([QueryTimeoutInterceptor] Unable to set query timeout:+x.getMessage(),x); -} -} -return statement; -} - -@Override -public void closeInvoked() { -} - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tomcat.jdbc.pool.interceptor; + +import java.lang.reflect.Method; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Map; + +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty; + +public class QueryTimeoutInterceptor extends AbstractCreateStatementInterceptor { +private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class); +int timeout; + +@Override +public void setProperties(MapString,InterceptorProperty properties) { +super.setProperties(properties); +timeout = properties.get(queryTimeout).getValueAsInt(-1); +} + +@Override +public Object createStatement(Object proxy, Method
svn commit: r1231860 - in /tomcat/tc7.0.x/trunk: ./ modules/ test/org/apache/catalina/connector/TestOutputBuffer.java
Author: rjung Date: Mon Jan 16 08:23:15 2012 New Revision: 1231860 URL: http://svn.apache.org/viewvc?rev=1231860view=rev Log: Fix svn:eol-style for recent source files (including update of modules/jdbc-pool external). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/modules/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java (contents, props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 16 08:23:15 2012 @@ -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,1174975,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,1187 381,1187753,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,1 201931,1202035,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,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16/01/2012 00:29, Konstantin Kolinko wrote: 2012/1/16 Mark Thomas ma...@apache.org: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Thus far (quick testing) everything is OK. Mark, can you upload files to Nexus? Don't know yet :). I was going to give that a try this morning. Watch this space... It should be easier to prepare everything while vote goes. Once it works, it should be quicker to release the artefacts to Maven central. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231872 - /tomcat/tc7.0.x/trunk/res/maven/README.txt
Author: markt Date: Mon Jan 16 09:04:24 2012 New Revision: 1231872 URL: http://svn.apache.org/viewvc?rev=1231872view=rev Log: Fix line endings Modified: tomcat/tc7.0.x/trunk/res/maven/README.txt (props changed) Propchange: tomcat/tc7.0.x/trunk/res/maven/README.txt -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231874 - /tomcat/tc7.0.x/trunk/res/maven/README.txt
Author: markt Date: Mon Jan 16 09:05:22 2012 New Revision: 1231874 URL: http://svn.apache.org/viewvc?rev=1231874view=rev Log: Fix typo Modified: tomcat/tc7.0.x/trunk/res/maven/README.txt Modified: tomcat/tc7.0.x/trunk/res/maven/README.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/README.txt?rev=1231874r1=1231873r2=1231874view=diff == --- tomcat/tc7.0.x/trunk/res/maven/README.txt (original) +++ tomcat/tc7.0.x/trunk/res/maven/README.txt Mon Jan 16 09:05:22 2012 @@ -18,7 +18,7 @@ $Id$ To release do the following: -1 - copy mvn.properties.default to mvn.propertie and adjust it. +1 - copy mvn.properties.default to mvn.properties and adjust it. 2 - ant -f mvn-pub.xml deploy-release that step creates a staging in https://repository.apache.org/index.html#stagingRepositories 3 - test it and do the vote process - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
Hello, 2012/1/16 Konstantin Kolinko knst.koli...@gmail.com: 2012/1/16 Mark Thomas ma...@apache.org: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Thus far (quick testing) everything is OK. Mark, can you upload files to Nexus? It should be easier to prepare everything while vote goes. Agree. Could be fine to have artifacts in a staging repo. In my case I could test with the maven plugin. I'd like to add a sample with the port 0 in the archetype sample. Best regards, Konstantin Kolinko - 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
Nexus release problem
It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? Mark [1] http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [2] https://repository.apache.org/service/local/repositories/orgapachetomcat-078/content/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [3] https://issues.apache.org/bugzilla/show_bug.cgi?id=52124 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16.01.2012 00:29, Mark Thomas wrote: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Two problems noticed: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:200 but was:404 junit.framework.AssertionFailedError: expected:200 but was:404 at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. 2) Crash during Unit tests for APR == Testcase: testAdditionalWebInfClassesPaths took 0.623 sec WARN: Test failure in 'output/build/logs/TEST-org.apache.tomcat.util.net.TestXxxEndpoint.APR.txt': Testsuite: org.apache.tomcat.util.net.TestXxxEndpoint Tests run: 1, Failures: 0, Errors: 1, Time elapsed: 0 sec Testcase: testStartStopBindOnStart took 0.005 sec »···Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. HotSpot and pstack say it was in the HotSot Compiler: Stack: [0xb6f0,0xb6f8], sp=0xb6f7e3c0, free space=504k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) V [libjvm.so+0xfc598] unsigned IndexSetIterator::advance_and_next()+0x13c V [libjvm.so+0x18a7dc] void PhaseIFG::SquareUp()+0x178 V [libjvm.so+0x1b6000] void PhaseChaitin::Register_Allocate()+0xab4 V [libjvm.so+0x1b8bc4] void Compile::Code_Gen()+0x39c V [libjvm.so+0x431098] Compile::Compile(ciEnv*,C2Compiler*,ciMethod*,int,bool,bool)+0xdb0 V [libjvm.so+0x1d2cd8] void C2Compiler::compile_method(ciEnv*,ciMethod*,int)+0xa8 V [libjvm.so+0x1d3b64] void CompileBroker::invoke_compiler_on_method(CompileTask*)+0x99c V [libjvm.so+0x245d88] void CompileBroker::compiler_thread_loop()+0x8d0 V [libjvm.so+0x873688] void JavaThread::thread_main_inner()+0x50 V [libjvm.so+0x79357c] java_start+0x178 The only other likely thread would be the APR thread: b6c32708 __umoddi3 (0, cad85ac0, 0, 16f7, 0, b6c85b88) + 48 b6b7d064 BN_mod_word (1be7c0, 16f7, 7, 0, 16fb1c, b) + 64 b6b7f530 probable_prime (1be7c0, 200, 616660, 608, ba3a, b6c4aeec) + 50 b6b7fee4 BN_generate_prime_ex (1be7c0, 200, 0, 0, 0, fe37d854) + 384 b6b9a024 RSA_generate_key_ex (29cde8, 200, 1, fe37d854, 0, a639b0) + 144 b6b9e254 RSA_generate_key (400, 10001, 0, 0, 101888, 29cde8) + b4 fe05c044 ssl_tmp_key_init_rsa (400, 1, , fff8, 0, fe079de0) + 20 fe05cebc Java_org_apache_tomcat_jni_SSL_initialize (a4, 0, 0, fe07a344, 0, 31928) + 340 fc00d700 * org/apache/tomcat/jni/SSL.initialize(Ljava/lang/String;)I+24676 fc00d6ac * org/apache/tomcat/jni/SSL.initialize(Ljava/lang/String;)I+0 ... fc005940 * org/apache/catalina/core/AprLifecycleListener.initializeSSL()V+106 (line 487) I will rerun test using the APR build I used for testing 7.0.23. Since then I rebuild APR to use the newer OpenSSL version. I also updated Java from 1.6.0_29 to _30. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Nexus release problems
On 16/01/2012 09:43, Mark Thomas wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? Oh, and if there is a way to get Nexus not to create .md5 and .sha1 files for the .asc signatures that would be nice but not essential since the scp+rsync had the same problem. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231886 - /tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
Author: markt Date: Mon Jan 16 09:54:35 2012 New Revision: 1231886 URL: http://svn.apache.org/viewvc?rev=1231886view=rev Log: Review comments from kkolinko Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1231886r1=1231885r2=1231886view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Mon Jan 16 09:54:35 2012 @@ -108,7 +108,7 @@ public class JMXProxyServlet extends Htt if (ps == null) { valuesStr = new String[0]; } else { -valuesStr = request.getParameter(ps).split(,); +valuesStr = ps.split(,); } invokeOperation( writer, qry, opName,valuesStr ); return; @@ -129,7 +129,7 @@ public class JMXProxyServlet extends Htt writer.println(OK - Attribute get ' + onameStr + ' - + att + = + MBeanDumper.escape(value.toString())); } catch (Exception ex) { -writer.println(Error); +writer.println(Error - + ex.toString()); ex.printStackTrace(writer); } } @@ -144,7 +144,7 @@ public class JMXProxyServlet extends Htt mBeanServer.setAttribute( oname, new Attribute(att, valueObj)); writer.println(OK - Attribute set); } catch( Exception ex ) { -writer.println(Error); +writer.println(Error - + ex.toString()); ex.printStackTrace(writer); } } @@ -158,7 +158,7 @@ public class JMXProxyServlet extends Htt writer.println(OK - Number of results: + names.size()); writer.println(); } catch (Exception ex) { -writer.println(Error); +writer.println(Error - + ex.toString()); ex.printStackTrace(writer); return; } @@ -196,7 +196,7 @@ public class JMXProxyServlet extends Htt writer.println(OK - Operation + op + returned:); output(, writer, retVal); } catch( Exception ex ) { -writer.println(Error); +writer.println(Error - + ex.toString()); ex.printStackTrace(writer); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231887 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml
Author: markt Date: Mon Jan 16 09:57:32 2012 New Revision: 1231887 URL: http://svn.apache.org/viewvc?rev=1231887view=rev Log: (empty) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 16 09:57:32 2012 @@ -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,1174975,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,1187 381,1187753,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,1 201931,1202035,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,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856
Re: Nexus release problems
2012/1/16 Mark Thomas ma...@apache.org: On 16/01/2012 09:43, Mark Thomas wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? [1] http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [2] https://repository.apache.org/service/local/repositories/orgapachetomcat-078/content/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [3] https://issues.apache.org/bugzilla/show_bug.cgi?id=52124 There is no error in that. The metadata is only for orgapachetomcat-078 repository that contains this only release and nothing else. I do not know an easy way to find similar current repositories in other projects. Just searched markmail.org for recent VOTE threads mentioning repository.apache.org. Here are two examples https://repository.apache.org/content/repositories/orgapacherave-015/ https://repository.apache.org/content/repositories/maven-060/ (from the following threads: http://markmail.org/thread/qt5pwg3xdxpapyc5 http://markmail.org/thread/jaa3fi4djn6kflic ) Oh, and if there is a way to get Nexus not to create .md5 and .sha1 files for the .asc signatures that would be nice but not essential since the scp+rsync had the same problem. I think that it is not possible to avoid creating them. I've read on dev@commons that it is possible to delete them (more below). I think that Maven may need those files just to autocheck integrity of asc files downloaded from remote servers. So I think it is better to keep them. Regarding the procedure to delete those files I just did some search: Some [1] say that you delete them before closing staging area. Others [2] (an older thread but seems more reliable) say that only after closing it. [1] http://markmail.org/message/tebuldnggk3pepky [2] http://markmail.org/thread/uqjxxvpgztrlg362 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Nexus release problems
On 16/01/2012 10:53, Konstantin Kolinko wrote: 2012/1/16 Mark Thomas ma...@apache.org: On 16/01/2012 09:43, Mark Thomas wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? [1] http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [2] https://repository.apache.org/service/local/repositories/orgapachetomcat-078/content/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [3] https://issues.apache.org/bugzilla/show_bug.cgi?id=52124 There is no error in that. The metadata is only for orgapachetomcat-078 repository that contains this only release and nothing else. Hmm. I guess that makes sense but I'm not entirely comfortable with that. I'd rather see the full meta-data before the release like we used to with the scp-copy process. Oh, and if there is a way to get Nexus not to create .md5 and .sha1 files for the .asc signatures that would be nice but not essential since the scp+rsync had the same problem. I think that it is not possible to avoid creating them. I've read on dev@commons that it is possible to delete them (more below). Manual deletion is a PITA. We published them before and I am happy to continue to do so. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1231887 - svn:log
Author: kkolinko Revision: 1231887 Modified property: svn:log Modified: svn:log at Mon Jan 16 11:10:15 2012 -- --- svn:log (original) +++ svn:log Mon Jan 16 11:10:15 2012 @@ -0,0 +1,2 @@ +Review comments from kkolinko +Restore format of the first line of error message for JMX proxy servlet in case scripts were depending on it. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231923 - in /tomcat/trunk: build.properties.default build.xml
Author: markt Date: Mon Jan 16 11:11:11 2012 New Revision: 1231923 URL: http://svn.apache.org/viewvc?rev=1231923view=rev Log: Automate OpenPGP signature generation for release process. Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Jan 16 11:11:11 2012 @@ -46,6 +46,9 @@ test.accesslog=false # Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721 test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom +# Location of GPG executable (used only for releases) +gpg.exec=/path/to/gpg + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jan 16 11:11:11 2012 @@ -1724,7 +1724,7 @@ Apache Tomcat ${version} native binaries /target target name=release - depends=clean,clean-depend,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar + depends=clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar description=Create a Tomcat 8 packaged distribution copy file=KEYS @@ -1758,11 +1758,19 @@ Apache Tomcat ${version} native binaries include name=*.zip/ include name=*.tar.gz/ include name=*.md5/ +include name=*.asc/ /fileset /copy /target + !-- Sets properties only required for releases -- + target name=release-init +input message=Enter GPG pass-phrase addproperty=gpg.passphrase + handler type=secure/ +/input + /target + !-- Packages the core zip distro -- target name=package-zip depends=dist-static fixcrlf srcdir=${tomcat.dist} eol=crlf @@ -2528,6 +2536,26 @@ Read the Building page on the Apache Tom basename file=${file} property=filename / checksum file=${file} property=value / echo file=${file}.md5 message=${value}${md5sum.binary-prefix}${filename} / +!-- Anything that requires an md5 hash, also needs a signature -- +antcall target=sign + param name=file value=${file} / +/antcall + /target + + !-- Helper target, used to create a detached ascii OpenPGP signature. -- + !-- Uses GPG with default key. Requires 'file' as a parameter. Only -- + !-- executes if gpg passphrase is set which is only set when using the -- + !-- release target. -- + target name=sign if=gpg.passphrase +fail unless=file / +exec executable=${gpg.exec} failonerror=true + inputstring=${gpg.passphrase} + arg value=--passphrase-fd/ + arg value=0/ + arg value=-a/ + arg value=-b/ + arg value=${file}/ +/exec /target /project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231924 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml webapps/docs/changelog.xml
Author: markt Date: Mon Jan 16 11:12:32 2012 New Revision: 1231924 URL: http://svn.apache.org/viewvc?rev=1231924view=rev Log: Automate OpenPGP signature generation Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 16 11:12:32 2012 @@ -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,1174975,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,1187 381,1187753,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,1 201931,1202035,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,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/331 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1231924 Blamelist: markt BUILD FAILED: failed compile sincerely, -The Buildbot
Re: svn commit: r1231923 - in /tomcat/trunk: build.properties.default build.xml
How to avoid being asked for passphrase if 1. I do not have gpg installed 2. Do not want to generate asc files It seems that buildbot also has problem with this. Maybe check that gpg.exec points to an existing executable. 2012/1/16 ma...@apache.org: Author: markt Date: Mon Jan 16 11:11:11 2012 New Revision: 1231923 URL: http://svn.apache.org/viewvc?rev=1231923view=rev Log: Automate OpenPGP signature generation for release process. Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Jan 16 11:11:11 2012 @@ -46,6 +46,9 @@ test.accesslog=false # Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721 test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom +# Location of GPG executable (used only for releases) +gpg.exec=/path/to/gpg + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jan 16 11:11:11 2012 @@ -1724,7 +1724,7 @@ Apache Tomcat ${version} native binaries /target target name=release - depends=clean,clean-depend,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar + depends=clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar description=Create a Tomcat 8 packaged distribution copy file=KEYS @@ -1758,11 +1758,19 @@ Apache Tomcat ${version} native binaries include name=*.zip/ include name=*.tar.gz/ include name=*.md5/ + include name=*.asc/ /fileset /copy /target + !-- Sets properties only required for releases -- + target name=release-init + input message=Enter GPG pass-phrase addproperty=gpg.passphrase + handler type=secure/ + /input + /target + !-- Packages the core zip distro -- target name=package-zip depends=dist-static fixcrlf srcdir=${tomcat.dist} eol=crlf @@ -2528,6 +2536,26 @@ Read the Building page on the Apache Tom basename file=${file} property=filename / checksum file=${file} property=value / echo file=${file}.md5 message=${value}${md5sum.binary-prefix}${filename} / + !-- Anything that requires an md5 hash, also needs a signature -- + antcall target=sign + param name=file value=${file} / + /antcall + /target + + !-- Helper target, used to create a detached ascii OpenPGP signature. -- + !-- Uses GPG with default key. Requires 'file' as a parameter. Only -- + !-- executes if gpg passphrase is set which is only set when using the -- + !-- release target. -- + target name=sign if=gpg.passphrase + fail unless=file / + exec executable=${gpg.exec} failonerror=true + inputstring=${gpg.passphrase} + arg value=--passphrase-fd/ + arg value=0/ + arg value=-a/ + arg value=-b/ + arg value=${file}/ + /exec /target /project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231935 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Jan 16 11:28:09 2012 New Revision: 1231935 URL: http://svn.apache.org/viewvc?rev=1231935view=rev Log: Correct typos (s/first/the first/) Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1231935r1=1231934r2=1231935view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 16 11:28:09 2012 @@ -57,8 +57,8 @@ subsection name=Web applications changelog fix -Restore format of first line of error message for JMX proxy servlet in -case scripts were depending on it. (mark) +Restore format of the first line of error message for JMX proxy +servlet in case scripts were depending on it. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1231923 - in /tomcat/trunk: build.properties.default build.xml
On 16/01/2012 11:26, Konstantin Kolinko wrote: How to avoid being asked for passphrase if 1. I do not have gpg installed 2. Do not want to generate asc files It seems that buildbot also has problem with this. Maybe check that gpg.exec points to an existing executable. I'll add another property. I was trying to avoid having to do that. Mark 2012/1/16 ma...@apache.org: Author: markt Date: Mon Jan 16 11:11:11 2012 New Revision: 1231923 URL: http://svn.apache.org/viewvc?rev=1231923view=rev Log: Automate OpenPGP signature generation for release process. Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Jan 16 11:11:11 2012 @@ -46,6 +46,9 @@ test.accesslog=false # Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721 test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom +# Location of GPG executable (used only for releases) +gpg.exec=/path/to/gpg + # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, # as it is referenced with different working directory Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231923r1=1231922r2=1231923view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jan 16 11:11:11 2012 @@ -1724,7 +1724,7 @@ Apache Tomcat ${version} native binaries /target target name=release - depends=clean,clean-depend,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar + depends=clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar description=Create a Tomcat 8 packaged distribution copy file=KEYS @@ -1758,11 +1758,19 @@ Apache Tomcat ${version} native binaries include name=*.zip/ include name=*.tar.gz/ include name=*.md5/ +include name=*.asc/ /fileset /copy /target + !-- Sets properties only required for releases -- + target name=release-init +input message=Enter GPG pass-phrase addproperty=gpg.passphrase + handler type=secure/ +/input + /target + !-- Packages the core zip distro -- target name=package-zip depends=dist-static fixcrlf srcdir=${tomcat.dist} eol=crlf @@ -2528,6 +2536,26 @@ Read the Building page on the Apache Tom basename file=${file} property=filename / checksum file=${file} property=value / echo file=${file}.md5 message=${value}${md5sum.binary-prefix}${filename} / +!-- Anything that requires an md5 hash, also needs a signature -- +antcall target=sign + param name=file value=${file} / +/antcall + /target + + !-- Helper target, used to create a detached ascii OpenPGP signature. -- + !-- Uses GPG with default key. Requires 'file' as a parameter. Only -- + !-- executes if gpg passphrase is set which is only set when using the -- + !-- release target. -- + target name=sign if=gpg.passphrase +fail unless=file / +exec executable=${gpg.exec} failonerror=true + inputstring=${gpg.passphrase} + arg value=--passphrase-fd/ + arg value=0/ + arg value=-a/ + arg value=-b/ + arg value=${file}/ +/exec /target /project - 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Nexus release problem
On 16 January 2012 09:43, Mark Thomas ma...@apache.org wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? AIUI, Nexus is supposed to maintain the metadata, so I would raise a JIRA INFRA bug against Nexus to get this resolved. Mark [1] http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [2] https://repository.apache.org/service/local/repositories/orgapachetomcat-078/content/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [3] https://issues.apache.org/bugzilla/show_bug.cgi?id=52124 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231947 - /tomcat/trunk/build.xml
Author: markt Date: Mon Jan 16 11:43:29 2012 New Revision: 1231947 URL: http://svn.apache.org/viewvc?rev=1231947view=rev Log: Make generation of OpenPGP signatures dependent on definition of valid GPG binary. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231947r1=1231946r2=1231947view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Mon Jan 16 11:43:29 2012 @@ -1766,6 +1766,11 @@ Apache Tomcat ${version} native binaries !-- Sets properties only required for releases -- target name=release-init +available file=${gpg.exec} property=gpg.exec.available/ +antcall target=gpg-init / + /target + + target name=gpg-init if=${gpg.exec.available} input message=Enter GPG pass-phrase addproperty=gpg.passphrase handler type=secure/ /input - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Nexus release problem
On 16/01/2012 11:42, sebb wrote: On 16 January 2012 09:43, Mark Thomas ma...@apache.org wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? AIUI, Nexus is supposed to maintain the metadata, so I would raise a JIRA INFRA bug against Nexus to get this resolved. We'll see what happens when a release is promoted. Konstantin's point that this metadata only applies to the staged release makes sense. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231951 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: markt Date: Mon Jan 16 11:45:23 2012 New Revision: 1231951 URL: http://svn.apache.org/viewvc?rev=1231951view=rev Log: Make generation of OpenPGP signatures dependent on definition of valid GPG binary. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 16 11:45:23 2012 @@ -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,1174975,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,1187 381,1187753,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,1 201931,1202035,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,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/333 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1231951 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: Nexus release problems
On 16 January 2012 10:53, Konstantin Kolinko knst.koli...@gmail.com wrote: 2012/1/16 Mark Thomas ma...@apache.org: On 16/01/2012 09:43, Mark Thomas wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? [1] http://repo2.maven.org/maven2/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [2] https://repository.apache.org/service/local/repositories/orgapachetomcat-078/content/org/apache/tomcat/tomcat-catalina/maven-metadata.xml [3] https://issues.apache.org/bugzilla/show_bug.cgi?id=52124 There is no error in that. The metadata is only for orgapachetomcat-078 repository that contains this only release and nothing else. I do not know an easy way to find similar current repositories in other projects. Just searched markmail.org for recent VOTE threads mentioning repository.apache.org. Here are two examples https://repository.apache.org/content/repositories/orgapacherave-015/ https://repository.apache.org/content/repositories/maven-060/ (from the following threads: http://markmail.org/thread/qt5pwg3xdxpapyc5 http://markmail.org/thread/jaa3fi4djn6kflic ) Oh, and if there is a way to get Nexus not to create .md5 and .sha1 files for the .asc signatures that would be nice but not essential since the scp+rsync had the same problem. I think that it is not possible to avoid creating them. I thought I had raised a bug against Nexus for that, but cannot find it at present. Likewise, Maven should not create them. [They are only small, but they are a nuisance when visually scanning the directory listing] I've read on dev@commons that it is possible to delete them (more below). I think that Maven may need those files just to autocheck integrity of asc files downloaded from remote servers. So I think it is better to keep them. AFAIK that's not necessary. Regarding the procedure to delete those files I just did some search: Some [1] say that you delete them before closing staging area. Others [2] (an older thread but seems more reliable) say that only after closing it. It used to be possible to delete spurious files in both open and closed staging areas. It's no longer possible to delete files in the open state; I've raised a bug for this: https://issues.apache.org/jira/browse/INFRA-4312 [1] http://markmail.org/message/tebuldnggk3pepky [2] http://markmail.org/thread/uqjxxvpgztrlg362 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51717] Provide a way to disable EL cache
https://issues.apache.org/bugzilla/show_bug.cgi?id=51717 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #2 from Mark Thomas ma...@apache.org 2012-01-16 12:04:30 UTC --- Given this was the only request for this, closing as WONTFIX. Improved control of the EL caches is on the agenda for EL 3.0 so this may appear in Tomcat 8 anyway. -- 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 45283] Provide a JSR196 implementation
https://issues.apache.org/bugzilla/show_bug.cgi?id=45283 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX --- Comment #9 from Mark Thomas ma...@apache.org 2012-01-16 12:08:28 UTC --- This was implemented for TomEE which is available from the Apache OpenEJB project. -- 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 44264] Clustering - Support for disabling multicasting and adding only static members
https://issues.apache.org/bugzilla/show_bug.cgi?id=44264 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas ma...@apache.org 2012-01-16 12:12:14 UTC --- This was fixed in 6.0.19 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
Re: [VOTE] Release Apache Tomcat 7.0.24
I think it's here (thanks) But you need to close it (tru the ui) in order we can consume artifacts from this staged repository. 2012/1/16 Olivier Lamy ol...@apache.org: Hello, 2012/1/16 Konstantin Kolinko knst.koli...@gmail.com: 2012/1/16 Mark Thomas ma...@apache.org: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Thus far (quick testing) everything is OK. Mark, can you upload files to Nexus? It should be easier to prepare everything while vote goes. Agree. Could be fine to have artifacts in a staging repo. In my case I could test with the maven plugin. I'd like to add a sample with the port 0 in the archetype sample. Best regards, Konstantin Kolinko - 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 -- 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
Re: Nexus release problem
On 01/16/2012 12:45 PM, Mark Thomas wrote: On 16/01/2012 11:42, sebb wrote: On 16 January 2012 09:43, Mark Thomasma...@apache.org wrote: It appears there is a problem with the Nexus release process. Prior to the switch to Nexus, the Maven metedata contained all previous releases [1]. Post the switch to Nexus, none of the previous releases appear in the metadata [2]. The switch to Nexus has, therefore, introduced the very bug to the Tomcat 7.0.x series that the switch to Nexus was meant to avoid [3]. Given that we go have the prior metadata, how do we get Nexus to use it? AIUI, Nexus is supposed to maintain the metadata, so I would raise a JIRA INFRA bug against Nexus to get this resolved. We'll see what happens when a release is promoted. That when Nexus updates the information. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16/01/2012 12:23, Olivier Lamy wrote: I think it's here (thanks) But you need to close it (tru the ui) in order we can consume artifacts from this staged repository. OK. Closed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16 January 2012 13:02, Mark Thomas ma...@apache.org wrote: On 16/01/2012 12:23, Olivier Lamy wrote: I think it's here (thanks) But you need to close it (tru the ui) in order we can consume artifacts from this staged repository. OK. Closed. Normally Nexus sends messages to a mailing list when staging repos are closed, dropped or released. But I've not noticed any relating to Tomcat - where are they being sent? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16/01/2012 13:11, sebb wrote: On 16 January 2012 13:02, Mark Thomas ma...@apache.org wrote: On 16/01/2012 12:23, Olivier Lamy wrote: I think it's here (thanks) But you need to close it (tru the ui) in order we can consume artifacts from this staged repository. OK. Closed. Normally Nexus sends messages to a mailing list when staging repos are closed, dropped or released. But I've not noticed any relating to Tomcat - where are they being sent? It came to me. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16.01.2012 00:29, Mark Thomas wrote: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.24 Stable +1 but note that's not an easy decision, because one of the unit tests fail for the src distribution due to incomplete packaging (two mising target directories). IMHO that's not nice but not a show-stopper. The crash in APR was not reproducible. Some other unit test failures only occur every now and then and look like timing issues. Details: - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src *not* consistent with svn tag ! - Missing in src because target excluded in dist-source (build.xml): - test/webapp-3.0-virtual-library/target - test/webapp-3.0-virtual-webapp/target In addition the following minor points (no regression or already fixed): - line ends of modules/jdbc-pool/resources/MANIFEST.MF differ between svn and gz although eol-style is set correctly. - line ends of 3 java sources files are wrong because svn:eol-style was missing. Fixed in r1231860 - the files we copy before building, e.g. catalina.properties and jdbc-pool.xml are of course not in svn for the cp target location, but they are in the src bundles. - builds fine - build result looks consistent with binaries - no checkstyle complaints - no Javadoc errors - Unit tests *one FAILURE* for BIO, NIO and APR - TestVirtualContext fails for build generated from src because of the missing target directory in the src distro (see above) - some spurious failures do not seem to be new: - TestWebappClassLoaderMemoryLeak: Timer thread still running - TestAsyncContextImpl (NIO): one failure in line 172, because response time was 976 ms, which is not = 1000 - TestXxxEndpoint (APR): crash in HotSpot when compiling C2: 5449 114 !org.apache.tomcat.util.IntrospectionUtils.setProperty (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Z)Z (925 bytes) Not reproducible! - JMX MBean-Comparison only expected differences: - Attribute -requestBytesSent for RequestProcessor related to thread http-bio-8080-exec-1 shows 0 instead of 131072. This is likely a consequence of the JMXProxy now first formatting the complete result via the MBeanDumper and then writing back everything, so at the time of formatting nothing was written yet, so byte count 0. I checked with a request streaming data and when I dump the MBeans in parallel, I can see the correct requestBytesSent in the MBean for that streaming request. - New attribute localPort in Connector, ProtocolHandler and ThreadPool MBeans - New attribute nameIndex in ProtocolHandler MBean - slightly different sorting for rejectedSessions - two new loggers (o.a.c.mbeans and o.a.c.mbeans.MBeanDumper) Build and tests were done using Java 1.6.0_30, OS was Solaris 10 Sparc, tcnative was 1.1.22 based on APR 1.4.5 and OpenSSL 1.0.0f. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: More Caching for WebappClassLoader?
On 11.01.2012 03:16, Konstantin Kolinko wrote: 2012/1/10 Rainer Jungrainer.j...@kippdata.de: Note that when looking for a class most time is wasted when looking up a *.class resource. That code is in findResourceInternal() and I think that that method should be considered as well, to speed up lookup of any resources, not only the classes. I had some old patch draft lying around. I submitted it in https://issues.apache.org/bugzilla/show_bug.cgi?id=52448 See that issue for details. I started to look at it, but noticed a problem when trying to apply my naive implementation to resources as well: as long as I stick to loadClass, I do now, that we are synchronized. So there's no additional locking overhead. When switching to caching for resources things get much more complicated, because this simple assumption is no longer true. I saw you e.g. added a volatile to one member of ResourceEntry because the WebappCL uses double checked locking in one place etc. So I would prefer to fix the loadClass() case first using a simple pattern. Concerning the cache of classes that you are proposing: consider the following scenario: (1) WebappClassLoader is asked to load a class. It does not find it and then finds it in the parent classloader. (2) It is asked for this class again. During (2) should it look into its own resources first? If during the time between (1) and (2) one puts a class file into WEB-INF/classes should that class file be used? I think that during (2) call it must ignore the class in WEB-INF/classes and still use the class from parent classloader. That is for consistency with previous result. That would be the behaviour of the implementation I have in mind. I think that instead of caching the class instance itself it would be safe to cache the fact that the class was loaded from the parent classloader. It separates responsibilities and solves the issue with dynamic classloading. The difference is small though. Actually WebappClassLoader#notFoundResources already serves similar purpose. Correct in theory. When I tried to implement this, I noticed that we do use very different methods to actually retrieve the classes from the CLs: - findClass() for super - loadClass() for system - Class.forName() for parent Especially for super it would be not clear to me, what the right method for loading the class in the cached case would be: loadClass() or findLoadedClass() or Class.forName()? Simply using findClass() again doesn't seem to be the right thing to make the caching work. The more I look into it, the more I come back to my initial and simple idea. Regarding class instances caching I see two concerns: a) Garbage-collecting unused classes. b) Hot-swapping classes during debugging. Regarding a) that is not a concern if parent classloader already has cache of those classes. Caching just names is safer, does not prevent gc of the classes and the names take less memory (and no PermGen memory). I'll make some experiment to find out, how much memory overhead it would actually mean. Regarding b) I suspect that hot-swapping changes bytecode but does not change the Class instance. Documentation is at [1], but I do not have much experience with this feature. [1] http://docs.oracle.com/javase/1.4.2/docs/guide/jpda/enhancements.html#hotswap I read the docs and I agree: it seems they swap the actual bytes inside the classes. It should be transparent to the class loaders. Regarding try loading from system loader call: Isn't that call fast? In JRE 6 there are some indexes (lib/classlist, lib/meta-index) that should help system classloader to reject requests for classes that it cannot load. It was not the primary bottleneck, but ever now and then even system.loadClass() showed up int the thread dumps. Unfortunately I don't have them at hand any longer, so can't inspect, where exactly the code was captured. While we are talking about classloaders - there is one more patch in Bugzilla, https://issues.apache.org/bugzilla/show_bug.cgi?id=48903#c6 that tries to use some jdk7 feature to improve classloader locking. I do not plan to look at it in near future, as I do not see much benefit from jdk7 yet. Just reminding. I had a look. Again, I wanted to get something done for the original issue first, but thanks for the hint! Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232005 - in /tomcat/site/trunk: docs/download-55.html docs/index.html xdocs/download-55.xml xdocs/index.xml
Author: jim Date: Mon Jan 16 14:27:49 2012 New Revision: 1232005 URL: http://svn.apache.org/viewvc?rev=1232005view=rev Log: Push on to Tomcat 5.5.35 Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/download-55.xml tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1232005r1=1232004r2=1232005view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Mon Jan 16 14:27:49 2012 @@ -215,8 +215,8 @@ blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | -a href=#5.5.345.5.34/a | -a href=[preferred]tomcat/tomcat-5/v5.5.34 rel=nofollowBrowse/a | +a href=#5.5.355.5.35/a | +a href=[preferred]tomcat/tomcat-5/v5.5.35 rel=nofollowBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-5;Archives/a /blockquote @@ -302,7 +302,7 @@ /table table border=0 cellspacing=0 cellpadding=2 width=100% tr -td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=5.5.34strong5.5.34/strong/a/font/td +td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=5.5.35strong5.5.35/strong/a/font/td /tr tr td @@ -311,8 +311,8 @@ p -a name=5.5.34Please/a see the - a href=[preferred]tomcat/tomcat-5/v5.5.34/README.html rel=nofollowREADME/a +a name=5.5.35Please/a see the + a href=[preferred]tomcat/tomcat-5/v5.5.35/README.html rel=nofollowREADME/a file for packaging information. It explains what every distribution contains. /p @@ -340,23 +340,23 @@ li -a href=[preferred]tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.zip rel=nofollowzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.zip rel=nofollowzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.tar.gz rel=nofollowtar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.tar.gz.md5;md5/a) +a href=[preferred]tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz rel=nofollowtar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.exe rel=nofollowWindows Service Installer/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.exe.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34.exe.md5;md5/a) +a href=[preferred]tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.exe rel=nofollowWindows Service Installer/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.exe.md5;md5/a) /li /ul @@ -369,16 +369,16 @@ li -a href=[preferred]tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34-deployer.zip rel=nofollowzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34-deployer.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35-deployer.zip rel=nofollowzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35-deployer.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34-deployer.tar.gz rel=nofollowtar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.34/bin/apache-tomcat-5.5.34-deployer.tar.gz.asc;pgp/a, - a
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16/01/2012 13:19, Rainer Jung wrote: On 16.01.2012 00:29, Mark Thomas wrote: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.24 Stable +1 but note that's not an easy decision, because one of the unit tests fail for the src distribution due to incomplete packaging (two mising target directories). IMHO that's not nice but not a show-stopper. I know what you mean. I'm leaning towards re-tagging since the JMX proxy stuff arguably changes the interface (which is not ideal). A release is doable, but I'd rather fix these niggles. The crash in APR was not reproducible. Some other unit test failures only occur every now and then and look like timing issues. OK. Thanks for checking. Details: - MD5 OK - signatures OK - key in KEYS file - gz and zip for src and bin consistent - src *not* consistent with svn tag ! - Missing in src because target excluded in dist-source (build.xml): - test/webapp-3.0-virtual-library/target - test/webapp-3.0-virtual-webapp/target In addition the following minor points (no regression or already fixed): - line ends of modules/jdbc-pool/resources/MANIFEST.MF differ between svn and gz although eol-style is set correctly. - line ends of 3 java sources files are wrong because svn:eol-style was missing. Fixed in r1231860 - the files we copy before building, e.g. catalina.properties and jdbc-pool.xml are of course not in svn for the cp target location, but they are in the src bundles. - builds fine - build result looks consistent with binaries - no checkstyle complaints - no Javadoc errors - Unit tests *one FAILURE* for BIO, NIO and APR - TestVirtualContext fails for build generated from src because of the missing target directory in the src distro (see above) - some spurious failures do not seem to be new: - TestWebappClassLoaderMemoryLeak: Timer thread still running - TestAsyncContextImpl (NIO): one failure in line 172, because response time was 976 ms, which is not = 1000 - TestXxxEndpoint (APR): crash in HotSpot when compiling C2: 5449 114 !org.apache.tomcat.util.IntrospectionUtils.setProperty (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Z)Z (925 bytes) Not reproducible! - JMX MBean-Comparison only expected differences: - Attribute -requestBytesSent for RequestProcessor related to thread http-bio-8080-exec-1 shows 0 instead of 131072. This is likely a consequence of the JMXProxy now first formatting the complete result via the MBeanDumper and then writing back everything, so at the time of formatting nothing was written yet, so byte count 0. I checked with a request streaming data and when I dump the MBeans in parallel, I can see the correct requestBytesSent in the MBean for that streaming request. - New attribute localPort in Connector, ProtocolHandler and ThreadPool MBeans - New attribute nameIndex in ProtocolHandler MBean - slightly different sorting for rejectedSessions - two new loggers (o.a.c.mbeans and o.a.c.mbeans.MBeanDumper) Build and tests were done using Java 1.6.0_30, OS was Solaris 10 Sparc, tcnative was 1.1.22 based on APR 1.4.5 and OpenSSL 1.0.0f. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232026 - in /tomcat/site/trunk: docs/doap_Tomcat.rdf xdocs/doap_Tomcat.rdf
Author: jim Date: Mon Jan 16 15:24:42 2012 New Revision: 1232026 URL: http://svn.apache.org/viewvc?rev=1232026view=rev Log: Update rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1232026r1=1232025r2=1232026view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Jan 16 15:24:42 2012 @@ -69,8 +69,8 @@ release Version nameLatest Stable 5.5.x release/name -created2011-09-22/created -revision5.5.34/revision +created2012-01-16/created +revision5.5.35/revision /Version /release repository Modified: tomcat/site/trunk/xdocs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/doap_Tomcat.rdf?rev=1232026r1=1232025r2=1232026view=diff == --- tomcat/site/trunk/xdocs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/xdocs/doap_Tomcat.rdf Mon Jan 16 15:24:42 2012 @@ -69,8 +69,8 @@ release Version nameLatest Stable 5.5.x release/name -created2011-09-22/created -revision5.5.34/revision +created2012-01-16/created +revision5.5.35/revision /Version /release repository - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232027 - /tomcat/site/trunk/xdocs/whichversion.xml
Author: jim Date: Mon Jan 16 15:26:12 2012 New Revision: 1232027 URL: http://svn.apache.org/viewvc?rev=1232027view=rev Log: update for 5.5.35 Modified: tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1232027r1=1232026r2=1232027view=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Mon Jan 16 15:26:12 2012 @@ -42,7 +42,7 @@ mapping between the specifications and t tr td2.4/2.0/td td5.5.x/td - td5.5.34/td + td5.5.35/td td1.4/td /tr - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232028 - /tomcat/site/trunk/docs/whichversion.html
Author: jim Date: Mon Jan 16 15:26:24 2012 New Revision: 1232028 URL: http://svn.apache.org/viewvc?rev=1232028view=rev Log: and publish Modified: tomcat/site/trunk/docs/whichversion.html Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1232028r1=1232027r2=1232028view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Mon Jan 16 15:26:24 2012 @@ -235,7 +235,7 @@ mapping between the specifications and t td bgcolor=#a0ddf0 valign=top align=leftfont color=#00 size=-1 face=arial,helvetica,sanserif2.4/2.0/font/td td bgcolor=#a0ddf0 valign=top align=leftfont color=#00 size=-1 face=arial,helvetica,sanserif5.5.x/font/td - td bgcolor=#a0ddf0 valign=top align=leftfont color=#00 size=-1 face=arial,helvetica,sanserif5.5.34/font/td + td bgcolor=#a0ddf0 valign=top align=leftfont color=#00 size=-1 face=arial,helvetica,sanserif5.5.35/font/td td bgcolor=#a0ddf0 valign=top align=leftfont color=#00 size=-1 face=arial,helvetica,sanserif1.4/font/td /tr - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16.01.2012 16:23, Mark Thomas wrote: On 16/01/2012 13:19, Rainer Jung wrote: On 16.01.2012 00:29, Mark Thomas wrote: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 7.0.24 Stable +1 but note that's not an easy decision, because one of the unit tests fail for the src distribution due to incomplete packaging (two mising target directories). IMHO that's not nice but not a show-stopper. I know what you mean. I'm leaning towards re-tagging since the JMX proxy stuff arguably changes the interface (which is not ideal). A release is doable, but I'd rather fix these niggles. OK, will happily recheck after retagging. Thanks (as always) for careful RMing. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1232086 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: kkolinko Date: Mon Jan 16 18:10:51 2012 New Revision: 1232086 URL: http://svn.apache.org/viewvc?rev=1232086view=rev Log: CTR Correct @since comment in r1149220 The patch (2010-11-17_tc6_path-params.patch) was prepared on 2010-11-17, in time for 6.0.30, but it was committed several months later - 6.0.33. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1232086r1=1232085r2=1232086view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Jan 16 18:10:51 2012 @@ -697,7 +697,7 @@ public class CoyoteAdapter implements Ad /** * Parse session id in URL. - * @deprecated Not used since 6.0.30 + * @deprecated Not used since 6.0.33 */ @Deprecated protected void parseSessionId(org.apache.coyote.Request req, Request request) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:200 but was:404 junit.framework.AssertionFailedError: expected:200 but was:404 at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. If there are no side effect to dropping this exclude, you may do it (I really don't know enough of the build system of tomcat). Otherwise I can rename those directories so that it is not excluded. Just let me know. Sylvain - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANNOUNCE] Apache Tomcat 5.5.35 Released.
The Apache Tomcat team announces the immediate availability of Apache Tomcat 5.5.35 stable. Apache Tomcat 5.5.35 is primarily a security and bug fix release. All users of older versions of the Tomcat 5.5 family should upgrade to 5.5.35. Please refer to the change log for the list of changes: http://tomcat.apache.org/tomcat-5.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-55.cgi Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 16/01/2012 19:04, Sylvain Laurent wrote: On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:200 but was:404 junit.framework.AssertionFailedError: expected:200 but was:404 at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. If there are no side effect to dropping this exclude, you may do it (I really don't know enough of the build system of tomcat). Otherwise I can rename those directories so that it is not excluded. Just let me know. If I recall correctly, those directories are excluded because some IDEs use that name by default. If you could rename them that would be great. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
On 15/01/2012 23:29, Mark Thomas wrote: The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [X] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Broken since the src distro doesn't contain everything it should. On the plus side, the unit tests all pass as do all the TCKs in the usual combinations. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1080719 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
The current behavior is a lot cleaner, (it just broke existing installations), as removing the XML file when the tomcat is not running actually undeploys the app. When the war was expanded into appBase before, it would have still been deployed. On 1/14/2012 10:57 AM, Mark Thomas wrote: On 13/01/2012 22:04, Filip Hanik - Dev Lists wrote: I'm looking for a better reason for this change. What was the reasoning behind this limitation, as it breaks years of compatibility. Workaround is to point docBase to a directory. The reasoning was that the documentation said one thing (that WARs outside the appBase would not be unpacked into the appBase) while the code did exactly the opposite but did not handle any of the special cases it should have. The documentation was the same (and had been for many years) for 5.5.x, 6.0.x and 7.0.x. I choose to align the code with the documentation on that occasion as it was simpler than making sure that the unpackWARs option worked correctly. The deployment process is full of edge cases (although fortunately a lot fewer than there were in the 4.1.x days) and it would have taken a fair amount of time to go through them and check that they were all handled correctly. As an aside, it would probably be a good idea if we documented all the use cases that deployment is meant to handle. It would make it easier to assess any future changes. I also took into account the following: - the current behaviour was undocumented (the documentation stated the opposite would happen) - the workaround (use a directory for the external docBase rather than a WAR) was simple. I'm not against a change to the documented behaviour and expanding external WARs into the docBase but any change along those lines would need to be carefully thought through. I don't think it is as simple as just unpacking the WAR, particularly for undeployment and context.xml updates (e.g. a context.xml update that changed the docBase would need special handling). Mark best Filip On 3/11/2011 11:40 AM, ma...@apache.org wrote: Author: markt Date: Fri Mar 11 18:40:13 2011 New Revision: 1080719 URL: http://svn.apache.org/viewvc?rev=1080719view=rev Log: Don't unpack WAR files if they are not located in the Host's appBase. - 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: [VOTE] Release Apache Tomcat 7.0.24
2012/1/17 Mark Thomas ma...@apache.org: On 16/01/2012 19:04, Sylvain Laurent wrote: On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:200 but was:404 junit.framework.AssertionFailedError: expected:200 but was:404 at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. If there are no side effect to dropping this exclude, you may do it (I really don't know enough of the build system of tomcat). Otherwise I can rename those directories so that it is not excluded. Just let me know. If I recall correctly, those directories are excluded because some IDEs use that name by default. If you could rename them that would be great. Not IDEs, but Maven. It writes its output into directories named target, in each of its modules. (I guess that is not configurable, grr...) That is why target was present in .gitignore when it was first added, [1] http://svn.apache.org/viewvc?view=revisionrevision=1187740 This fault is a combination of mine [2] http://svn.apache.org/viewvc?view=revisionrevision=1204938 that applied patterns from gitignore to src distribution and of Sylvain's [3] http://svn.apache.org/viewvc?view=revisionrevision=1209731 when Sylvain removed that line from .gitignore and used that name in his commit. I am generally in favor of using more targeted patterns in dist-source target, (That is, comment out **/target/** for now, with a comment that we use that name, and add the same comment to .gitignore and later exclude more specific patterns when a need comes) but consider if one of developers used Maven to work on something in modules. Currently modules/jdbc-pool and modules/tomcat-lite have pom.xml, though svn:ignore property on those directories does not list target as excluded. 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: r1080719 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
2012/1/17 Filip Hanik - Dev Lists devli...@hanik.com: The current behavior is a lot cleaner, (it just broke existing installations), as removing the XML file when the tomcat is not running actually undeploys the app. When the war was expanded into appBase before, it would have still been deployed. On 1/14/2012 10:57 AM, Mark Thomas wrote: On 13/01/2012 22:04, Filip Hanik - Dev Lists wrote: I'm looking for a better reason for this change. What was the reasoning behind this limitation, as it breaks years of compatibility. Workaround is to point docBase to a directory. The reasoning was that the documentation said one thing (that WARs outside the appBase would not be unpacked into the appBase) while the code did exactly the opposite but did not handle any of the special cases it should have. The documentation was the same (and had been for many years) for 5.5.x, 6.0.x and 7.0.x. I choose to align the code with the documentation on that occasion as it was simpler than making sure that the unpackWARs option worked correctly. The deployment process is full of edge cases (although fortunately a lot fewer than there were in the 4.1.x days) and it would have taken a fair amount of time to go through them and check that they were all handled correctly. As an aside, it would probably be a good idea if we documented all the use cases that deployment is meant to handle. It would make it easier to assess any future changes. I also took into account the following: - the current behaviour was undocumented (the documentation stated the opposite would happen) - the workaround (use a directory for the external docBase rather than a WAR) was simple. I'm not against a change to the documented behaviour and expanding external WARs into the docBase but any change along those lines would need to be carefully thought through. I don't think it is as simple as just unpacking the WAR, particularly for undeployment and context.xml updates (e.g. a context.xml update that changed the docBase would need special handling). Mark best Filip On 3/11/2011 11:40 AM, ma...@apache.org wrote: Author: markt Date: Fri Mar 11 18:40:13 2011 New Revision: 1080719 URL: http://svn.apache.org/viewvc?rev=1080719view=rev Log: Don't unpack WAR files if they are not located in the Host's appBase. I do not mind if someone reimplemented the feature, but keeping it off by default, That is like we have Host's copyXML that restores TC6 behaviour and is off by default. Here is Bugzilla report that one can reference: https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 I wonder whether it shall be configurable at Context level as well. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51621] Missing jars in Deployer
https://issues.apache.org/bugzilla/show_bug.cgi?id=51621 Paul pggiff...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #2 from Paul pggiff...@gmail.com 2012-01-17 05:10:43 UTC --- Either this is not fixed, or I don't understand what the fix was (because it's not listed). I'm still getting this exception with 7.0.22. When using a catalina-ant.jar from 2008 (I don't know which version of Tomcat it came from - the manifest.mf file is dated 2008-07-22) I don't need to include the extra jars as described in this thread: http://www.coderanch.com/t/551052/Spring/java-lang-NoClassDefFoundError-org-apache Perhaps a slightly better stack trace would be helpful: java.lang.NoClassDefFoundError: org/apache/tomcat/util/buf/B2CConverter at org.apache.catalina.util.Base64.encode(Base64.java:177) at org.apache.catalina.ant.AbstractCatalinaTask.execute(AbstractCatalinaTask.java:204) at org.apache.catalina.ant.DeployTask.execute(DeployTask.java:211) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291) ... -- 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 51621] Missing jars in Deployer
https://issues.apache.org/bugzilla/show_bug.cgi?id=51621 Paul pggiff...@gmail.com changed: What|Removed |Added CC||pggiff...@gmail.com -- 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 52474] New: Do not load listeners declared with blank spaces on tld file.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52474 Bug #: 52474 Summary: Do not load listeners declared with blank spaces on tld file. Product: Tomcat 7 Version: 7.0.23 Platform: PC OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: heliofr...@gmail.com Classification: Unclassified Created attachment 28163 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28163 debugging tomcat source Do not load listeners declared with blank spaces on tld file. Removing blank spaces the application run. -- 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 52474] Do not load listeners declared with blank spaces on tld file.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52474 --- Comment #1 from Helio Frota heliofr...@gmail.com 2012-01-17 05:43:30 UTC --- Comment on attachment 28163 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28163 debugging tomcat source Image eclipse debugging attached. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
2012/1/17 Konstantin Kolinko knst.koli...@gmail.com: 2012/1/17 Mark Thomas ma...@apache.org: On 16/01/2012 19:04, Sylvain Laurent wrote: On 16 janv. 2012, at 10:44, Rainer Jung wrote: 1) Unit test failure due to missing target directory in src dist I noticed that test/webapp-3.0-virtual-library/target is missing from the src dist. So when rebuilding from src dist and running unit tests, I get a failure in TestVirtualContext, because some resource which is usually retrieved form the target dir is missing: Testcase: testVirtualClassLoader took 7.434 sec FAILED expected:200 but was:404 junit.framework.AssertionFailedError: expected:200 but was:404 at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:302) at org.apache.catalina.loader.TestVirtualContext.assertPageContains(TestVirtualContext.java:294) at org.apache.catalina.loader.TestVirtualContext.testVirtualClassLoader(TestVirtualContext.java:100) AFAIK the root cause is, that we exclude **/target/** in the ant target dist-source from being copied. Note that there is also test/webapp-3.0-virtual-library/target. I don't know, whether we can simply drop this exclude, or should rename the directory. I CC'd Sylvain explicitely, maybe he can comment on it. If there are no side effect to dropping this exclude, you may do it (I really don't know enough of the build system of tomcat). Otherwise I can rename those directories so that it is not excluded. Just let me know. If I recall correctly, those directories are excluded because some IDEs use that name by default. If you could rename them that would be great. Not IDEs, but Maven. It writes its output into directories named target, in each of its modules. (I guess that is not configurable, grr...) See http://maven.apache.org/ref/3.0.3/maven-model/maven.html#class_build directory element. :P That is why target was present in .gitignore when it was first added, [1] http://svn.apache.org/viewvc?view=revisionrevision=1187740 This fault is a combination of mine [2] http://svn.apache.org/viewvc?view=revisionrevision=1204938 that applied patterns from gitignore to src distribution and of Sylvain's [3] http://svn.apache.org/viewvc?view=revisionrevision=1209731 when Sylvain removed that line from .gitignore and used that name in his commit. I am generally in favor of using more targeted patterns in dist-source target, (That is, comment out **/target/** for now, with a comment that we use that name, and add the same comment to .gitignore and later exclude more specific patterns when a need comes) but consider if one of developers used Maven to work on something in modules. Currently modules/jdbc-pool and modules/tomcat-lite have pom.xml, though svn:ignore property on those directories does not list target as excluded. Best regards, Konstantin Kolinko - 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