svn commit: r1230440 - /tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
Author: rjung
Date: Thu Jan 12 08:26:15 2012
New Revision: 1230440
URL: http://svn.apache.org/viewvc?rev=1230440&view=rev
Log:
Remove trailing spaces.
Modified:
tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1230440&r1=1230439&r2=1230440&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Thu Jan 12
08:26:15 2012
@@ -143,7 +143,7 @@ public class ParserUtils {
public static void setEntityResolver(EntityResolver er) {
entityResolver = er;
-}
+}
// -- Protected Methods
@@ -248,4 +248,4 @@ class MyErrorHandler implements ErrorHan
public void fatalError(SAXParseException ex) throws SAXException {
throw ex;
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer
https://issues.apache.org/bugzilla/show_bug.cgi?id=52328 --- Comment #15 from Nikolay Diakov 2012-01-12 10:01:51 UTC --- Regarding the artifact, we will test it. Do I understand correctly that this artifact contains a current 7.0.24 (candidate) + the fix? We will test this to the best of our procedure. For a clean cut (no noise from other stuff) relative performance measurement however, ideally we would have preferred to test a stable tag (e.g., 7.0.23) + the fix. Nevertheless, the degradation before showed quite a big number, so I expect to confirm a clear improvement from this fix. The fix is not critical for our product - we have a sufficiently good workaround, although the additional flushing fix will further improve the situation. I'll note to watch for the 7.0.24 so we update to it in a subsequent release of our product. -- 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 52328] Massive garbage production observed when using the response writer
https://issues.apache.org/bugzilla/show_bug.cgi?id=52328 --- Comment #16 from Mark Thomas 2012-01-12 10:09:04 UTC --- (In reply to comment #15) > Regarding the artifact, we will test it. Do I understand correctly that this > artifact contains a current 7.0.24 (candidate) + the fix? Correct. > We will test this to the best of our procedure. For a clean cut (no noise from > other stuff) relative performance measurement however, ideally we would have > preferred to test a stable tag (e.g., 7.0.23) + the fix. Nevertheless, the > degradation before showed quite a big number, so I expect to confirm a clear > improvement from this fix. Fair point. Reviewing the for 7.0.24 changelog, there are quite a few changes but none that jump out as having a performance impact so the results should be good enough. Let us know how you get on. -- 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 52458] New: Bug in JDT Eclipse Compiler ecj-3.7.jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=52458 Bug #: 52458 Summary: Bug in JDT Eclipse Compiler ecj-3.7.jar Product: Tomcat 7 Version: 7.0.21 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: ojoh...@abit.de Classification: Unclassified since tomcat can use the internal ecj-3.7.jar compiler some huge JSPs with are correct translated in a JAVA-File can´t translate in a class file. see my bug report https://bugs.eclipse.org/bugs/show_bug.cgi?id=368435 Olliver Johann -- 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 52263] static membership cluster fails to establish membership
https://issues.apache.org/bugzilla/show_bug.cgi?id=52263 --- Comment #1 from Mark Thomas 2012-01-12 11:58:56 UTC --- Created attachment 28146 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28146 Working static cluster config I just tested this with the latest 7.0.x code and as close to your server.xml as I can replicate and I see no issues since this works for me (confirmed by using the manager app to view replicated sessions). The Tomcat users list is the place to follow this up. Possible areas to investigate: - the use of autobind. I'd disable this. - network issues For completeness, I have included the server.xml from one of my cluster nodes. -- 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 52263] static membership cluster fails to establish membership
https://issues.apache.org/bugzilla/show_bug.cgi?id=52263 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME -- 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 52458] Bug in JDT Eclipse Compiler ecj-3.7.jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=52458 --- Comment #1 from Konstantin Kolinko 2012-01-12 12:59:15 UTC --- 1. This compiler optimization code bug seems to be triggered by large Java files. There are (and will always be) certain size limitations in the language. While this is not one of them, note that there are several options in JspServlet that change what java code is generated for a JSP. One of them may help you. 2. You can replace ecj-3.7.jar with any other version of that jar file. They all have the same API. There is already ecj-3.7.1 available, http://download.eclipse.org/eclipse/downloads/eclipse3x.php -> Latest Release -> 3.7.1 -> JDT Core Batch Compiler Though from the bug report it sounds like 3.7.1 would have the same problem. Older versions of ecj.jar are available from the archives there or from earlier Tomcat versions. -- 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 52459] New: tomcat-embedded distribution is missing tomcat-catalina-ha dependencies
https://issues.apache.org/bugzilla/show_bug.cgi?id=52459 Bug #: 52459 Summary: tomcat-embedded distribution is missing tomcat-catalina-ha dependencies Product: Tomcat 7 Version: 7.0.23 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Packaging AssignedTo: dev@tomcat.apache.org ReportedBy: bernd.hu...@orbiz.com Classification: Unclassified i want to use the latest "tomcat-embed" binary-distribution that can be downloaded on your page from http://tomcat.apache.org/download-70.cgi The following code has worked in tomcat-embed 7.0.16: Catalina catalina = new Catalina(); catalina.setAwait(true); catalina.setUseShutdownHook(true); catalina.load(); But with the current release 7.0.23 the code will bring the following error: Exception in thread "main" java.lang.NoClassDefFoundError: org/apache/catalina/ha/ClusterRuleSet at org.apache.catalina.startup.Catalina.createStartDigester(Catalina.java:375) at org.apache.catalina.startup.Catalina.load(Catalina.java:491) This is because the class "org.apache.catalina.startup.Catalina" has now a hardcoded dependency to the class "org.apache.catalina.ha.ClusterRuleSet" which is not provided within the "tomcat-embed" binary-distribution. -- 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 52458] Bug in JDT Eclipse Compiler ecj-3.7.jar
https://issues.apache.org/bugzilla/show_bug.cgi?id=52458 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #2 from Mark Thomas 2012-01-12 13:46:42 UTC --- Generally, we don't provide code workarounds for bugs in upstream components unless we see reports of significant issues in Tomcat that can't easily be worked around. Thanks for bringing this to our attention. We will keep an eye on it and use the suggested work-around if it becomes necessary but for now, I don't see anything we need to do here. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230539 - in /tomcat/trunk: build.properties.default res/ide-support/eclipse/eclipse.classpath
Author: markt
Date: Thu Jan 12 13:55:35 2012
New Revision: 1230539
URL: http://svn.apache.org/viewvc?rev=1230539&view=rev
Log:
Update to Eclipse JDT 3.7.1
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1230539&r1=1230538&r2=1230539&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jan 12 13:55:35 2012
@@ -120,8 +120,8 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
# - Eclipse JDT, version 3.2 or later -
-jdt.version=3.7
-jdt.release=R-3.7-201106131736
+jdt.version=3.7.1
+jdt.release=R-3.7.1-201109091335
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1230539&r1=1230538&r2=1230539&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Thu Jan 12 13:55:35
2012
@@ -25,6 +25,6 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230541 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default res/ide-support/eclipse/eclipse.classpath webapps/docs/changelog.xml
Author: markt Date: Thu Jan 12 13:59:30 2012 New Revision: 1230541 URL: http://svn.apache.org/viewvc?rev=1230541&view=rev Log: Update to JDT 3.7.1 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 13:59:30 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 +/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,116525
DO NOT REPLY [Bug 52459] tomcat-embedded distribution is missing tomcat-catalina-ha dependencies
https://issues.apache.org/bugzilla/show_bug.cgi?id=52459 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2012-01-12 14:00:45 UTC --- This has already been fixed in r1220296. -- 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 49159] Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159 --- Comment #19 from Torsten Krah 2012-01-12 14:24:58 UTC --- Does the tomcat6 patch getting applied to any 6.x version? Or is this one only there in 7.0.6+? -- 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
Just a slight note
Guys, I found this while reading an article on the market share of application servers. This is how well you guys are doing. To have a 50+% of the market share of the application servers of 1000 of the top publicly traded companies (Comcast, ABC, etc), Here is how it broke down. Just wanted to give you guys a kudos on doing a great job. I work in software, I know you hear about it when things are broken, but probably don't hear about it when things work very well. Keep up the good job! Here's the link to what I am talking about. And the domain is mine, it just points to the picture directly. http://realissuesforrealpeople.com/public_images/photo.JPG - Josh
DO NOT REPLY [Bug 49159] Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159 --- Comment #20 from Konstantin Kolinko 2012-01-12 15:21:11 UTC --- No. This enhancement is too intrusive to be backported. -- 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 52460] New: Unable to run signed .war files with security manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=52460 Bug #: 52460 Summary: Unable to run signed .war files with security manager Product: Tomcat 7 Version: 7.0.23 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: thomas.t...@oenb.at Classification: Unclassified Hi, I stumbled upon an issue when trying to run Tomcat 7.0.23 (presumably all Tomcat versions) with a security manager. I managed without any problems to create a servlet, pack it into a .war containing a signed .jar file and run it with a security manager. According to the final Java Servlet Specification (November 2009) the application directory structure of a .war the /WEB-INF/classes/ directory shall contain the application's .class files. /WEB-INF/lib/*.jar shall contain servlets, beans, static resources as well as other resources that are useful to the Web application. So in my understanding the .war shall contain my application code under /WEB-INF/classes/ while utility code shall be placed under /WEB-INF/lib/. Here is the problem: If I use this recommended way of files placement, it is impossible to run the application with a security manager properly. As the .class files reside under /WEB-INF/classes I can only sign the .war file. But this signature is not reflected in the security manager. Although the .war file (and also the .class files) is signed, the security manager is not provided with this information, making it impossible to create custom policies in catalina.policy. Is using signed jars the only way of running servlets with a security manager? Is this a JVM or a Tomcat bug? Thomas -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230646 - in /tomcat/maven-plugin/trunk: tomcat-maven-archetype/ tomcat7-war-runner/
Author: olamy Date: Thu Jan 12 17:13:32 2012 New Revision: 1230646 URL: http://svn.apache.org/viewvc?rev=1230646&view=rev Log: add basic svn:ignore Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/ (props changed) tomcat/maven-plugin/trunk/tomcat7-war-runner/ (props changed) Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/ -- --- svn:ignore (added) +++ svn:ignore Thu Jan 12 17:13:32 2012 @@ -0,0 +1,2 @@ +target +*.iml Propchange: tomcat/maven-plugin/trunk/tomcat7-war-runner/ -- --- svn:ignore (added) +++ svn:ignore Thu Jan 12 17:13:32 2012 @@ -0,0 +1,3 @@ +target +*.iml + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52440] Wrong getValueReference behaviour with Facelets parameter expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=52440 --- Comment #3 from Mark Thomas 2012-01-12 18:41:13 UTC --- I think I have this fixed but I'd like to confirm this with the test case. Please provide some details (the URL being the most important) of how this test case is meant to be used. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230711 - in /tomcat/trunk: java/org/apache/el/parser/AstIdentifier.java test/org/apache/el/TestValueExpressionImpl.java
Author: markt
Date: Thu Jan 12 19:33:17 2012
New Revision: 1230711
URL: http://svn.apache.org/viewvc?rev=1230711&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52440
Need to resolve EL variables when returning ValueReferences
Includes a new test case.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=1230711&r1=1230710&r2=1230711&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Thu Jan 12
19:33:17 2012
@@ -24,6 +24,7 @@ import javax.el.MethodInfo;
import javax.el.MethodNotFoundException;
import javax.el.PropertyNotFoundException;
import javax.el.ValueExpression;
+import javax.el.ValueReference;
import javax.el.VariableMapper;
import org.apache.el.lang.EvaluationContext;
@@ -135,6 +136,25 @@ public final class AstIdentifier extends
this.image = image;
}
+
+@Override
+public ValueReference getValueReference(EvaluationContext ctx) {
+VariableMapper varMapper = ctx.getVariableMapper();
+
+if (varMapper == null) {
+return null;
+}
+
+ValueExpression expr = varMapper.resolveVariable(this.image);
+
+if (expr == null) {
+return null;
+}
+
+return expr.getValueReference(ctx);
+}
+
+
private final MethodExpression getMethodExpression(EvaluationContext ctx)
throws ELException {
Object obj = null;
Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1230711&r1=1230710&r2=1230711&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Thu Jan 12
19:33:17 2012
@@ -64,6 +64,34 @@ public class TestValueExpressionImpl {
}
@Test
+public void testGetValueReferenceVariable() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+TesterBeanB beanB = new TesterBeanB();
+beanB.setName("Tomcat");
+ValueExpression var =
+factory.createValueExpression(beanB, TesterBeanB.class);
+context.getVariableMapper().setVariable("beanB", var);
+
+ValueExpression var2 = factory.createValueExpression(
+context, "${beanB.name}", String.class);
+
+context.getVariableMapper().setVariable("foo", var2);
+
+ValueExpression ve = factory.createValueExpression(
+context, "${foo}", ValueExpression.class);
+
+
+// Now check the value reference
+ValueReference vr = ve.getValueReference(context);
+assertNotNull(vr);
+
+assertEquals(beanB, vr.getBase());
+assertEquals("name", vr.getProperty());
+}
+
+@Test
public void testBug49345() {
ExpressionFactory factory = ExpressionFactory.newInstance();
ELContext context = new ELContextImpl();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230716 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstIdentifier.java test/org/apache/el/TestValueExpressionImpl.java webapps/docs/changelog.xml
Author: markt Date: Thu Jan 12 19:38:09 2012 New Revision: 1230716 URL: http://svn.apache.org/viewvc?rev=1230716&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52440 Need to resolve EL variables when returning ValueReferences Includes a new test case. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstIdentifier.java tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 19:38:09 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 +/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,11614
DO NOT REPLY [Bug 52440] Wrong getValueReference behaviour with Facelets parameter expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=52440 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2012-01-12 19:38:26 UTC --- Fixed based on the spec language for getValueReference() -- 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 52460] Unable to run signed .war files with security manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=52460 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2012-01-12 19:39:19 UTC --- Your understanding of the spec is incorrect. You can place application code in JARs in WEB-INF/lib. Please use the users mailing list if you have any further questions regarding this matter. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230729 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Thu Jan 12 19:47:52 2012
New Revision: 1230729
URL: http://svn.apache.org/viewvc?rev=1230729&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52245
Don't allow webapps to package javax.el classes
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1230729&r1=1230728&r2=1230729&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Jan
12 19:47:52 2012
@@ -189,7 +189,7 @@ public class WebappClassLoader
* earlier versions.
*/
protected static final String[] triggers = {
-"javax.servlet.Servlet" // Servlet API
+"javax.servlet.Servlet", "javax.el.Expression" // Servlet API
};
@@ -3296,6 +3296,10 @@ public class WebappClassLoader
// Web apps should never package any other Servlet or JSP classes
return false;
}
+if (name.startsWith("javax.el")) {
+// Must never load javax.el.* classes
+return false;
+}
// Assume everything else is OK
return true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230732 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt Date: Thu Jan 12 19:49:43 2012 New Revision: 1230732 URL: http://svn.apache.org/viewvc?rev=1230732&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52245 Don't allow webapps to package javax.el classes Patch provided by pid. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 19:49:43 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 +/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,116
DO NOT REPLY [Bug 52245] Add detection of EL Jar to WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=52245 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2012-01-12 19:49:45 UTC --- Thanks for the patch. Applied to trunk and 7.0.x and will be included in 7.0.24 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52134] HostConfig#deployDirectories Deploys Every Directory on Host ApplicationBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=52134 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID OS/Version||All --- Comment #1 from Mark Thomas 2012-01-12 19:51:31 UTC --- This is not possible. A web application deployed as a directory is not required to have a WEB-INF dir. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230761 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Author: markt
Date: Thu Jan 12 20:32:27 2012
New Revision: 1230761
URL: http://svn.apache.org/viewvc?rev=1230761&view=rev
Log:
Add some finals prompted by the UCDectector
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1230761&r1=1230760&r2=1230761&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jan 12
20:32:27 2012
@@ -144,10 +144,10 @@ public class Tomcat {
// created contexts. Can be replaced with setRealm() on
// the context.
protected Realm defaultRealm;
-private Map userPass = new HashMap();
-private Map> userRoles =
+private final Map userPass = new HashMap();
+private final Map> userRoles =
new HashMap>();
-private Map userPrincipals =
+private final Map userPrincipals =
new HashMap();
public Tomcat() {
@@ -639,7 +639,7 @@ public class Tomcat {
System.setProperty(Globals.CATALINA_BASE_PROP, basedir);
}
-static String[] silences = new String[] {
+static final String[] silences = new String[] {
"org.apache.coyote.http11.Http11Protocol",
"org.apache.catalina.core.StandardService",
"org.apache.catalina.core.StandardEngine",
@@ -816,7 +816,7 @@ public class Tomcat {
* more direct control over the servlet.
*/
public static class ExistingStandardWrapper extends StandardWrapper {
-private Servlet existing;
+private final Servlet existing;
boolean init = false;
@SuppressWarnings("deprecation")
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230762 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Author: markt
Date: Thu Jan 12 20:33:06 2012
New Revision: 1230762
URL: http://svn.apache.org/viewvc?rev=1230762&view=rev
Log:
Fix comment
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1230762&r1=1230761&r2=1230762&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Jan
12 20:33:06 2012
@@ -583,8 +583,7 @@ public class OutputBuffer extends Writer
public void reset() {
-// If a Writer wasbeing used, there may be unflushed bytes in the
-// convertor
+// If a Writer was being used, there may be bytes in the converter
if (gotEnc && conv != null) {
conv.recycle();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230763 - in /tomcat/trunk/java/org/apache/catalina/core: ContainerBase.java StandardContext.java
Author: markt
Date: Thu Jan 12 20:33:45 2012
New Revision: 1230763
URL: http://svn.apache.org/viewvc?rev=1230763&view=rev
Log:
Logger will not implement Lifecycle. This was a leftover from the
pre-JULI logger implementation.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1230763&r1=1230762&r2=1230763&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Jan 12
20:33:45 2012
@@ -1085,8 +1085,6 @@ public abstract class ContainerBase exte
((Lifecycle) loader).start();
logger = null;
getLogger();
-if ((logger != null) && (logger instanceof Lifecycle))
-((Lifecycle) logger).start();
if ((manager != null) && (manager instanceof Lifecycle))
((Lifecycle) manager).start();
if ((cluster != null) && (cluster instanceof Lifecycle))
@@ -1189,9 +1187,6 @@ public abstract class ContainerBase exte
((Lifecycle) manager).getState().isAvailable() ) {
((Lifecycle) manager).stop();
}
-if ((logger != null) && (logger instanceof Lifecycle)) {
-((Lifecycle) logger).stop();
-}
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1230763&r1=1230762&r2=1230763&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 12
20:33:45 2012
@@ -5037,12 +5037,10 @@ public class StandardContext extends Con
unbindThread(oldCCL);
oldCCL = bindThread();
-// Initialize logger again. Other components might have used
it too early,
-// so it should be reset.
+// Initialize logger again. Other components might have used it
+// too early, so it should be reset.
logger = null;
getLogger();
-if ((logger != null) && (logger instanceof Lifecycle))
-((Lifecycle) logger).start();
if ((cluster != null) && (cluster instanceof Lifecycle))
((Lifecycle) cluster).start();
@@ -5400,9 +5398,6 @@ public class StandardContext extends Con
if ((cluster != null) && (cluster instanceof Lifecycle)) {
((Lifecycle) cluster).stop();
}
-if ((logger != null) && (logger instanceof Lifecycle)) {
-((Lifecycle) logger).stop();
-}
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
@@ -5465,9 +5460,6 @@ public class StandardContext extends Con
if ((cluster != null) && (cluster instanceof Lifecycle)) {
((Lifecycle) cluster).destroy();
}
-if ((logger != null) && (logger instanceof Lifecycle)) {
-((Lifecycle) logger).destroy();
-}
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).destroy();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230765 - in /tomcat/trunk/java/org/apache/catalina/core: ContainerBase.java StandardContext.java
Author: markt
Date: Thu Jan 12 20:34:24 2012
New Revision: 1230765
URL: http://svn.apache.org/viewvc?rev=1230765&view=rev
Log:
Move destruction of ContainerBase objects to ContainerBase to ensure
that they are destroyed.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1230765&r1=1230764&r2=1230765&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Jan 12
20:34:24 2012
@@ -1195,6 +1195,20 @@ public abstract class ContainerBase exte
@Override
protected void destroyInternal() throws LifecycleException {
+if ((manager != null) && (manager instanceof Lifecycle)) {
+((Lifecycle) manager).destroy();
+}
+Realm realm = getRealmInternal();
+if ((realm != null) && (realm instanceof Lifecycle)) {
+((Lifecycle) realm).destroy();
+}
+if ((cluster != null) && (cluster instanceof Lifecycle)) {
+((Lifecycle) cluster).destroy();
+}
+if ((loader != null) && (loader instanceof Lifecycle)) {
+((Lifecycle) loader).destroy();
+}
+
// Stop the Valves in our pipeline (including the basic), if any
if (pipeline instanceof Lifecycle) {
((Lifecycle) pipeline).destroy();
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1230765&r1=1230764&r2=1230765&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 12
20:34:24 2012
@@ -5450,20 +5450,6 @@ public class StandardContext extends Con
@Override
protected void destroyInternal() throws LifecycleException {
-if ((manager != null) && (manager instanceof Lifecycle)) {
-((Lifecycle) manager).destroy();
-}
-Realm realm = getRealmInternal();
-if ((realm != null) && (realm instanceof Lifecycle)) {
-((Lifecycle) realm).destroy();
-}
-if ((cluster != null) && (cluster instanceof Lifecycle)) {
-((Lifecycle) cluster).destroy();
-}
-if ((loader != null) && (loader instanceof Lifecycle)) {
-((Lifecycle) loader).destroy();
-}
-
// If in state NEW when destroy is called, the object name will never
// have been set so the notification can't be created
if (getObjectName() != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52461] New: java.lang.IllegalArgumentException: URI scheme is not "file" is thrown in ContextConfig.getDefaultWebXmlFragment
https://issues.apache.org/bugzilla/show_bug.cgi?id=52461
Bug #: 52461
Summary: java.lang.IllegalArgumentException: URI scheme is not
"file" is thrown in
ContextConfig.getDefaultWebXmlFragment
Product: Tomcat 7
Version: 7.0.23
Platform: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: violet...@apache.org
Classification: Unclassified
Hello,
I have a project that embeds Apache Tomcat in OSGi. I provide the default
web.xml from my bundles (jar files) directly; I do not provide it in a separate
folder on the file system.
I am using Apache Tomcat 7.0.21, but now I want to migrate to Apache Tomcat
7.0.23.
Unfortunately there is a change between these two versions and with Apache
Tomcat 7.0.23 the following exception is thrown:
Caused by: java.lang.IllegalArgumentException: URI scheme is not "file"
at java.io.File.(File.java:366)
at
org.apache.catalina.startup.ContextConfig.getDefaultWebXmlFragment(ContextConfig.java:1317)
at
org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1168)
at
org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:828)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:302)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5148)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
... 71 more|
In OSGi environment URI scheme is not "file", but "bundleresource".
The call "globalWebXml.getSystemId()" in OSGi environment returns
"bundleresource://94.fwk2102834054/conf/web.xml"
I would like to propose a change (below) in
ContextConfig.getDefaultWebXmlFragment() method because there is no guarantee
that the URI scheme will always be "file". The patch is made against 7.0.x
trunc.
I’m looking forward to your comments.
Best Regards
Violeta Georgieva
Patch proposal:
Index: ContextConfig.java
===
--- ContextConfig.java(revision 1230565)
+++ ContextConfig.java(working copy)
@@ -29,7 +29,6 @@
import java.io.UnsupportedEncodingException;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
@@ -1324,20 +1323,24 @@
if (globalWebXml != null) {
try {
-File f = new File(new URI(globalWebXml.getSystemId()));
-globalTimeStamp = f.lastModified();
-} catch (URISyntaxException e) {
+URL f = new URL(globalWebXml.getSystemId());
+globalTimeStamp = f.openConnection().getLastModified();
+} catch (MalformedURLException e) {
globalTimeStamp = -1;
-}
+} catch (IOException e) {
+globalTimeStamp = -1;
+}
}
if (hostWebXml != null) {
try {
-File f = new File(new URI(hostWebXml.getSystemId()));
-hostTimeStamp = f.lastModified();
-} catch (URISyntaxException e) {
+URL f = new URL(hostWebXml.getSystemId());
+hostTimeStamp = f.openConnection().getLastModified();
+} catch (MalformedURLException e) {
hostTimeStamp = -1;
-}
+} catch (IOException e) {
+globalTimeStamp = -1;
+}
}
if (entry != null && entry.getGlobalTimeStamp() == globalTimeStamp &&
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1230766 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java
Author: markt Date: Thu Jan 12 20:35:07 2012 New Revision: 1230766 URL: http://svn.apache.org/viewvc?rev=1230766&view=rev Log: Fix comment Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 20:35:07 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 +/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-1
svn commit: r1230767 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/mbeans/TestRegistration.java
Author: markt
Date: Thu Jan 12 20:35:19 2012
New Revision: 1230767
URL: http://svn.apache.org/viewvc?rev=1230767&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52443
Move the default Realm for the embedded case to the Engine
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1230767&r1=1230766&r2=1230767&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jan 12
20:35:19 2012
@@ -98,9 +98,9 @@ import org.apache.catalina.realm.RealmBa
* In complex cases, you may prefer to use the ordinary Tomcat API to create
* webapp contexts; for example, you might need to install a custom Loader
* before the call to {@link Host#addChild(Container)}. To replicate the basic
- * behavior of the addWebapp methods, you may want to call three
- * methods of this class: {@link #getDefaultRealm()},
- * {@link #noDefaultWebXmlPath()}, and {@link #getDefaultWebXmlListener()}.
+ * behavior of the addWebapp methods, you may want to call two
+ * methods of this class: {@link #noDefaultWebXmlPath()} and
+ * {@link #getDefaultWebXmlListener()}.
*
* {@link #getDefaultRealm()} returns the simple security realm.
*
@@ -140,10 +140,6 @@ public class Tomcat {
protected String hostname = "localhost";
protected String basedir;
-// Default in-memory realm, will be set by default on
-// created contexts. Can be replaced with setRealm() on
-// the context.
-protected Realm defaultRealm;
private final Map userPass = new HashMap();
private final Map> userRoles =
new HashMap>();
@@ -441,17 +437,6 @@ public class Tomcat {
}
/**
- * Set a custom realm for auth. If not called, a simple
- * default will be used, using an internal map.
- *
- * Must be called before adding a context.
- */
-public void setDefaultRealm(Realm realm) {
-defaultRealm = realm;
-}
-
-
-/**
* Access to the engine, for further customization.
*/
public Engine getEngine() {
@@ -460,6 +445,7 @@ public class Tomcat {
engine = new StandardEngine();
engine.setName( "Tomcat" );
engine.setDefaultHost(hostname);
+engine.setRealm(createDefaultRealm());
service.setContainer(engine);
}
return engine;
@@ -520,11 +506,6 @@ public class Tomcat {
ctx.setName(name);
ctx.setPath(url);
ctx.setDocBase(path);
-if (defaultRealm == null) {
-initSimpleAuth();
-}
-ctx.setRealm(defaultRealm);
-
ctx.addLifecycleListener(new DefaultWebXmlListener());
ContextConfig ctxCfg = new ContextConfig();
@@ -563,27 +544,16 @@ public class Tomcat {
return Constants.NoDefaultWebXml;
}
-/**
- * For complex configurations, this accessor allows callers of this class
- * to obtain the simple realm created by default.
- * @return the simple in-memory realm created by default.
- */
-public Realm getDefaultRealm() {
-if (defaultRealm == null) {
-initSimpleAuth();
-}
-return defaultRealm;
-}
-
-
// -- Helper methods and classes ---
/**
- * Initialize an in-memory realm. You can replace it
- * for contexts with a real one.
+ * Create an in-memory realm. You can replace it for contexts with a real
+ * one. The Realm created here will be added to the Engine by default and
+ * may be replaced at the Engine level or over-ridden (as per normal Tomcat
+ * behaviour) at the Host or Context level.
*/
-protected void initSimpleAuth() {
-defaultRealm = new RealmBase() {
+protected Realm createDefaultRealm() {
+return new RealmBase() {
@Override
protected String getName() {
return "Simple";
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1230767&r1=1230766&r2=1230767&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Thu Jan
12 20:35:19 2012
@@ -63,6 +63,7 @@ public class TestRegistration extends To
private static String[] basicMBeanNames() {
return new String[] {
"Tomcat:type=Engine",
+"Tomcat:type=Realm,realmPath=/realm0",
svn commit: r1230768 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java java/org/apache/catalina/core/StandardContext.java
Author: markt Date: Thu Jan 12 20:36:57 2012 New Revision: 1230768 URL: http://svn.apache.org/viewvc?rev=1230768&view=rev Log: Code clean-up Logger will not implement Lifecycle. This was a leftover from the pre-JULI logger implementation. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 20:36:57 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 +/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,11627
svn commit: r1230771 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ContainerBase.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt Date: Thu Jan 12 20:41:17 2012 New Revision: 1230771 URL: http://svn.apache.org/viewvc?rev=1230771&view=rev Log: Move destruction of ContainerBase objects to ContainerBase to ensure that they are destroyed. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 12 20:41:17 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 +/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,116
svn commit: r1230777 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/mbeans/TestRegistration.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 12 20:51:10 2012
New Revision: 1230777
URL: http://svn.apache.org/viewvc?rev=1230777&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52443
Move the default Realm for the embedded case to the Engine
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1230777&r1=1230776&r2=1230777&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jan
12 20:51:10 2012
@@ -98,9 +98,9 @@ import org.apache.catalina.realm.RealmBa
* In complex cases, you may prefer to use the ordinary Tomcat API to create
* webapp contexts; for example, you might need to install a custom Loader
* before the call to {@link Host#addChild(Container)}. To replicate the basic
- * behavior of the addWebapp methods, you may want to call three
- * methods of this class: {@link #getDefaultRealm()},
- * {@link #noDefaultWebXmlPath()}, and {@link #getDefaultWebXmlListener()}.
+ * behavior of the addWebapp methods, you may want to call two
+ * methods of this class: {@link #noDefaultWebXmlPath()} and
+ * {@link #getDefaultWebXmlListener()}.
*
* {@link #getDefaultRealm()} returns the simple security realm.
*
@@ -140,9 +140,9 @@ public class Tomcat {
protected String hostname = "localhost";
protected String basedir;
-// Default in-memory realm, will be set by default on
-// created contexts. Can be replaced with setRealm() on
-// the context.
+// Default in-memory realm, will be set by default on the Engine. Can be
+// replaced at engine level or over-ridden at Host or Context level
+@Deprecated // Will be removed in Tomcat 8.0.x.
protected Realm defaultRealm;
private Map userPass = new HashMap();
private Map> userRoles =
@@ -445,7 +445,10 @@ public class Tomcat {
* default will be used, using an internal map.
*
* Must be called before adding a context.
+ *
+ * @deprecated Will be removed in Tomcat 8.0.x.
*/
+@Deprecated
public void setDefaultRealm(Realm realm) {
defaultRealm = realm;
}
@@ -460,6 +463,10 @@ public class Tomcat {
engine = new StandardEngine();
engine.setName( "Tomcat" );
engine.setDefaultHost(hostname);
+if (defaultRealm == null) {
+initSimpleAuth();
+}
+engine.setRealm(defaultRealm);
service.setContainer(engine);
}
return engine;
@@ -520,10 +527,6 @@ public class Tomcat {
ctx.setName(name);
ctx.setPath(url);
ctx.setDocBase(path);
-if (defaultRealm == null) {
-initSimpleAuth();
-}
-ctx.setRealm(defaultRealm);
ctx.addLifecycleListener(new DefaultWebXmlListener());
@@ -567,7 +570,9 @@ public class Tomcat {
* For complex configurations, this accessor allows callers of this class
* to obtain the simple realm created by default.
* @return the simple in-memory realm created by default.
+ * @deprecated Will be removed in Tomcat 8.0.x
*/
+@Deprecated
public Realm getDefaultRealm() {
if (defaultRealm == null) {
initSimpleAuth();
@@ -579,9 +584,13 @@ public class Tomcat {
// -- Helper methods and classes ---
/**
- * Initialize an in-memory realm. You can replace it
- * for contexts with a real one.
+ * Create an in-memory realm. You can replace it for contexts with a real
+ * one. The Realm created here will be added to the Engine by default and
+ * may be replaced at the Engine level or over-ridden (as per normal Tomcat
+ * behaviour) at the Host or Context level.
+ * @deprecated Will be removed in Tomcat 8.0.x
*/
+@Deprecated
protected void initSimpleAuth() {
defaultRealm = new RealmBase() {
@Override
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1230777&r1=1230776&r2=1230777&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Thu Jan 12 20:51:10 2012
@@ -63,6 +63,7 @@ public class TestRegistration extends To
private stati
DO NOT REPLY [Bug 52443] Tomcat#defaultRealm shares Realm instance between web applications, resulting in INFO log message from lifecycle
https://issues.apache.org/bugzilla/show_bug.cgi?id=52443 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2012-01-12 20:51:28 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Tomcat 5.5.35 Build
The below makes three... I'll wait another day and release tomorrow (Friday) On Jan 6, 2012, at 3:19 PM, Jim Jagielski wrote: > The builds for Tomcat 5.5.35 are ready for testing and approval. > The candidates binaries are available here: > > http://people.apache.org/~jim/tomcat-5.5/ > > According to the release process, the 5.5.35 build corresponding to the > tag TOMCAT_5_5_35 [1] is: > > [ ] Broken > [ ] Alpha > [ ] Beta > [X] Stable > +++ > > 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_35/ > > - > 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 52381] Please add OSGi metadata
https://issues.apache.org/bugzilla/show_bug.cgi?id=52381 --- Comment #5 from violet...@apache.org 2012-01-12 21:49:43 UTC --- Hello, In Eclipse Virgo we add OSGi metadata using Bundlor. The process is pretty straightforward and we have projects that do that stuff. Unfortunately we do not add OSGi metadata for every Apache Tomcat release but only for those that we include in Eclipse Virgo. The artifacts are available through EBR. Here they are: http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.catalina&version=7.0.23&searchType=bundlesByName&searchQuery=catalina http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.catalina.ha&version=7.0.23&searchType=bundlesByName&searchQuery=catalina http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.catalina.tribes&version=7.0.23&searchType=bundlesByName&searchQuery=catalina http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.coyote&version=7.0.23&searchType=bundlesByName&searchQuery=coyote http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.jasper&version=7.0.23&searchType=bundlesByName&searchQuery=jasper http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.el&version=7.0.23&searchType=bundlesBySymbolicName&searchQuery=org.apache.el http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.juli.extras&version=7.0.23&searchType=bundlesBySymbolicName&searchQuery=juli http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.tomcat.api&version=7.0.23&searchType=bundlesBySymbolicName&searchQuery=org.apache.tomcat http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.org.apache.tomcat.util&version=7.0.23&searchType=bundlesBySymbolicName&searchQuery=org.apache.tomcat Best Regards Violeta Georgieva -- 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 52381] Please add OSGi metadata
https://issues.apache.org/bugzilla/show_bug.cgi?id=52381 violet...@apache.org changed: What|Removed |Added CC||violet...@apache.org -- 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: problem using default Realm in new unit tests
On 10/01/12 13:21, Brian Burch wrote: Konstantin, Thank you for your prompt and helpful response... at least I know I haven't overlooked something simple. With your encouragement, I'm happy to keep "fighting the alligators until I can get back to draining the swamp"! I am working on this issue in my spare time while on holiday in Australia. I was testing a local fix yesterday which inserted the default MemoryRealm into the StandardEngine. I decided to go to bed and email my proposed change in the morning. While I was sleeping, Mark committed r1230777 (and r1230767), which is very similar to mine, but was more bold. I was nervous (through ignorance) about the consequences for the standalone and embedded cases. I have now reworked my new unit tests to work with Mark's change (they no longer need to explicitly trigger assignment of the default MemoryRealm), and they all run successfully. I will submit them soon. Sorry to keep this topic open, but I have some outstanding questions following Mark's change, so perhaps someone could spare the time to answer them for me? Tomcat.getEngine has not changed its overall behaviour: it creates the Engine when it doesn't already exist. However, it now also creates and assigns the default MemoryRealm to the new StandardEngine instance. I can see the StandardEngine constructor is also called in both the MBeanFactory and Embedded classes. MBeanFactory, at first glance, seems to set the Realm on request, but not define a default for the Engine. The Embedded constructors will either explicitly set a Realm, or leave it uninitialised. If this observation is correct, then there are real cases where the Engine can be created without a default realm, in which case StandardEngine will create a default JAASRealm as soon as the getRealm method is called. This JAASRealm MUST be properly configured in the jvm if an Exception is to be avoided. Is it still meaningful to let the StandardEngine establish a default JAASRealm in getRealm under these circumstances, or would it be more consistent to use a default MemoryRealm? Anyone who wants to use a JAASRealm would surely have to configure it, so isn't it is a bit lazy to rely on implicit assignment. Surely these users would (should) explicitly define the JAASRealm in Embedded or MBeanFactory? Perhaps the logic in StandardEngine.getRealm to catch these special cases and create a default JAASRealm is redundant? Thanks, Brian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: problem using default Realm in new unit tests
Brian Burch wrote: >On 10/01/12 13:21, Brian Burch wrote: >Tomcat.getEngine has not changed its overall behaviour: it creates the >Engine when it doesn't already exist. However, it now also creates and >assigns the default MemoryRealm to the new StandardEngine instance. It isn't the MemoryRealm but a simplified version of it. >I can see the StandardEngine constructor is also called in both the >MBeanFactory and Embedded classes. MBeanFactory, at first glance, seems > >to set the Realm on request, but not define a default for the Engine. >The Embedded constructors will either explicitly set a Realm, or leave >it uninitialised. > >If this observation is correct, then there are real cases where the >Engine can be created without a default realm, in which case >StandardEngine will create a default JAASRealm as soon as the getRealm >method is called. This JAASRealm MUST be properly configured in the jvm > >if an Exception is to be avoided. > >Is it still meaningful to let the StandardEngine establish a default >JAASRealm in getRealm under these circumstances, or would it be more >consistent to use a default MemoryRealm? Anyone who wants to use a >JAASRealm would surely have to configure it, so isn't it is a bit lazy >to rely on implicit assignment. Surely these users would (should) >explicitly define the JAASRealm in Embedded or MBeanFactory? > >Perhaps the logic in StandardEngine.getRealm to catch these special >cases and create a default JAASRealm is redundant? My preference is to create a new NullRealm (with a better name) that always fails authentication and is used in place of the JAAS realm as a default for the engine. Mark > >Thanks, > >Brian > >- >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
