[Bug 54571] Race condition when handling comet event in thread other than the serving servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=54571 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas --- This looks like an application problem. As the Comet docs state, the Response object is not thread safe. By using a separate thread to write to the response you have multiple threads (the original request processing thread and your processing thread) using the object at the same time. It is not surprising that strange behaviour is observed. -- 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
[Bug 54571] Race condition when handling comet event in thread other than the serving servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=54571
David Wang changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|INVALID |---
--- Comment #3 from David Wang ---
(In reply to comment #2)
> This looks like an application problem.
>
> As the Comet docs state, the Response object is not thread safe.
>
> By using a separate thread to write to the response you have multiple
> threads (the original request processing thread and your processing thread)
> using the object at the same time. It is not surprising that strange
> behaviour is observed.
But the demo code for comet on tomcat webpage has similar logic
http://tomcat.apache.org/tomcat-6.0-doc/aio.html
Servelet thread:
-
if (event.getEventType() == CometEvent.EventType.BEGIN) {
log("Begin for session: " + request.getSession(true).getId());
PrintWriter writer = response.getWriter();
writer.println("");
writer.println("JSP Chat");
writer.flush();
synchronized(connections) {
connections.add(response);
}
Other thread:
for (int i = 0; i < connections.size(); i++) {
try {
PrintWriter writer =
connections.get(i).getWriter();
for (int j = 0; j < pendingMessages.length; j++) {
writer.println(pendingMessages[j] + "");
}
writer.flush();
} catch (IOException e) {
log("IOExeption sending message", e);
}
}
--
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
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581269#comment-13581269 ] Richard commented on MTOMCAT-208: - This should only affect the tomcat7-maven-plugin, I don't think tomcat6 supports embedding. > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat6, tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-208: --- Component/s: (was: tomcat6) > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54571] Race condition when handling comet event in thread other than the serving servlet
https://issues.apache.org/bugzilla/show_bug.cgi?id=54571 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #4 from Mark Thomas --- Similar, but significantly different. The demo code uses flush() and does not close the writer on a different thread in the BEGIN event. Something you might like to try is making the closed field in org.apache.catalina.connector.OutputBuffer volatile. If that fixes the issue we can look at including that change. -- 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
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581300#comment-13581300 ] Tim Astle commented on MTOMCAT-208: --- [~rmcaleer], did you confirm that the patch works for you? > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581310#comment-13581310 ] Olivier Lamy (*$^¨%`£) commented on MTOMCAT-208: AFAIK tomcat6 support embedding too. > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Issue Comment Deleted] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-208: --- Comment: was deleted (was: AFAIK tomcat6 support embedding too. ) > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447735 - /tomcat/maven-plugin/trunk/README.txt
Author: olamy Date: Tue Feb 19 14:37:17 2013 New Revision: 1447735 URL: http://svn.apache.org/r1447735 Log: [MTOMCAT-208] JaCoCo instrumentation errors when running StandaloneWarMojo Submitted by Tim Astle. Modified: tomcat/maven-plugin/trunk/README.txt Modified: tomcat/maven-plugin/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/README.txt?rev=1447735&r1=1447734&r2=1447735&view=diff == --- tomcat/maven-plugin/trunk/README.txt (original) +++ tomcat/maven-plugin/trunk/README.txt Tue Feb 19 14:37:17 2013 @@ -3,7 +3,7 @@ Build Apache Tomcat Maven Plugin To build this project you must Apache Maven at least 2.2.1 . mvn clean install will install the mojos without running integration tests. As there are some hardcoded integration tests with http port 1973, ajp 2001 and 2008, you could have some port allocation issues (if you don't know why those values ask olamy :-) ) -mvn clean install -Prun-its will run integration tests too: to override the default used htpp port you can use -Dits.http.port= -Dits.ajp.port= +mvn clean install -Prun-its will run integration tests too: to override the default used http port you can use -Dits.http.port= -Dits.ajp.port= Snapshots deployment - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447737 - in /tomcat/maven-plugin/trunk: pom.xml tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
Author: olamy
Date: Tue Feb 19 14:37:34 2013
New Revision: 1447737
URL: http://svn.apache.org/r1447737
Log:
add contributor
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
(with props)
Modified:
tomcat/maven-plugin/trunk/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1447737&r1=1447736&r2=1447737&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Feb 19 14:37:34 2013
@@ -145,6 +145,9 @@
Ludwig Magnusson
+
+ Tim Astle
+
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java?rev=1447737&view=auto
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
Tue Feb 19 14:37:34 2013
@@ -0,0 +1,33 @@
+package org.apache.tomcat.maven.plugin.tomcat7.run;
+/*
+ * 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.
+ */
+
+import org.apache.maven.plugins.annotations.Mojo;
+
+/**
+ * This Mojo will create an executable war file with embedded Tomcat that is
also capable of being deployed elsewhere.
+ *
+ * @since 2.1
+ */
+@Mojo(name = "standalone-war-only")
+public class StandaloneWarOnlyMojo
+extends AbstractStandaloneWarMojo
+{
+// no op
+}
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/StandaloneWarOnlyMojo.java
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581319#comment-13581319 ] Richard commented on MTOMCAT-208: - Yeah, I tested it out and it's working properly. > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-208. -- Resolution: Fixed patch applied. Thanks ! > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-158) WAR Overlay Does Not Include Resources
[ https://issues.apache.org/jira/browse/MTOMCAT-158?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) updated MTOMCAT-158: --- Fix Version/s: (was: 2.1) 2.2 > WAR Overlay Does Not Include Resources > -- > > Key: MTOMCAT-158 > URL: https://issues.apache.org/jira/browse/MTOMCAT-158 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat6, tomcat7 >Affects Versions: 2.0 >Reporter: Robert Hollencamp >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.2 > > Attachments: MTOMCAT-158-1.diff > > > When running tomcat[67]:run on a web application that includes WAR overlays, > static resources in those WAR overlays are not seen by the spawned tomcat > server. > Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin) > and CLASS files are added to the classpath. > WAR overlays can also contain static resources, like JSP, CSS, JS, etc. > Tomcat needs to be aware of these resources -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447747 [10/24] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it/dependencies.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Integration Tests - Project Dependencies @@ -156,7 +156,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 | Version: 2.1-SNAPSHOT @@ -183,13 +183,13 @@ } } -Dependency Treeorg.apache.tomcat.maven:tomcat-maven-plugin-it:jar:2.1-SNAPSHOT Apache Tomcat Maven Plugin :: Integration TestsDescription: The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet -container.URL: http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it";>http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-itProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0junit:junit:jar:4.10 (compile) JUnitDescription: JUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java.URL: http://junit.org";>http://junit.orgProject License: http://www.opensource.org/licenses/cpl1.0.txt";>Common Public License Version 1.0org.hamcrest:hamcrest-core:jar:1.1 (compile) Hamcrest CoreDescription: There is currently no description associated with this project.Project License: http://www.opensource.org/licenses/bsd-license.php";>BSD styleju nit-addons:junit-addons:jar:1.4 (compile) junit-addonsDescription: There is currently no description associated with this project.Project License: No license is defined for this project.xerces:xercesImpl:jar:2.6.2 (compile) xercesImplDescription: There is currently no description associated with this project.Project License: No license is defined for this project.xerces:xmlParserAPIs:jar:2.6.2 (compile) xmlParserAPIsDescription: There is currently no description associated with this project.Project License: No license is defined for this project.org.apache.maven.shared:maven-verifier:jar:1.3 (compile) Maven Verifier ComponentDescription: Provides a test harness for Maven integration tests.URL: http://maven.apache.org/shared/maven-verifier/";>http://maven.apache.org/shared/maven-verifier/Project License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0org.apache.httpcomponents:httpclient:jar:4.2-alpha1 (compile) HttpClientDescri ption: HttpComponents Client (base module)URL: http://hc.apache.org/httpcomponents-client";>http://hc.apache.org/httpcomponents-clientProject License: Apache Licenseorg.apache.httpcomponents:httpcore:jar:4.2-alpha2 (compile) HttpCoreDescription: HttpComponents Core (blocking I/O)URL: http://hc.apache.org/httpcomponents-core-ga";>http://hc.apache.org/httpcomponents-core-gaProject License: Apache Licensecommons-logging:commons-logging:jar:1.1.1 (compile) Commons LoggingDescription: Commons Logging is a thin adapter allowing configurable bridging to other, -well known logging systems.URL: http://commons.apache.org/logging";>http://commons.apache.org/loggingProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0commons-codec:commons-codec:jar:1.6 (compile) Commons CodecDescription: The codec package contains simple encoder and decoders for +Dependency Treeorg.apache.tomcat.maven:tomcat-maven-plugin-it:jar:2.1-SNAPSHOT Apache Tomcat Maven Plugin :: Integration TestsDescription: The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet +container.URL: http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-it";>http://tomcat.apache.org/maven-plugin-2.1-SNAPSHOT/tomcat-maven-plugin-itProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0junit:junit:jar:4.10 (compile) JUnitDescription: JUnit is a regression testing framework written by Erich Gamma and Kent Beck. +It is used by the developer who implements unit tests in Java.URL: http://junit.org";>http://junit.orgProject License: http://www.opensource.org/licenses/cpl1.0.txt";>Common Public License Version 1.0org.hamcrest:hamcrest-core:jar:1.1 (compile) Hamcrest CoreDescription: There i
svn commit: r1447747 [16/24] - in /tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT: ./ apidocs/ apidocs/org/apache/tomcat/maven/common/deployer/class-use/ apidocs/org/apache/tomcat/maven/plugin/tomca
Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/roles-mojo.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:roles @@ -213,7 +213,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 | Version: 2.1-SNAPSHOT Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-mojo.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:run @@ -213,7 +213,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 | Version: 2.1-SNAPSHOT Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-mojo.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:run-war @@ -213,7 +213,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 | Version: 2.1-SNAPSHOT Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-only-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-only-mojo.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-only-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/run-war-only-mojo.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:run-war-only @@ -213,7 +213,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 | Version: 2.1-SNAPSHOT Modified: tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/sessions-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/sessions-mojo.html?rev=1447747&r1=1447746&r2=1447747&view=diff == --- tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/sessions-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-2.1-SNAPSHOT/tomcat6-maven-plugin/sessions-mojo.html Tue Feb 19 15:01:43 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:sessions @@ -213,7 +213,7 @@ - Last Published: 02 February 2013 | + Last Published: 19 February 2013 |
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581337#comment-13581337 ] Tim Astle commented on MTOMCAT-208: --- And many thanks to you Olivier for applying this so quickly! Cheers! > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53871] java.lang.StackOverflowError on deploying a web application
https://issues.apache.org/bugzilla/show_bug.cgi?id=53871 --- Comment #14 from Mark Thomas --- I'll see what I can do to add some class and/or JAR information to the error message. -- 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: r1447791 - in /tomcat/trunk/java/org/apache/catalina/startup: ContextConfig.java LocalStrings.properties
Author: markt
Date: Tue Feb 19 16:20:32 2013
New Revision: 1447791
URL: http://svn.apache.org/r1447791
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53871
Add the class hierarchy that triggered the StackOverflowError to the error
message to aid debugging.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1447791&r1=1447790&r2=1447791&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Feb 19
16:20:32 2013
@@ -1958,13 +1958,7 @@ public class ContextConfig implements Li
ClassParser parser = new ClassParser(is, null);
JavaClass clazz = parser.parse();
-try {
-checkHandlesTypes(clazz);
-} catch (StackOverflowError soe) {
-throw new IllegalStateException(sm.getString(
-"contextConfig.annotationsStackOverflow",
-context.getName()), soe);
-}
+checkHandlesTypes(clazz);
if (handlesTypesOnly) {
return;
@@ -2015,7 +2009,14 @@ public class ContextConfig implements Li
populateJavaClassCache(className, javaClass);
JavaClassCacheEntry entry = javaClassCache.get(className);
if (entry.getSciSet() == null) {
-populateSCIsForCacheEntry(entry);
+try {
+populateSCIsForCacheEntry(entry);
+} catch (StackOverflowError soe) {
+throw new IllegalStateException(sm.getString(
+"contextConfig.annotationsStackOverflow",
+context.getName(),
+classHierarchyToString(className, entry)));
+}
}
if (entry.getSciSet().size() > 0) {
// Need to try and load the class
@@ -2067,6 +2068,30 @@ public class ContextConfig implements Li
}
+private String classHierarchyToString(String className,
+JavaClassCacheEntry entry) {
+JavaClassCacheEntry start = entry;
+StringBuilder msg = new StringBuilder(className);
+msg.append("->");
+
+String parentName = entry.getSuperclassName();
+JavaClassCacheEntry parent = javaClassCache.get(parentName);
+int count = 0;
+
+while (count < 100 && parent != null && parent != start) {
+msg.append(parentName);
+msg.append("->");
+
+count ++;
+parentName = parent.getSuperclassName();
+parent = javaClassCache.get(parentName);
+}
+
+msg.append(parentName);
+
+return msg.toString();
+}
+
private void populateJavaClassCache(String className, JavaClass javaClass)
{
if (javaClassCache.containsKey(className)) {
return;
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1447791&r1=1447790&r2=1447791&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Feb 19 16:20:32 2013
@@ -18,7 +18,7 @@ catalina.noCluster=Cluster RuleSet not f
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
-contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}]. Possible root causes include a too low
setting for -Xss and illegal cyclic inheritance dependencies
+contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}] due to a StackOverflowError. Possible
root causes include a too low setting for -Xss and illegal cyclic inheritance
dependencies. The class hierarchy being processed was [{1}]
contextConfig.applicationUrl=Unable to determine URL for application web.xml
contextConfig.applicationMissing=Missing application web.xml, using defaults
only
contextConfig.applicationParse=Parse error in application web.xml file at {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447792 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Tue Feb 19 16:24:02 2013
New Revision: 1447792
URL: http://svn.apache.org/r1447792
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53871
Add the class hierarchy that triggered the StackOverflowError to the error
message to aid debugging.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1447791
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1447792&r1=1447791&r2=1447792&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue Feb 19 16:24:02 2013
@@ -2103,13 +2103,7 @@ public class ContextConfig implements Li
ClassParser parser = new ClassParser(is, null);
JavaClass clazz = parser.parse();
-try {
-checkHandlesTypes(clazz);
-} catch (StackOverflowError soe) {
-throw new IllegalStateException(sm.getString(
-"contextConfig.annotationsStackOverflow",
-context.getName()), soe);
-}
+checkHandlesTypes(clazz);
if (handlesTypesOnly) {
return;
@@ -2159,7 +2153,14 @@ public class ContextConfig implements Li
populateJavaClassCache(className, javaClass);
JavaClassCacheEntry entry = javaClassCache.get(className);
if (entry.getSciSet() == null) {
-populateSCIsForCacheEntry(entry);
+try {
+populateSCIsForCacheEntry(entry);
+} catch (StackOverflowError soe) {
+throw new IllegalStateException(sm.getString(
+"contextConfig.annotationsStackOverflow",
+context.getName(),
+classHierarchyToString(className, entry)));
+}
}
if (entry.getSciSet().size() > 0) {
// Need to try and load the class
@@ -2211,6 +2212,30 @@ public class ContextConfig implements Li
}
+private String classHierarchyToString(String className,
+JavaClassCacheEntry entry) {
+JavaClassCacheEntry start = entry;
+StringBuilder msg = new StringBuilder(className);
+msg.append("->");
+
+String parentName = entry.getSuperclassName();
+JavaClassCacheEntry parent = javaClassCache.get(parentName);
+int count = 0;
+
+while (count < 100 && parent != null && parent != start) {
+msg.append(parentName);
+msg.append("->");
+
+count ++;
+parentName = parent.getSuperclassName();
+parent = javaClassCache.get(parentName);
+}
+
+msg.append(parentName);
+
+return msg.toString();
+}
+
private void populateJavaClassCache(String className, JavaClass javaClass)
{
if (javaClassCache.containsKey(className)) {
return;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1447792&r1=1447791&r2=1447792&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Tue Feb 19 16:24:02 2013
@@ -18,7 +18,7 @@ catalina.noCluster=Cluster RuleSet not f
catalina.shutdownHookFail=The shutdown hook experienced an error while trying
to stop the server
catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
contextConfig.altDDNotFound=alt-dd file {0} not found
-contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}]. Possible root causes include a too low
setting for -Xss and illegal cyclic inheritance dependencies
+contextConfig.annotationsStackOverflow=Unable to complete the scan for
annotations for web application [{0}] due to a StackOverflowError. Possible
root causes include a too low setting for -Xss and illegal cyclic inheritance
dependencies. The class hierarchy being processed was [{1}]
contextConfig.applicationUrl=Unable to determine URL for application web.xml
contextConfig.applicationMissing=Missing appl
[Bug 53871] java.lang.StackOverflowError on deploying a web application
https://issues.apache.org/bugzilla/show_bug.cgi?id=53871 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #15 from Mark Thomas --- I have added the class hierarchy to the error message in trunk and 7.0.x. It will be included in 7.0.38 onwards. -- 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: r1447793 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Feb 19 16:25:28 2013 New Revision: 1447793 URL: http://svn.apache.org/r1447793 Log: Add the release date 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=1447793&r1=1447792&r2=1447793&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Feb 19 16:25:28 2013 @@ -87,7 +87,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447799 - /tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
Author: markt Date: Tue Feb 19 16:30:20 2013 New Revision: 1447799 URL: http://svn.apache.org/r1447799 Log: Remove unused class Removed: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447807 - in /tomcat/trunk/java/org/apache/tomcat/spdy: CompressDeflater6.java NetSupportOpenSSL.java NetSupportSocket.java SpdyConnection.java SpdyContext.java SpdyFrame.java SpdyStream.
Author: markt
Date: Tue Feb 19 16:48:19 2013
New Revision: 1447807
URL: http://svn.apache.org/r1447807
Log:
UCDetector
- use final
- reduce visibility
- remove unused code
Not all warnings were addressed as this code is a work in progress
Modified:
tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java?rev=1447807&r1=1447806&r2=1447807&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java Tue Feb 19
16:48:19 2013
@@ -27,10 +27,11 @@ import org.apache.tomcat.spdy.SpdyConnec
* Java6 Deflater with the workaround from tomcat http filters.
*/
class CompressDeflater6 implements CompressSupport {
-public static long DICT_ID = 3751956914L;
+public static final long DICT_ID = 3751956914L;
// Make sure to use the latest from net/spdy/spdy_framer.cc, not from spec
-static String SPDY_DICT_S =
"optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-"
+private static final String SPDY_DICT_S =
+
"optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-"
+
"languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi"
+
"f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser"
+
"-agent10010120020120220320420520630030130230330430530630740040140240340440"
@@ -44,25 +45,19 @@ class CompressDeflater6 implements Compr
+
"ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1"
+ ".1statusversionurl ";
-public static byte[] SPDY_DICT = SPDY_DICT_S.getBytes();
+private static final byte[] SPDY_DICT = SPDY_DICT_S.getBytes();
// C code uses this - not in the spec
static {
SPDY_DICT[SPDY_DICT.length - 1] = (byte) 0;
}
-Deflater zipOut;
-Inflater zipIn;
+private Deflater zipOut;
+private Inflater zipIn;
-byte[] dict;
+private byte[] decompressBuffer;
+private int decMax;
-long dictId;
-
-byte[] decompressBuffer;
-int decOff;
-int decMax;
-
-byte[] compressBuffer;
-int compressOff;
+private byte[] compressBuffer;
public CompressDeflater6() {
}
@@ -145,7 +140,6 @@ class CompressDeflater6 implements Compr
// will read from dec buffer to frame.data
decMax = frame.endData;
-decOff = start;
int off = start;
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java?rev=1447807&r1=1447806&r2=1447807&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java Tue Feb 19
16:48:19 2013
@@ -17,8 +17,6 @@
package org.apache.tomcat.spdy;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
import org.apache.tomcat.jni.SSLExt;
import org.apache.tomcat.jni.Status;
@@ -30,8 +28,7 @@ import org.apache.tomcat.jni.socket.AprS
public class NetSupportOpenSSL extends SpdyContext.NetSupport {
-List protos = Arrays.asList(new String[] {"spdy/2", "http/1.1"});
-AprSocketContext con;
+private AprSocketContext con;
public NetSupportOpenSSL() {
con = new AprSocketContext();
@@ -119,8 +116,8 @@ public class NetSupportOpenSSL extends S
}
// NB
-static class SpdySocketHandler implements NonBlockingPollHandler {
-SpdyConnection con;
+private static class SpdySocketHandler implements NonBlockingPollHandler {
+private final SpdyConnection con;
SpdySocketHandler(SpdyConnection con) {
this.con = con;
@@ -156,8 +153,8 @@ public class NetSupportOpenSSL extends S
}
-public static class SpdyConnectionAprSocket extends SpdyConnection {
-AprSocket socket;
+private static class SpdyConnectionAprSocket extends SpdyConnection {
+private AprSocket socket;
public SpdyConnectionAprSocket(SpdyContext spdyContext) {
super(spdyContext);
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
URL:
http://svn.
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/1078 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] 1447793 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1447817 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Author: markt
Date: Tue Feb 19 17:09:35 2013
New Revision: 1447817
URL: http://svn.apache.org/r1447817
Log:
Deprecate prior to reducing visibility
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1447817&r1=1447816&r2=1447817&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Tue Feb 19
17:09:35 2013
@@ -90,13 +90,27 @@ public class B2CConverter {
return charset;
}
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected CharsetDecoder decoder = null;
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected ByteBuffer bb = null;
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected CharBuffer cb = null;
/**
* Leftover buffer used for incomplete characters.
+ * @deprecated Will be made private in Tomcat 8.0.x
*/
+@Deprecated
protected ByteBuffer leftovers = null;
public B2CConverter(String encoding) throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447818 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Author: markt
Date: Tue Feb 19 17:10:42 2013
New Revision: 1447818
URL: http://svn.apache.org/r1447818
Log:
UCDetector
- use final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1447818&r1=1447817&r2=1447818&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Tue Feb 19
17:10:42 2013
@@ -90,28 +90,14 @@ public class B2CConverter {
return charset;
}
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected CharsetDecoder decoder = null;
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected ByteBuffer bb = null;
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected CharBuffer cb = null;
+private final CharsetDecoder decoder;
+private ByteBuffer bb = null;
+private CharBuffer cb = null;
/**
* Leftover buffer used for incomplete characters.
- * @deprecated Will be made private in Tomcat 8.0.x
*/
-@Deprecated
-protected ByteBuffer leftovers = null;
+private final ByteBuffer leftovers;
public B2CConverter(String encoding) throws IOException {
byte[] left = new byte[4];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447821 - /tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
Author: markt
Date: Tue Feb 19 17:13:31 2013
New Revision: 1447821
URL: http://svn.apache.org/r1447821
Log:
Deprecate prior to reducing visibility
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1447821&r1=1447820&r2=1447821&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Tue Feb 19
17:13:31 2013
@@ -28,13 +28,27 @@ import java.nio.charset.CodingErrorActio
*/
public final class C2BConverter {
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected CharsetEncoder encoder = null;
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected ByteBuffer bb = null;
+/**
+ * @deprecated Will be made private in Tomcat 8.0.x
+ */
+@Deprecated
protected CharBuffer cb = null;
/**
* Leftover buffer used for multi-characters characters.
+ * @deprecated Will be made private in Tomcat 8.0.x
*/
+@Deprecated
protected CharBuffer leftovers = null;
public C2BConverter(String encoding) throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447825 - /tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
Author: markt
Date: Tue Feb 19 17:17:59 2013
New Revision: 1447825
URL: http://svn.apache.org/r1447825
Log:
UCDetector: Reduce visibility of inner classes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java?rev=1447825&r1=1447824&r2=1447825&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java Tue Feb 19
17:17:59 2013
@@ -638,11 +638,11 @@ public class StringCache {
// -- ByteEntry Inner Class
-public static class ByteEntry {
+private static class ByteEntry {
-public byte[] name = null;
-public Charset charset = null;
-public String value = null;
+private byte[] name = null;
+private Charset charset = null;
+private String value = null;
@Override
public String toString() {
@@ -666,10 +666,10 @@ public class StringCache {
// -- CharEntry Inner Class
-public static class CharEntry {
+private static class CharEntry {
-public char[] name = null;
-public String value = null;
+private char[] name = null;
+private String value = null;
@Override
public String toString() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo
[ https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13581549#comment-13581549 ] Hudson commented on MTOMCAT-208: Integrated in TomcatMavenPlugin-mvn3.x #240 (See [https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/240/]) [MTOMCAT-208] JaCoCo instrumentation errors when running StandaloneWarMojo Submitted by Tim Astle. (Revision 1447735) Result = SUCCESS olamy : http://svn.apache.org/viewvc/?view=rev&rev=1447735 Files : * /tomcat/maven-plugin/trunk/README.txt > JaCoCo instrumentation errors when running StandaloneWarMojo > > > Key: MTOMCAT-208 > URL: https://issues.apache.org/jira/browse/MTOMCAT-208 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: tomcat7 >Affects Versions: 2.1 >Reporter: Tim Astle >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.1 > > Attachments: StandaloneWarMojo.java.patch, tomcat-maven-plugin.patch > > > We've run into issues with using the plugin with jacoco for code coverage > getting instrumentation errors on classes (saying they've already been > instrumented). We found that this was due to how the exec-war and > standalone-war goals work because they fork and start a new package phase (at > least from what I've read that's what they're doing), so it's getting > executed twice and the second time when it tries to instrument the classes it > gets the errors. I found this doesn't occur with the exec-war-only goal, so > I updated the StandaloneWarMojo class to not have the @Execute(phase = > LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the > issue. Not sure if it would make more sense to add another goal such as > 'standalone-war-only' and keep the existing standalone-war or not. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1447817 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
On 19/02/2013 17:09, ma...@apache.org wrote: Author: markt Date: Tue Feb 19 17:09:35 2013 New Revision: 1447817 URL: http://svn.apache.org/r1447817 Log: Deprecate prior to reducing visibility This wasn't necessary due to the previous refactoring in trunk. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447883 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: C2BConverter.java MessageBytes.java UDecoder.java
Author: markt
Date: Tue Feb 19 19:48:47 2013
New Revision: 1447883
URL: http://svn.apache.org/r1447883
Log:
UCDetector
- use final
- reduce visibility
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Tue Feb 19
19:48:47 2013
@@ -28,28 +28,14 @@ import java.nio.charset.CodingErrorActio
*/
public final class C2BConverter {
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected CharsetEncoder encoder = null;
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected ByteBuffer bb = null;
-/**
- * @deprecated Will be made private in Tomcat 8.0.x
- */
-@Deprecated
-protected CharBuffer cb = null;
+private final CharsetEncoder encoder;
+private ByteBuffer bb = null;
+private CharBuffer cb = null;
/**
* Leftover buffer used for multi-characters characters.
- * @deprecated Will be made private in Tomcat 8.0.x
*/
-@Deprecated
-protected CharBuffer leftovers = null;
+private final CharBuffer leftovers;
public C2BConverter(String encoding) throws IOException {
encoder = B2CConverter.getCharset(encoding).newEncoder();
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Tue Feb 19
19:48:47 2013
@@ -519,7 +519,7 @@ public final class MessageBytes implemen
private static final MessageBytesFactory factory=new MessageBytesFactory();
-public static class MessageBytesFactory {
+private static class MessageBytesFactory {
protected MessageBytesFactory() {
}
public MessageBytes newInstance() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1447883&r1=1447882&r2=1447883&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Tue Feb 19
19:48:47 2013
@@ -29,7 +29,7 @@ import java.io.IOException;
*/
public final class UDecoder {
-protected static final boolean ALLOW_ENCODED_SLASH =
+private static final boolean ALLOW_ENCODED_SLASH =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false")).booleanValue();
private static class DecodeException extends CharConversionException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447884 - /tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
Author: markt
Date: Tue Feb 19 19:50:39 2013
New Revision: 1447884
URL: http://svn.apache.org/r1447884
Log:
UCDetector
- use final
Modified:
tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java?rev=1447884&r1=1447883&r2=1447884&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
Tue Feb 19 19:50:39 2013
@@ -29,7 +29,7 @@ public class SynchronizedStack {
private static final int DEFAULT_LIMIT = -1;
private int size;
-private int limit;
+private final int limit;
/*
* Points to the next available object in the stack
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447888 - in /tomcat/trunk/java/org/apache/tomcat/util/digester: GenericParser.java NodeCreateRule.java ParserFeatureSetterFactory.java WithDefaultsRulesWrapper.java XercesParser.java pac
Author: markt Date: Tue Feb 19 20:00:33 2013 New Revision: 1447888 URL: http://svn.apache.org/r1447888 Log: UCDetector: Remove unused classes Removed: tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1447888&r1=1447887&r2=1447888&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Tue Feb 19 20:00:33 2013 @@ -422,9 +422,6 @@ following: CallMethodRule within which we are nested. You can specify that the parameter value be taken from a particular named attribute, or from the nested body content of this element. -NodeCreateRule - A specialized rule -that converts part of the tree into a DOM Node and then -pushes it onto the stack. You can create instances of the standard Rule classes and @@ -909,31 +906,6 @@ regex (to allow the dependencies require to be kept to a minimum). -WithDefaultsRulesWrapper - - WithDefaultsRulesWrapper allows -default Rule instances to be added to any existing -Rules implementation. These default Rule instances -will be returned for any match for which the wrapped implementation does not -return any matches. - - -For example, - -Rule alpha; -... -WithDefaultsRulesWrapper rules = new WithDefaultsRulesWrapper(new BaseRules()); -rules.addDefault(alpha); -... -digester.setRules(rules); -... - -when a pattern does not match any other rule, then rule alpha will be called. - - -WithDefaultsRulesWrapper follows the Decorator pattern. - - Encapsulated Rule Sets - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447891 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Tue Feb 19 20:08:30 2013
New Revision: 1447891
URL: http://svn.apache.org/r1447891
Log:
Remove unused stacksByName
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1447891&r1=1447890&r2=1447891&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Feb 19
20:08:30 2013
@@ -336,10 +336,6 @@ public class Digester extends DefaultHan
LogFactory.getLog("org.apache.tomcat.util.digester.Digester.sax");
-/** Stacks used for inter-rule communication, indexed by name String */
-private HashMap> stacksByName =
-new HashMap<>();
-
// - Properties
/**
@@ -2391,102 +2387,6 @@ public class Digester extends DefaultHan
}
/**
- * Pushes the given object onto the stack with the given name.
- * If no stack already exists with the given name then one will be created.
- *
- * @param stackName the name of the stack onto which the object should be
pushed
- * @param value the Object to be pushed onto the named stack.
- *
- * @since 1.6
- */
-public void push(String stackName, Object value) {
-ArrayStack namedStack = stacksByName.get(stackName);
-if (namedStack == null) {
-namedStack = new ArrayStack<>();
-stacksByName.put(stackName, namedStack);
-}
-namedStack.push(value);
-}
-
-/**
- * Pops (gets and removes) the top object from the stack with the given
name.
- *
- * Note: a stack is considered empty
- * if no objects have been pushed onto it yet.
- *
- * @param stackName the name of the stack from which the top value is to
be popped
- * @return the top Object on the stack or or null if the
stack is either
- * empty or has not been created yet
- * @throws EmptyStackException if the named stack is empty
- *
- * @since 1.6
- */
-public Object pop(String stackName) {
-Object result = null;
-ArrayStack namedStack = stacksByName.get(stackName);
-if (namedStack == null) {
-if (log.isDebugEnabled()) {
-log.debug("Stack '" + stackName + "' is empty");
-}
-throw new EmptyStackException();
-
-} else {
-
-result = namedStack.pop();
-}
-return result;
-}
-
-/**
- * Gets the top object from the stack with the given name.
- * This method does not remove the object from the stack.
- *
- * Note: a stack is considered empty
- * if no objects have been pushed onto it yet.
- *
- * @param stackName the name of the stack to be peeked
- * @return the top Object on the stack or null if the stack
is either
- * empty or has not been created yet
- * @throws EmptyStackException if the named stack is empty
- *
- * @since 1.6
- */
-public Object peek(String stackName) {
-Object result = null;
-ArrayStack namedStack = stacksByName.get(stackName);
-if (namedStack == null ) {
-if (log.isDebugEnabled()) {
-log.debug("Stack '" + stackName + "' is empty");
-}
-throw new EmptyStackException();
-
-} else {
-
-result = namedStack.peek();
-}
-return result;
-}
-
-/**
- * Is the stack with the given name empty?
- * Note: a stack is considered empty
- * if no objects have been pushed onto it yet.
- * @param stackName the name of the stack whose emptiness
- * should be evaluated
- * @return true if the given stack if empty
- *
- * @since 1.6
- */
-public boolean isEmpty(String stackName) {
-boolean result = true;
-ArrayStack namedStack = stacksByName.get(stackName);
-if (namedStack != null ) {
-result = namedStack.isEmpty();
-}
-return result;
-}
-
-/**
* When the Digester is being used as a SAXContentHandler,
* this method allows you to access the root object that has been
* created after parsing.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447895 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Tue Feb 19 20:13:10 2013
New Revision: 1447895
URL: http://svn.apache.org/r1447895
Log:
Remove unused constructors and default constructor that adds nothing
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1447895&r1=1447894&r2=1447895&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Feb 19
20:13:10 2013
@@ -111,51 +111,6 @@ public class Digester extends DefaultHan
}
-// - Constructors
-
-
-/**
- * Construct a new Digester with default properties.
- */
-public Digester() {
-
-super();
-
-}
-
-
-/**
- * Construct a new Digester, allowing a SAXParser to be passed in. This
- * allows Digester to be used in environments which are unfriendly to
- * JAXP1.1 (such as WebLogic 6.0). Thanks for the request to change go to
- * James House (ja...@interobjective.com). This may help in places where
- * you are able to load JAXP 1.1 classes yourself.
- */
-public Digester(SAXParser parser) {
-
-super();
-
-this.parser = parser;
-
-}
-
-
-/**
- * Construct a new Digester, allowing an XMLReader to be passed in. This
- * allows Digester to be used in environments which are unfriendly to
- * JAXP1.1 (such as WebLogic 6.0). Note that if you use this option you
- * have to configure namespace and validation support yourself, as these
- * properties only affect the SAXParser and empty constructor.
- */
-public Digester(XMLReader reader) {
-
-super();
-
-this.reader = reader;
-
-}
-
-
// --- Instance Variables
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447896 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Tue Feb 19 20:17:08 2013
New Revision: 1447896
URL: http://svn.apache.org/r1447896
Log:
UCDetector: Remove unused methods
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1447896&r1=1447895&r2=1447896&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Feb 19
20:17:08 2013
@@ -434,31 +434,6 @@ public class Digester extends DefaultHan
/**
- * Returns a flag indicating whether the requested feature is supported
- * by the underlying implementation of org.xml.sax.XMLReader.
- * See http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
- *
http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description
- * for information about the standard SAX2 feature flags.
- *
- * @param feature Name of the feature to inquire about
- *
- * @exception ParserConfigurationException if a parser configuration error
- * occurs
- * @exception SAXNotRecognizedException if the property name is
- * not recognized
- * @exception SAXNotSupportedException if the property name is
- * recognized but not supported
- */
-public boolean getFeature(String feature)
-throws ParserConfigurationException, SAXNotRecognizedException,
-SAXNotSupportedException {
-
-return (getFactory().getFeature(feature));
-
-}
-
-
-/**
* Sets a flag indicating whether the requested feature is supported
* by the underlying implementation of org.xml.sax.XMLReader.
* See http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
@@ -655,29 +630,6 @@ public class Digester extends DefaultHan
/**
- * Set the current value of the specified property for the underlying
- * XMLReader implementation.
- * See http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description";
- *
http://www.saxproject.org/apidoc/xml/sax/package-summary.html#package-description
- * for information about the standard SAX2 properties.
- *
- * @param property Property name to be set
- * @param value Property value to be set
- *
- * @exception SAXNotRecognizedException if the property name is
- * not recognized
- * @exception SAXNotSupportedException if the property name is
- * recognized but not supported
- */
-public void setProperty(String property, Object value)
-throws SAXNotRecognizedException, SAXNotSupportedException {
-
-getParser().setProperty(property, value);
-
-}
-
-
-/**
* Return the Rules implementation object containing our
* rules collection and associated matching policy. If none has been
* established, a default implementation will be created and returned.
@@ -1507,44 +1459,6 @@ public class Digester extends DefaultHan
/**
- * Parse the content of the specified reader using this Digester.
- * Returns the root element from the object stack (if any).
- *
- * @param reader Reader containing the XML data to be parsed
- *
- * @exception IOException if an input/output error occurs
- * @exception SAXException if a parsing exception occurs
- */
-public Object parse(Reader reader) throws IOException, SAXException {
-
-configure();
-InputSource is = new InputSource(reader);
-getXMLReader().parse(is);
-return (root);
-
-}
-
-
-/**
- * Parse the content of the specified URI using this Digester.
- * Returns the root element from the object stack (if any).
- *
- * @param uri URI containing the XML data to be parsed
- *
- * @exception IOException if an input/output error occurs
- * @exception SAXException if a parsing exception occurs
- */
-public Object parse(String uri) throws IOException, SAXException {
-
-configure();
-InputSource is = new InputSource(uri);
-getXMLReader().parse(is);
-return (root);
-
-}
-
-
-/**
* Register the specified DTD URL for the specified public identifier.
* This must be called before the first call to parse().
*
@@ -1650,65 +1564,6 @@ public class Digester extends DefaultHan
/**
- * Add an "call method" rule for the specified parameters.
- * If paramCount is set to zero the rule will use
- * the body of the matched element as the single argument of the
- * method, unless paramTypes is null or empty, in this
- * case the rule will call the specified method with no arguments.
- *
- * @param pattern Element matching p
svn commit: r1447897 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Tue Feb 19 20:18:08 2013
New Revision: 1447897
URL: http://svn.apache.org/r1447897
Log:
Fix imports
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1447897&r1=1447896&r2=1447897&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Feb 19
20:18:08 2013
@@ -14,15 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.digester;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
import java.lang.reflect.InvocationTargetException;
import java.util.EmptyStackException;
import java.util.HashMap;
@@ -71,7 +68,6 @@ import org.xml.sax.helpers.DefaultHandle
* the support of XML schema. You need Xerces 2.1/2.3 and up to make
* this class working with XML schema
*/
-
public class Digester extends DefaultHandler {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447898 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: markt
Date: Tue Feb 19 20:19:31 2013
New Revision: 1447898
URL: http://svn.apache.org/r1447898
Log:
UCDetector: Remove unused methods
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1447898&r1=1447897&r2=1447898&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Feb 19
20:19:31 2013
@@ -1579,96 +1579,6 @@ public class Digester extends DefaultHan
* Add a "factory create" rule for the specified parameters.
*
* @param pattern Element matching pattern
- * @param className Java class name of the object creation factory class
- * @param ignoreCreateExceptions when true any exceptions
thrown during
- * object creation will be ignored.
- * @see FactoryCreateRule
- */
-public void addFactoryCreate(
-String pattern,
-String className,
-boolean ignoreCreateExceptions) {
-
-addRule(
-pattern,
-new FactoryCreateRule(className, ignoreCreateExceptions));
-
-}
-
-
-/**
- * Add a "factory create" rule for the specified parameters.
- *
- * @param pattern Element matching pattern
- * @param clazz Java class of the object creation factory class
- * @param ignoreCreateExceptions when true any exceptions
thrown during
- * object creation will be ignored.
- * @see FactoryCreateRule
- */
-public void addFactoryCreate(
-String pattern,
-Class clazz,
-boolean ignoreCreateExceptions) {
-
-addRule(
-pattern,
-new FactoryCreateRule(clazz, ignoreCreateExceptions));
-
-}
-
-
-/**
- * Add a "factory create" rule for the specified parameters.
- *
- * @param pattern Element matching pattern
- * @param className Java class name of the object creation factory class
- * @param attributeName Attribute name which, if present, overrides the
- * value specified by className
- * @param ignoreCreateExceptions when true any exceptions
thrown during
- * object creation will be ignored.
- * @see FactoryCreateRule
- */
-public void addFactoryCreate(
-String pattern,
-String className,
-String attributeName,
-boolean ignoreCreateExceptions) {
-
-addRule(
-pattern,
-new FactoryCreateRule(className, attributeName,
ignoreCreateExceptions));
-
-}
-
-
-/**
- * Add a "factory create" rule for the specified parameters.
- *
- * @param pattern Element matching pattern
- * @param clazz Java class of the object creation factory class
- * @param attributeName Attribute name which, if present, overrides the
- * value specified by className
- * @param ignoreCreateExceptions when true any exceptions
thrown during
- * object creation will be ignored.
- * @see FactoryCreateRule
- */
-public void addFactoryCreate(
-String pattern,
-Class clazz,
-String attributeName,
-boolean ignoreCreateExceptions) {
-
-addRule(
-pattern,
-new FactoryCreateRule(clazz, attributeName,
ignoreCreateExceptions));
-
-}
-
-
-/**
- * Add a "factory create" rule for the specified parameters.
- *
- * @param pattern Element matching pattern
* @param creationFactory Previously instantiated ObjectCreationFactory
* to be utilized
* @param ignoreCreateExceptions when true any exceptions
thrown during
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447899 - in /tomcat/trunk/java/org/apache/tomcat/util/digester: CallMethodRule.java FactoryCreateRule.java SetNextRule.java SetPropertiesRule.java SetPropertyRule.java SetRootRule.java S
Author: markt
Date: Tue Feb 19 20:25:03 2013
New Revision: 1447899
URL: http://svn.apache.org/r1447899
Log:
UCDetector: Remove unused methods
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1447899&r1=1447898&r2=1447899&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Tue
Feb 19 20:25:03 2013
@@ -125,45 +125,6 @@ public class CallMethodRule extends Rule
/**
- * Construct a "call method" rule with the specified method name.
- * The method should accept no parameters.
- *
- * @param targetOffset location of the target object. Positive numbers are
- * relative to the top of the digester object stack. Negative numbers
- * are relative to the bottom of the stack. Zero implies the top
- * object on the stack.
- * @param methodName Method name of the parent method to call
- */
-public CallMethodRule(int targetOffset, String methodName) {
-
-this(targetOffset, methodName, 0, (Class[]) null);
-
-}
-
-
-/**
- * Construct a "call method" rule with the specified method name and
- * parameter types. If paramCount is set to zero the rule
- * will use the body of this element as the single argument of the
- * method, unless paramTypes is null or empty, in this
- * case the rule will call the specified method with no arguments.
- *
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of this element
- * @param paramTypes The Java class names of the arguments
- * (if you wish to use a primitive type, specify the corresponding
- * Java wrapper class instead, such as java.lang.Boolean
- * for a boolean parameter)
- */
-public CallMethodRule(
-String methodName,
-int paramCount,
-String paramTypes[]) {
-this(0, methodName, paramCount, paramTypes);
-}
-
-/**
* Construct a "call method" rule with the specified method name and
* parameter types. If paramCount is set to zero the rule
* will use the body of this element as the single argument of the
@@ -215,29 +176,6 @@ public class CallMethodRule extends Rule
* method, unless paramTypes is null or empty, in this
* case the rule will call the specified method with no arguments.
*
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of this element
- * @param paramTypes The Java classes that represent the
- * parameter types of the method arguments
- * (if you wish to use a primitive type, specify the corresponding
- * Java wrapper class instead, such as java.lang.Boolean.TYPE
- * for a boolean parameter)
- */
-public CallMethodRule(
-String methodName,
-int paramCount,
-Class paramTypes[]) {
-this(0, methodName, paramCount, paramTypes);
-}
-
-/**
- * Construct a "call method" rule with the specified method name and
- * parameter types. If paramCount is set to zero the rule
- * will use the body of this element as the single argument of the
- * method, unless paramTypes is null or empty, in this
- * case the rule will call the specified method with no arguments.
- *
* @param targetOffset location of the target object. Positive numbers are
* relative to the top of the digester object stack. Negative numbers
* are relative to the bottom of the stack. Zero implies the top
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java?rev=1447899&r1=1447898&r2=1447899&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
svn commit: r1447905 - in /tomcat/trunk/java/org/apache/tomcat/util/digester: CallParamRule.java ObjectParamRule.java PathCallParamRule.java SetPropertyRule.java SetRootRule.java SetTopRule.java packa
Author: markt
Date: Tue Feb 19 20:31:17 2013
New Revision: 1447905
URL: http://svn.apache.org/r1447905
Log:
UCDetector: Remove unused classes
Removed:
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/PathCallParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java?rev=1447905&r1=1447904&r2=1447905&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java Tue
Feb 19 20:31:17 2013
@@ -35,7 +35,6 @@ import org.xml.sax.Attributes;
* from the top object on the stack.
* See {@link #CallParamRule(int paramIndex, boolean fromStack)}
* the current path being processed (separate Rule).
- * See {@link PathCallParamRule}
*
*
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1447905&r1=1447904&r2=1447905&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Tue Feb 19
20:31:17 2013
@@ -386,14 +386,6 @@ following:
pattern. This causes the creation of a new Java object, followed by
"configuration" of that object's properties based on the attributes
of the same XML element that created this object.
-SetPropertyRule - When the
-begin() method is called, the digester calls a specified
-property setter (where the property itself is named by an attribute)
-with a specified value (where the value is named by another attribute),
-on the object at the top of the digester's stack.
-This is useful when your XML file conforms to a particular DTD, and
-you wish to configure a particular property that does not have a
-corresponding attribute in the DTD.
SetNextRule - When the
end() method is called, the digester analyzes the
next-to-top element on the stack, looking for a property setter method
@@ -401,13 +393,6 @@ following:
at the top of the stack as an argument. This rule is commonly used to
establish one-to-many relationships between the two objects, with the
method name commonly being something like "addChild".
-SetTopRule - When the
-end() method is called, the digester analyzes the
-top element on the stack, looking for a property setter method for a
-specified property. It then calls this method, passing the next-to-top
-object on the stack as an argument. This rule would be used as an
-alternative to a SetNextRule, with a typical method name "setParent",
-if the API supported by your object classes prefers this approach.
CallMethodRule - This rule sets up a
method call to a named method of the top object on the digester's stack,
which will actually take place when the end() method is
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447907 - in /tomcat/trunk/java/org/apache/tomcat/util/digester: CallMethodRule.java CallParamRule.java FactoryCreateRule.java ObjectCreateRule.java SetNextRule.java SetPropertiesRule.jav
Author: markt
Date: Tue Feb 19 20:36:34 2013
New Revision: 1447907
URL: http://svn.apache.org/r1447907
Log:
UCDetector: Remove unused constructors
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1447907&r1=1447906&r2=1447907&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Tue
Feb 19 20:36:34 2013
@@ -138,51 +138,6 @@ public class CallMethodRule extends Rule
* @param methodName Method name of the parent method to call
* @param paramCount The number of parameters to collect, or
* zero for a single argument from the body of this element
- * @param paramTypes The Java class names of the arguments
- * (if you wish to use a primitive type, specify the corresponding
- * Java wrapper class instead, such as java.lang.Boolean
- * for a boolean parameter)
- */
-public CallMethodRule( int targetOffset,
-String methodName,
-int paramCount,
-String paramTypes[]) {
-
-this.targetOffset = targetOffset;
-this.methodName = methodName;
-this.paramCount = paramCount;
-if (paramTypes == null) {
-this.paramTypes = new Class[paramCount];
-for (int i = 0; i < this.paramTypes.length; i++) {
-this.paramTypes[i] = String.class;
-}
-this.paramClassNames = null;
-} else {
-// copy the parameter class names into an array
-// the classes will be loaded when the digester is set
-this.paramClassNames = new String[paramTypes.length];
-for (int i = 0; i < this.paramClassNames.length; i++) {
-this.paramClassNames[i] = paramTypes[i];
-}
-}
-
-}
-
-
-/**
- * Construct a "call method" rule with the specified method name and
- * parameter types. If paramCount is set to zero the rule
- * will use the body of this element as the single argument of the
- * method, unless paramTypes is null or empty, in this
- * case the rule will call the specified method with no arguments.
- *
- * @param targetOffset location of the target object. Positive numbers are
- * relative to the top of the digester object stack. Negative numbers
- * are relative to the bottom of the stack. Zero implies the top
- * object on the stack.
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of this element
* @param paramTypes The Java classes that represent the
* parameter types of the method arguments
* (if you wish to use a primitive type, specify the corresponding
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java?rev=1447907&r1=1447906&r2=1447907&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java Tue
Feb 19 20:36:34 2013
@@ -67,28 +67,6 @@ public class CallParamRule extends Rule
}
-/**
- * Construct a "call parameter" rule.
- *
- * @param paramIndex The zero-relative parameter number
- * @param fromStack should this parameter be taken from the top of the
stack?
- */
-public CallParamRule(int paramIndex, boolean fromStack) {
-this(null, paramIndex, 0, fromStack);
-}
-
-/**
- * Constructs a "call parameter" rule which sets a parameter from the
stack.
- * If the stack contains too few objects, then the parameter will be set
to null.
- *
- * @param paramIndex The zero-relative parameter number
- * @param stackIndex the index of the object which will be passed as a
parameter.
- * The zeroth object is the top of the stack, 1 is the next object down
and so on.
- */
-public CallParamRule(int paramIndex, int stackIndex) {
-this(null, paramIndex, stackIndex, true);
svn commit: r1447910 - /tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Author: markt
Date: Tue Feb 19 20:39:01 2013
New Revision: 1447910
URL: http://svn.apache.org/r1447910
Log:
UCDetector: Remove unused constructors
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java?rev=1447910&r1=1447909&r2=1447910&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Tue Feb 19 20:39:01 2013
@@ -45,52 +45,6 @@ public class FactoryCreateRule extends R
// --- Constructors
/**
- * Construct a factory create rule that will use the specified
- * class name (possibly overridden by the specified attribute if present)
- * to create an {@link ObjectCreationFactory}, which will then be used
- * to instantiate an object instance and push it onto the stack.
- *
- * @param className Default Java class name of the factory class
- * @param attributeName Attribute name which, if present, contains an
- * override of the class name of the object creation factory to create.
- * @param ignoreCreateExceptions if true, exceptions thrown by the object
- * creation factory will be ignored.
- */
-public FactoryCreateRule(
-String className,
-String attributeName,
-boolean ignoreCreateExceptions) {
-
-this.className = className;
-this.attributeName = attributeName;
-this.ignoreCreateExceptions = ignoreCreateExceptions;
-
-}
-
-
-/**
- * Construct a factory create rule that will use the specified
- * class (possibly overridden by the specified attribute if present)
- * to create an {@link ObjectCreationFactory}, which will then be used
- * to instantiate an object instance and push it onto the stack.
- *
- * @param clazz Default Java class name of the factory class
- * @param attributeName Attribute name which, if present, contains an
- * override of the class name of the object creation factory to create.
- * @param ignoreCreateExceptions if true, exceptions thrown by the object
- * creation factory will be ignored.
- */
-public FactoryCreateRule(
-Class clazz,
-String attributeName,
-boolean ignoreCreateExceptions) {
-
-this(clazz.getName(), attributeName, ignoreCreateExceptions);
-
-}
-
-
-/**
* Construct a factory create rule using the given, already instantiated,
* {@link ObjectCreationFactory}.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1447911 - /tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Author: markt
Date: Tue Feb 19 20:44:39 2013
New Revision: 1447911
URL: http://svn.apache.org/r1447911
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java?rev=1447911&r1=1447910&r2=1447911&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
Tue Feb 19 20:44:39 2013
@@ -36,21 +36,6 @@ import org.xml.sax.Attributes;
public class SetPropertiesRule extends Rule {
-// - Instance Variables
-
-/**
- * Attribute names used to override natural attribute->property mapping
- */
-private String [] attributeNames;
-/**
- * Property names used to override natural attribute->property mapping
- */
-private String [] propertyNames;
-
-
-// - Public Methods
-
-
/**
* Process the beginning of this element.
*
@@ -78,16 +63,6 @@ public class SetPropertiesRule extends R
}
}
-// set up variables for custom names mappings
-int attNamesLength = 0;
-if (attributeNames != null) {
-attNamesLength = attributeNames.length;
-}
-int propNamesLength = 0;
-if (propertyNames != null) {
-propNamesLength = propertyNames.length;
-}
-
for (int i = 0; i < attributes.getLength(); i++) {
String name = attributes.getLocalName(i);
if ("".equals(name)) {
@@ -95,22 +70,6 @@ public class SetPropertiesRule extends R
}
String value = attributes.getValue(i);
-// we'll now check for custom mappings
-for (int n = 0; n
[Bug 54585] New: WebappLoader doesn't honor delegate attr while constructing jsp_classpath
https://issues.apache.org/bugzilla/show_bug.cgi?id=54585 Bug ID: 54585 Summary: WebappLoader doesn't honor delegate attr while constructing jsp_classpath Product: Tomcat 7 Version: 7.0.37 Hardware: All OS: All Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: eugene.ma...@gmail.com Classification: Unclassified If custom WebappClassLoader is created with delegate=true then parent-first classloading model is used. Everything works here as expected. However jsp_classpath is always constructed in the following manner: customWebappClassLoader.urls;parent.urls;parent...parent.urls Whereas it is expected to me that if delegate=true then parent's urls should come first. -- 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: r1447919 - /tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Author: markt
Date: Tue Feb 19 20:52:26 2013
New Revision: 1447919
URL: http://svn.apache.org/r1447919
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java?rev=1447919&r1=1447918&r2=1447919&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
Tue Feb 19 20:52:26 2013
@@ -60,21 +60,8 @@ public class FactoryCreateRule extends R
this.ignoreCreateExceptions = ignoreCreateExceptions;
}
-// - Instance Variables
-
-
-/**
- * The attribute containing an override class name if it is present.
- */
-protected String attributeName = null;
-
-
-/**
- * The Java class name of the ObjectCreationFactory to be created.
- * This class must have a no-arguments constructor.
- */
-protected String className = null;
+// - Instance Variables
/**
* The object creation factory we will use to instantiate objects
@@ -102,7 +89,7 @@ public class FactoryCreateRule extends R
}
try {
-Object instance =
getFactory(attributes).createObject(attributes);
+Object instance = creationFactory.createObject(attributes);
if (digester.log.isDebugEnabled()) {
digester.log.debug("[FactoryCreateRule]{" + digester.match
+
@@ -124,7 +111,7 @@ public class FactoryCreateRule extends R
}
} else {
-Object instance = getFactory(attributes).createObject(attributes);
+Object instance = creationFactory.createObject(attributes);
if (digester.log.isDebugEnabled()) {
digester.log.debug("[FactoryCreateRule]{" + digester.match +
@@ -172,11 +159,7 @@ public class FactoryCreateRule extends R
*/
@Override
public void finish() throws Exception {
-
-if (attributeName != null) {
-creationFactory = null;
-}
-
+// NO-OP
}
@@ -187,52 +170,12 @@ public class FactoryCreateRule extends R
public String toString() {
StringBuilder sb = new StringBuilder("FactoryCreateRule[");
-sb.append("className=");
-sb.append(className);
-sb.append(", attributeName=");
-sb.append(attributeName);
if (creationFactory != null) {
-sb.append(", creationFactory=");
+sb.append("creationFactory=");
sb.append(creationFactory);
}
sb.append("]");
return (sb.toString());
}
-
-
-// -- Protected Methods
-
-
-/**
- * Return an instance of our associated object creation factory,
- * creating one if necessary.
- *
- * @param attributes Attributes passed to our factory creation element
- *
- * @exception Exception if any error occurs
- */
-protected ObjectCreationFactory getFactory(Attributes attributes)
-throws Exception {
-
-if (creationFactory == null) {
-String realClassName = className;
-if (attributeName != null) {
-String value = attributes.getValue(attributeName);
-if (value != null) {
-realClassName = value;
-}
-}
-if (digester.log.isDebugEnabled()) {
-digester.log.debug("[FactoryCreateRule]{" + digester.match +
-"} New factory " + realClassName);
-}
-Class clazz =
digester.getClassLoader().loadClass(realClassName);
-creationFactory = (ObjectCreationFactory)
-clazz.newInstance();
-creationFactory.setDigester(digester);
-}
-return (creationFactory);
-
-}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53905] Connection pool not reusing connections.
https://issues.apache.org/bugzilla/show_bug.cgi?id=53905
Daniel Mikusa changed:
What|Removed |Added
OS||All
--- Comment #1 from Daniel Mikusa ---
The behavior you are seeing might be caused because you are storing a reference
to the Connection and Statement objects at the class level on the Servlet
object.
Only *one* Servlet is used to process all incoming requests, so this isn't
thread safe. Each request will result in a new Connection being created and it
could possibly overwrite a previous connection before it is closed properly.
...
public class TestServlet extends HttpServlet {
private DataSource dataSource;
private Connection connection;
private Statement statement;
public void init() throws ServletException {
...
Instead put Connection and Statement inside of "doGet".
--
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
