[Tomcat Wiki] Trivial Update of "RudolphWo" by RudolphWo
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "RudolphWo" page has been changed by RudolphWo: http://wiki.apache.org/tomcat/RudolphWo New page: Myrtle Carreras is what's written on the birth certificate and she believes it sounds quite good. For years she's lived in Utah.<> What she loves doing is camping and she would never provides it up. In her professional life she is an economic officer. See what's new to be with her website here: http://www.youtube.com/watch?v=pTag_7PPClQ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54604] NPE at InternalInputBuffer.java while using AsyncContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=54604 Mark Thomas changed: What|Removed |Added Component|Common |Connectors Version|unspecified |7.0.29 Product|Tomcat Connectors |Tomcat 7 --- Comment #2 from Mark Thomas --- Correct the product -- 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 54604] NPE at InternalInputBuffer.java while using AsyncContext
https://issues.apache.org/bugzilla/show_bug.cgi?id=54604 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas --- The async request has timed out. Once startAsync() has been called, dispatch() or complete() must be called before the timeout expires. In this case your requets processing is taking longer than the timeout. The NPE is the result of continuing to use the request after the async timeout has expired. You need to use a larger timeout. -- 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 54612] Fatal Error when trying to send data to WebSocket with conection closed
https://issues.apache.org/bugzilla/show_bug.cgi?id=54612 Mark Thomas changed: What|Removed |Added Component|Library |Catalina Version|1.1.24 |trunk Product|Tomcat Native |Tomcat 7 OS||All --- Comment #1 from Mark Thomas --- Moving components. Although the crash happens in the native library the web socket code is the likely culprit here. -- 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
JSSESocketFactory / Windows / Webdav
Hello,
since we've updated to Tomcat 7.0.37 all requests coming from
"Microsoft-WebDAV-MiniRedir/6.1.7601" (Windows Explorer) via SSL run into the
Exception in "org.apache.tomcat.util.net.jsse.JSSESocketFactory" line 197:
if (session.getCipherSuite().equals("SSL_NULL_WITH_NULL_NULL"))
throw new IOException("SSL handshake failed. Ciper suite in SSL
Session is SSL_NULL_WITH_NULL_NULL");
I'm not much of an SSL expert (obviously), but i think this is not the way it's
supposed to be. After a downgrade to Tomcat 7.0.35 it works again (didn't test
7.0.36). When using tomcat-coyote.jar from 7.0.35 with Tomcat 7.0.37 it works
as well.
I guess Tomcat's Webdav implementation won't work over SSL with Windows
Explorer in my current constellation.
Any suggestions?
Best Regards,
Tobias
--
Tobias Fink
Software Engineer
Tel.: 06 21-52 00 78 -- 0 - Fax: 06 21-52 00 78 -- 20
Fasihi GmbH - Sternstr. 166 - 67063 Ludwigshafen
Fasihi GmbH - Sternstr. 166 - 67063 Ludwigshafen
Geschäftsführer Saeid Fasihi - Firmensitz Ludwigshafen a. Rh.
Amtsgericht Ludwigshafen - HRB 60601
Innovationspreisträger Rheinland-Pfalz 2011
Ausgezeichnet für innovative Anwendungen und Verfahren der Informations- und
Kommunikationstechnologien
Besuchen Sie uns auch unter
Homepage: http://www.fasihi.net
Link Innovationspreis: http://www.fasihi.net/innovationspreis
svn commit: r1450836 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/
Author: markt
Date: Wed Feb 27 16:39:41 2013
New Revision: 1450836
URL: http://svn.apache.org/r1450836
Log:
Move towards new programmatic API
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1450836&r1=1450835&r2=1450836&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
Wed Feb 27 16:39:41 2013
@@ -14,6 +14,7 @@
# limitations under the License.
sci.newInstance.fail=Failed to create an Endpoint instance of type [{0}]
serverContainer.endpointDeploy=Endpoint class [{0}] deploying to path [{1}] in
ServletContext [{2}]
+serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not
annotated with @ServerEndpoint
serverContainer.missingEndpoint=An Endpoint instance has been request for path
[{0}] but no matching Endpoint class was found
serverContainer.pojoDeploy=POJO class [{0}] deploying to path [{1}] in
ServletContext [{2}]
serverContainer.servletContextMismatch=Attempted to register a POJO annotated
for WebSocket at path [{0}] in the ServletContext with context path [{1}] when
the WebSocket ServerContainer is allocated to the ServletContext with context
path [{2}]
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1450836&r1=1450835&r2=1450836&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Wed Feb 27 16:39:41 2013
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHa
import javax.servlet.ServletContext;
import javax.servlet.ServletRegistration;
import javax.websocket.DeploymentException;
+import javax.websocket.server.ServerEndpoint;
import javax.websocket.server.ServerEndpointConfiguration;
import javax.websocket.server.ServerEndpointConfigurationBuilder;
@@ -83,6 +84,7 @@ public class ServerContainerImpl extends
public void setServletContext(ServletContext servletContext) {
+
if (this.servletContext == servletContext) {
return;
}
@@ -146,24 +148,17 @@ public class ServerContainerImpl extends
* WebSocket endpoints.
*
* @param pojo The annotated POJO
- * @param ctxt The ServletContext the endpoint is to be published in
- * @param wsPath The path at which the endpoint is to be published
*/
-public void publishServer(Class pojo, ServletContext ctxt,
-String wsPath) {
-if (ctxt == null) {
+public void publishServer(Class pojo) {
+
+ServerEndpoint annotation = pojo.getAnnotation(ServerEndpoint.class);
+if (annotation == null) {
throw new IllegalArgumentException(
-sm.getString("serverContainer.servletContextMissing"));
-}
-// Set the ServletContext if it hasn't already been set
-if (servletContext == null) {
-setServletContext(ctxt);
-} else if (ctxt != servletContext) {
-// Should never happen
-throw new IllegalStateException(sm.getString(
-"serverContainer.servletContextMismatch", wsPath,
-servletContext.getContextPath(), ctxt.getContextPath()));
+sm.getString("serverContainer.missingAnnotation",
+pojo.getName()));
}
+String wsPath = annotation.value();
+
if (log.isDebugEnabled()) {
log.debug(sm.getString("serverContainer.pojoDeploy",
pojo.getName(), wsPath, servletContext.getContextPath()));
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1450836&r1=1450835&r2=1450836&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Wed Feb 27
16:39:41 2013
@@ -43,10 +43,9 @@ public class W
svn commit: r1450839 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/examples/WEB-INF/classes/websocket/echo/
Author: markt
Date: Wed Feb 27 16:50:20 2013
New Revision: 1450839
URL: http://svn.apache.org/r1450839
Log:
Align to proposed method signatures
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Wed Feb 27 16:50:20 2013
@@ -115,10 +115,10 @@ public class ServerContainerImpl extends
* instances
* @throws DeploymentException
*/
-public void publishServer(ServerEndpointConfiguration sec)
+public void deploy(ServerEndpointConfiguration sec)
throws DeploymentException {
if (servletContext == null) {
-throw new IllegalArgumentException(
+throw new DeploymentException(
sm.getString("serverContainer.servletContextMissing"));
}
String path = sec.getPath();
@@ -149,11 +149,11 @@ public class ServerContainerImpl extends
*
* @param pojo The annotated POJO
*/
-public void publishServer(Class pojo) {
+public void deploy(Class pojo) throws DeploymentException {
ServerEndpoint annotation = pojo.getAnnotation(ServerEndpoint.class);
if (annotation == null) {
-throw new IllegalArgumentException(
+throw new DeploymentException(
sm.getString("serverContainer.missingAnnotation",
pojo.getName()));
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Wed Feb 27
16:50:20 2013
@@ -22,6 +22,7 @@ import javax.servlet.ServletContainerIni
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HandlesTypes;
+import javax.websocket.DeploymentException;
import javax.websocket.server.ServerEndpoint;
/**
@@ -45,7 +46,11 @@ public class WsSci implements ServletCon
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(ctx);
for (Class clazz : clazzes) {
-sc.publishServer(clazz);
+try {
+sc.deploy(clazz);
+} catch (DeploymentException e) {
+throw new ServletException(e);
+}
}
}
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Wed Feb 27 16:50:20 2013
@@ -414,7 +414,11 @@ public class TestWsWebSocketContainer ex
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(sce.getServletContext());
-sc.publishServer(BlockingPojo.class);
+try {
+sc.deploy(BlockingPojo.class);
+} catch (DeploymentException e) {
+throw new IllegalStateException(e);
+}
}
}
@@ -520,7 +524,7 @@ public class TestWsWebSocketContainer ex
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
try {
-sc.publishServer(ServerEndpointConfigurationBuilder.create(
+sc.deploy(ServerEndpointConfigurationBuilder.create(
ConstantTxEndpoint.class, PATH).build());
if (TestWsWebSocketContainer.timoutOnContainer) {
sc.setAsyncSendTimeout(TIMEOUT_MS);
Modified: tomcat/trunk/test/org/
[Bug 54615] New: Tomcat 6 doesn't build against ecj 4.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=54615
Bug ID: 54615
Summary: Tomcat 6 doesn't build against ecj 4.x
Product: Tomcat 6
Version: unspecified
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: ltra...@amazon.com
Classification: Unclassified
Tomcat 6 fails to build against ecj 4.x due to unimplemented abstract method
ant -Dbase.path=. -Dbuild.compiler=modern
-Dcommons-collections.jar=/usr/share/java/commons-collections.jar
-Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar
-Dcommons-daemon.jsvc.tar.gz=HACK -Djasper-jdt.jar=/usr/share/java/ecj.jar
-Djdt.jar=/usr/share/java/ecj.jar -Dtomcat-dbcp.jar=commons-dbcp.jar
-Dtomcat-native.tar.gz=HACK -Dcommons-daemon.native.src.tgz=HACK
-Dversion=6.0.36 -Dversion.build=36
Buildfile: /builddir/build/BUILD/apache-tomcat-6.0.36-src/build.xml
build-prepare:
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/classes
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/bin
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/conf
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/lib
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/logs
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/temp
[mkdir] Created dir:
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/build/webapps
compile:
[javac] /builddir/build/BUILD/apache-tomcat-6.0.36-src/build.xml:147:
warning: 'includeantruntime' was not set, defaulting to
build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 1077 source files to
/builddir/build/BUILD/apache-tomcat-6.0.36-src/output/classes
[javac]
/builddir/build/BUILD/apache-tomcat-6.0.36-src/java/org/apache/jasper/compiler/JDTCompiler.java:86:
CompilationUnit is not abstract and does not override abstract method
ignoreOptionalProblems() in
org.eclipse.jdt.internal.compiler.env.ICompilationUnit
[javac] class CompilationUnit implements ICompilationUnit {
[javac] ^
[javac] Note: Some input files use or override a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 1 error
BUILD FAILED
/builddir/build/BUILD/apache-tomcat-6.0.36-src/build.xml:147: Compile failed;
see the compiler error output for details.
Total time: 8 seconds
--
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 54615] Tomcat 6 doesn't build against ecj 4.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 --- Comment #1 from Lee Trager --- Created attachment 29998 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29998&action=edit Add's missing abstract method I copied the missing method from Tomcat 7 which allows Tomcat 6 to build. -- 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 54615] Tomcat 6 doesn't build against ecj 4.x
https://issues.apache.org/bugzilla/show_bug.cgi?id=54615 Lee Trager changed: What|Removed |Added CC||ltra...@amazon.com -- 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] [Created] (MTOMCAT-209) JasperListener not added
Nick Caballero created MTOMCAT-209: -- Summary: JasperListener not added Key: MTOMCAT-209 URL: https://issues.apache.org/jira/browse/MTOMCAT-209 Project: Apache Tomcat Maven Plugin Issue Type: Bug Reporter: Nick Caballero JasperListener is not enabled by default and therefore there is no default factory -- 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: r1450990 - in /tomcat/trunk/java/org/apache/catalina/core: StandardContext.java mbeans-descriptors.xml
Author: rjung
Date: Wed Feb 27 21:59:05 2013
New Revision: 1450990
URL: http://svn.apache.org/r1450990
Log:
Add more status data to the webapp MBean.
Like for processingTime retrieve it by
iterating over the children.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1450990&r1=1450989&r2=1450990&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Feb 27
21:59:05 2013
@@ -4375,6 +4375,96 @@ public class StandardContext extends Con
return result;
}
+/**
+ * Gets the maximum processing time of all servlets in this
+ * StandardContext.
+ *
+ * @return Maximum processing time of all servlets in this
+ * StandardContext
+ */
+public long getMaxTime() {
+
+long result = 0;
+long time;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+time = ((StandardWrapper)children[i]).getMaxTime();
+if (time > result)
+result = time;
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the minimum processing time of all servlets in this
+ * StandardContext.
+ *
+ * @return Minimum processing time of all servlets in this
+ * StandardContext
+ */
+public long getMinTime() {
+
+long result = -1;
+long time;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+time = ((StandardWrapper)children[i]).getMinTime();
+if (result < 0 || time < result)
+result = time;
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the cumulative request count of all servlets in this
+ * StandardContext.
+ *
+ * @return Cumulative request count of all servlets in this
+ * StandardContext
+ */
+public int getRequestCount() {
+
+int result = 0;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+result += ((StandardWrapper)children[i]).getRequestCount();
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the cumulative error count of all servlets in this
+ * StandardContext.
+ *
+ * @return Cumulative error count of all servlets in this
+ * StandardContext
+ */
+public int getErrorCount() {
+
+int result = 0;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+result += ((StandardWrapper)children[i]).getErrorCount();
+}
+}
+
+return result;
+}
+
/**
* Return the real path for a given virtual path, if possible; otherwise
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1450990&r1=1450989&r2=1450990&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Wed Feb
27 21:59:05 2013
@@ -246,6 +246,26 @@
type="long"
writeable="false" />
+
+
+
+
+
+
+
+
svn commit: r1450992 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: rjung
Date: Wed Feb 27 22:04:30 2013
New Revision: 1450992
URL: http://svn.apache.org/r1450992
Log:
Add more status data to the webapp MBean.
Like for processingTime retrieve it by
iterating over the children.
Backport of r1450990 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1450990
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1450992&r1=1450991&r2=1450992&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed
Feb 27 22:04:30 2013
@@ -4494,6 +4494,96 @@ public class StandardContext extends Con
return result;
}
+/**
+ * Gets the maximum processing time of all servlets in this
+ * StandardContext.
+ *
+ * @return Maximum processing time of all servlets in this
+ * StandardContext
+ */
+public long getMaxTime() {
+
+long result = 0;
+long time;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+time = ((StandardWrapper)children[i]).getMaxTime();
+if (time > result)
+result = time;
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the minimum processing time of all servlets in this
+ * StandardContext.
+ *
+ * @return Minimum processing time of all servlets in this
+ * StandardContext
+ */
+public long getMinTime() {
+
+long result = -1;
+long time;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+time = ((StandardWrapper)children[i]).getMinTime();
+if (result < 0 || time < result)
+result = time;
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the cumulative request count of all servlets in this
+ * StandardContext.
+ *
+ * @return Cumulative request count of all servlets in this
+ * StandardContext
+ */
+public int getRequestCount() {
+
+int result = 0;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+result += ((StandardWrapper)children[i]).getRequestCount();
+}
+}
+
+return result;
+}
+
+/**
+ * Gets the cumulative error count of all servlets in this
+ * StandardContext.
+ *
+ * @return Cumulative error count of all servlets in this
+ * StandardContext
+ */
+public int getErrorCount() {
+
+int result = 0;
+
+Container[] children = findChildren();
+if (children != null) {
+for( int i=0; i< children.length; i++ ) {
+result += ((StandardWrapper)children[i]).getErrorCount();
+}
+}
+
+return result;
+}
+
/**
* Return the real path for a given virtual path, if possible; otherwise
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1450992&r1=1450991&r2=1450992&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Wed Feb 27 22:04:30 2013
@@ -264,6 +264,26 @@
type="long"
writeable="false" />
+
+
+
+
+
+
+
+
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1450992&r1=1450991&r2=1450992&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Feb 27 22:04:30 2013
@@ -77,6 +77,10 @@
(scanBootstrapClassPath) to control if the bootstrap
classpath is scanned or not. By default, it will not be scanned.
(markt)
+
+Provide more consolidated servlet MBean data in the webapp MBean.
+(rjung)
+
--
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1082 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] 1450992 Blamelist: rjung Build succeeded! sincerely, -The Buildbot
[Tomcat Wiki] Trivial Update of "FAQ/Monitoring" by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/Monitoring" page has been changed by ChristopherSchultz: http://wiki.apache.org/tomcat/FAQ/Monitoring?action=diff&rev1=8&rev2=9 Comment: Typo === JNDI DataSource === - * JMX Bean: `Catalina:type=DataSource,context=/[context name],host=[hostname],class=javax.sql.DataSource,name="[JNDI name]" + * JMX Bean: `Catalina:type=DataSource,context=/[context name],host=[hostname],class=javax.sql.DataSource,name="[JNDI name]"` * Attributes: `numActive`, `numIdle` = External Monitoring Tools = - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FAQ/Monitoring" by ChristopherSchultz
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "FAQ/Monitoring" page has been changed by ChristopherSchultz:
http://wiki.apache.org/tomcat/FAQ/Monitoring?action=diff&rev1=9&rev2=10
Comment:
Added information about ThreadPool.
{{{#!wiki caution
Version Warning
- These JMX bean names are accurate for the current version of Tomcat 7 (7.0.28
at the time of this writing). If you are using a different version of Tomcat,
you may have to adjust the names of the beans identified on this page.
+ These JMX bean names are accurate for the current version of Tomcat 7 (7.0.37
at the time of this writing). If you are using a different version of Tomcat,
you may have to adjust the names of the beans identified on this page.
}}}
=== Thread Usage ===
@@ -38, +38 @@
* Attributes: `poolSize`, `activeCount`
This is the number of threads currently in the executor's thread pool.
Obviously, this is only useful if you are using an (which you
''are'' using, of course, right?).
+
+ Not using an Executor
+
+ * JMX Bean: `Catalina: type=ThreadPool,name="[depends]"`
+ * Attributes: `maxThreads`, `connectionCount`
+
+ This information is largely useless in Tomcat 7, as an Executor is always
used and the data can be found there, while the ThreadPool has only initial
configuration information: the real-time data is available from the Executor's
MBean.
=== Request Throughput ===
@@ -48, +55 @@
=== Sessions ===
* JMX Bean: `Catalina:type=Manager,context=[context name],host=[hostname]`
+ * Attributes: `activeSessions`, `sessionCounter`, `expiredSessions`
- * Attributes: `activeSessions`
-
=== JNDI DataSource ===
- * JMX Bean: `Catalina:type=DataSource,context=/[context
name],host=[hostname],class=javax.sql.DataSource,name="[JNDI name]"`
+ * JMX Bean: `Catalina:type=DataSource,context=[context
name],host=[hostname],class=javax.sql.DataSource,name="[JNDI name]"`
* Attributes: `numActive`, `numIdle`
= External Monitoring Tools =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1451053 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Author: markt
Date: Thu Feb 28 00:25:01 2013
New Revision: 1451053
URL: http://svn.apache.org/r1451053
Log:
Refactor to make the fix for BZ54585 cleaner
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1451053&r1=1451052&r2=1451053&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu Feb 28
00:25:01 2013
@@ -811,40 +811,9 @@ public class WebappLoader extends Lifecy
// Assemble the class path information from our class loader chain
ClassLoader loader = getClassLoader();
-int n = 0;
while (loader != null) {
-if (!(loader instanceof URLClassLoader)) {
-String cp=getClasspath( loader );
-if( cp==null ) {
-log.info( "Unknown loader " + loader + " " +
loader.getClass());
-} else {
-if (n > 0)
-classpath.append(File.pathSeparator);
-classpath.append(cp);
-n++;
-}
+if (!buildClassPath(servletContext, classpath, loader)) {
break;
-//continue;
-}
-URL repositories[] =
-((URLClassLoader) loader).getURLs();
-for (int i = 0; i < repositories.length; i++) {
-String repository = repositories[i].toString();
-if (repository.startsWith("file://"))
-repository = utf8Decode(repository.substring(7));
-else if (repository.startsWith("file:"))
-repository = utf8Decode(repository.substring(5));
-else if (repository.startsWith("jndi:"))
-repository =
-servletContext.getRealPath(repository.substring(5));
-else
-continue;
-if (repository == null)
-continue;
-if (n > 0)
-classpath.append(File.pathSeparator);
-classpath.append(repository);
-n++;
}
loader = loader.getParent();
}
@@ -857,6 +826,43 @@ public class WebappLoader extends Lifecy
}
+
+private boolean buildClassPath(ServletContext servletContext,
+StringBuilder classpath, ClassLoader loader) {
+if (loader instanceof URLClassLoader) {
+URL repositories[] =
+((URLClassLoader) loader).getURLs();
+for (int i = 0; i < repositories.length; i++) {
+String repository = repositories[i].toString();
+if (repository.startsWith("file://"))
+repository = utf8Decode(repository.substring(7));
+else if (repository.startsWith("file:"))
+repository = utf8Decode(repository.substring(5));
+else if (repository.startsWith("jndi:"))
+repository =
+
servletContext.getRealPath(repository.substring(5));
+else
+continue;
+if (repository == null)
+continue;
+if (classpath.length() > 0)
+classpath.append(File.pathSeparator);
+classpath.append(repository);
+}
+} else {
+String cp = getClasspath(loader);
+if (cp == null) {
+log.info( "Unknown loader " + loader + " " +
loader.getClass());
+} else {
+if (classpath.length() > 0)
+classpath.append(File.pathSeparator);
+classpath.append(cp);
+}
+return false;
+}
+return true;
+}
+
private String utf8Decode(String input) {
String result = null;
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1451061 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Author: markt
Date: Thu Feb 28 00:36:50 2013
New Revision: 1451061
URL: http://svn.apache.org/r1451061
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54585
Take account of setting of delegate when building the class path that is passed
to Jasper
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1451061&r1=1451060&r2=1451061&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu Feb 28
00:36:50 2013
@@ -811,6 +811,12 @@ public class WebappLoader extends Lifecy
// Assemble the class path information from our class loader chain
ClassLoader loader = getClassLoader();
+
+if (delegate && loader != null) {
+// Skip the webapp loader for now as delegation is enabled
+loader = loader.getParent();
+}
+
while (loader != null) {
if (!buildClassPath(servletContext, classpath, loader)) {
break;
@@ -818,6 +824,14 @@ public class WebappLoader extends Lifecy
loader = loader.getParent();
}
+if (delegate) {
+// Delegation was enabled, go back and add the webapp paths
+loader = getClassLoader();
+if (loader != null) {
+buildClassPath(servletContext, classpath, loader);
+}
+}
+
this.classpath=classpath.toString();
// Store the assembled class path as a servlet context attribute
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1451063 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
Author: markt
Date: Thu Feb 28 00:44:44 2013
New Revision: 1451063
URL: http://svn.apache.org/r1451063
Log:
Remove trailing whitespace. Prep for BZ54585 fix.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1451063&r1=1451062&r2=1451063&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu
Feb 28 00:44:44 2013
@@ -5,9 +5,9 @@
* 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.
@@ -148,7 +148,7 @@ public class WebappLoader extends Lifecy
/**
* The Java class name of the ClassLoader implementation to be used.
- * This class should extend WebappClassLoader, otherwise, a different
+ * This class should extend WebappClassLoader, otherwise, a different
* loader implementation must be used.
*/
private String loaderClass =
@@ -440,7 +440,7 @@ public class WebappLoader extends Lifecy
/**
* Return the set of repositories defined for this class loader.
* If none are defined, a zero-length array is returned.
- * For security reason, returns a clone of the Array (since
+ * For security reason, returns a clone of the Array (since
* String are immutable).
*/
@Override
@@ -481,7 +481,7 @@ public class WebappLoader extends Lifecy
}
-/**
+/**
* Classpath, as set in org.apache.catalina.jsp_classpath context
* property
*
@@ -558,7 +558,7 @@ public class WebappLoader extends Lifecy
setState(LifecycleState.STARTING);
return;
}
-
+
// Register a stream handler factory for the JNDI protocol
URLStreamHandlerFactory streamHandlerFactory =
DirContextURLStreamHandlerFactory.getInstance();
@@ -572,7 +572,7 @@ public class WebappLoader extends Lifecy
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
// This is likely a dual registration
-log.info("Dual registration of jndi stream handler: "
+log.info("Dual registration of jndi stream handler: "
+ t.getMessage());
}
}
@@ -617,7 +617,7 @@ public class WebappLoader extends Lifecy
String contextName = ctx.getName();
if (!contextName.startsWith("/")) {
contextName = "/" + contextName;
-}
+}
ObjectName cloname = new ObjectName
(MBeanUtils.getDomain(ctx) + ":type=WebappClassLoader,context="
+ contextName + ",host=" + ctx.getParent().getName());
@@ -668,7 +668,7 @@ public class WebappLoader extends Lifecy
String contextName = ctx.getName();
if (!contextName.startsWith("/")) {
contextName = "/" + contextName;
-}
+}
ObjectName cloname = new ObjectName
(MBeanUtils.getDomain(ctx) + ":type=WebappClassLoader,context="
+ contextName + ",host=" + ctx.getParent().getName());
@@ -758,7 +758,7 @@ public class WebappLoader extends Lifecy
classLoader.addPermission
(new FilePermission(workDirPath, "read,write"));
classLoader.addPermission
-(new FilePermission(workDirPath + File.separator + "-",
+(new FilePermission(workDirPath + File.separator + "-",
"read,write,delete"));
} catch (IOException e) {
// Ignore
@@ -833,7 +833,7 @@ public class WebappLoader extends Lifecy
/**
* Configure the repositories for our class loader, based on the
* associated Context.
- * @throws IOException
+ * @throws IOException
*/
private void setRepositories() throws IOException {
@@ -852,7 +852,7 @@ public class WebappLoader extends Lifecy
log.info("No work dir for " + servletContext);
}
-if( log.isDebugEnabled() && workDir != null)
+if( log.isDebugEnabled() && workDir != null)
log.debug(sm.getString("webappLoader.deploy",
workDir.getAbsolutePath()));
svn commit: r1451065 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappLoader.java webapps/docs/changelog.xml
Author: markt
Date: Thu Feb 28 00:53:29 2013
New Revision: 1451065
URL: http://svn.apache.org/r1451065
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54585
Take account of setting of delegate when building the class path that is passed
to Jasper
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1451053,1451061
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1451065&r1=1451064&r2=1451065&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu
Feb 28 00:53:29 2013
@@ -1041,44 +1041,27 @@ public class WebappLoader extends Lifecy
// Assemble the class path information from our class loader chain
ClassLoader loader = getClassLoader();
-int n = 0;
+
+if (delegate && loader != null) {
+// Skip the webapp loader for now as delegation is enabled
+loader = loader.getParent();
+}
+
while (loader != null) {
-if (!(loader instanceof URLClassLoader)) {
-String cp=getClasspath( loader );
-if( cp==null ) {
-log.info( "Unknown loader " + loader + " " +
loader.getClass());
-} else {
-if (n > 0)
-classpath.append(File.pathSeparator);
-classpath.append(cp);
-n++;
-}
+if (!buildClassPath(servletContext, classpath, loader)) {
break;
-//continue;
-}
-URL repositories[] =
-((URLClassLoader) loader).getURLs();
-for (int i = 0; i < repositories.length; i++) {
-String repository = repositories[i].toString();
-if (repository.startsWith("file://"))
-repository = utf8Decode(repository.substring(7));
-else if (repository.startsWith("file:"))
-repository = utf8Decode(repository.substring(5));
-else if (repository.startsWith("jndi:"))
-repository =
-servletContext.getRealPath(repository.substring(5));
-else
-continue;
-if (repository == null)
-continue;
-if (n > 0)
-classpath.append(File.pathSeparator);
-classpath.append(repository);
-n++;
}
loader = loader.getParent();
}
+if (delegate) {
+// Delegation was enabled, go back and add the webapp paths
+loader = getClassLoader();
+if (loader != null) {
+buildClassPath(servletContext, classpath, loader);
+}
+}
+
this.classpath=classpath.toString();
// Store the assembled class path as a servlet context attribute
@@ -1087,6 +1070,43 @@ public class WebappLoader extends Lifecy
}
+
+private boolean buildClassPath(ServletContext servletContext,
+StringBuilder classpath, ClassLoader loader) {
+if (loader instanceof URLClassLoader) {
+URL repositories[] =
+((URLClassLoader) loader).getURLs();
+for (int i = 0; i < repositories.length; i++) {
+String repository = repositories[i].toString();
+if (repository.startsWith("file://"))
+repository = utf8Decode(repository.substring(7));
+else if (repository.startsWith("file:"))
+repository = utf8Decode(repository.substring(5));
+else if (repository.startsWith("jndi:"))
+repository =
+
servletContext.getRealPath(repository.substring(5));
+else
+continue;
+if (repository == null)
+continue;
+if (classpath.length() > 0)
+classpath.append(File.pathSeparator);
+classpath.append(repository);
+}
+} else {
+String cp = getClasspath(loader);
+if (cp == null) {
+log.info( "Unknown loader " + loader + " " +
loader.getClass());
+} else {
+if (classpath.length() > 0)
+classp
[Bug 54585] WebappLoader doesn't honor delegate attr while constructing jsp_classpath
https://issues.apache.org/bugzilla/show_bug.cgi?id=54585 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 7.0.x and 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4000 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1451053 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 54602] B2CConverter character decode underflow leaves bytes in buffer
https://issues.apache.org/bugzilla/show_bug.cgi?id=54602 --- Comment #1 from Mark Thomas --- I do see code that is meant to recycle the converter. Do you have a test case / can you write a Tomcat unit test that demonstrates that the converter isn't being recycled? Incomplete byte sequences should result in a 400 response. I'll take a look at why this isn't happening. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot 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/1083 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] 1451063 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1451105 - in /tomcat/trunk/test/org/apache/tomcat/util/net: localhost-cert.pem localhost-copy1.jks localhost-key.pem localhost.jks user1.jks
Author: markt Date: Thu Feb 28 05:46:57 2013 New Revision: 1451105 URL: http://svn.apache.org/r1451105 Log: New certs. Same DNs. Same CNs. Expiry in ~2 years Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem tomcat/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks tomcat/trunk/test/org/apache/tomcat/util/net/localhost-key.pem tomcat/trunk/test/org/apache/tomcat/util/net/localhost.jks tomcat/trunk/test/org/apache/tomcat/util/net/user1.jks Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem?rev=1451105&r1=1451104&r2=1451105&view=diff == --- tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem Thu Feb 28 05:46:57 2013 @@ -1,35 +1,35 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 4096 (0x1000) -Signature Algorithm: sha1WithRSAEncryption +Serial Number: 4099 (0x1003) +Signature Algorithm: sha1WithRSAEncryption Issuer: C=US, CN=ca-test.tomcat.apache.org Validity -Not Before: Feb 28 23:10:55 2011 GMT -Not After : Feb 27 23:10:55 2013 GMT +Not Before: Feb 28 05:28:42 2013 GMT +Not After : Feb 28 05:28:42 2015 GMT Subject: C=US, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption -RSA Public Key: (2048 bit) -Modulus (2048 bit): -00:b0:e3:8b:82:f8:b1:82:d9:b1:e8:e8:08:fd:3c: -8a:14:d1:cd:a1:b7:d8:f8:58:93:46:54:c2:6b:b3: -52:fe:ae:7f:a5:70:9e:6c:cf:1f:c7:fb:d7:c2:c2: -5d:0f:18:c9:66:2a:c4:8a:57:ca:0e:4d:b0:0b:af: -1b:26:e9:ad:dd:95:86:69:e4:ac:60:9d:b9:ae:65: -aa:d4:9d:3b:02:19:31:60:df:c3:3e:a5:85:cd:49: -01:12:84:36:4c:02:f5:9c:38:b2:20:bf:43:1d:5f: -0c:ae:86:5a:67:24:65:74:77:fa:f4:cd:04:9f:8c: -c0:f2:5e:4f:bf:db:da:ce:d2:db:a6:51:82:40:ce: -62:0c:9b:5e:d3:10:7b:49:d5:7a:c9:8e:bf:4b:b8: -e3:ac:30:ed:d8:b7:25:1c:c5:5c:0e:1e:57:7c:ad: -60:44:ba:65:6d:45:26:e4:08:a2:1f:c9:3a:cf:7d: -bc:e5:61:23:ea:3e:19:46:f0:16:f8:26:e5:32:c6: -69:e5:ea:18:62:2e:05:65:93:49:23:45:11:c3:da: -4c:3b:b4:c6:4a:72:ea:0b:e9:26:06:2c:69:4d:e7: -b2:a5:3d:54:ae:7f:17:d3:63:8f:d8:36:5b:46:43: -af:bc:c1:09:fc:98:e1:4f:be:74:68:a2:3e:d5:21: -31:d3 +Public-Key: (2048 bit) +Modulus: +00:e7:6f:79:3f:18:87:91:dd:27:98:34:24:79:58: +47:f9:c2:69:2b:d8:5b:c0:e0:bb:4a:57:d6:00:b5: +bb:6a:b0:66:84:5c:b8:f0:12:0a:27:27:32:9c:82: +2a:2f:0f:69:77:a6:e9:0d:df:64:31:51:c0:41:1e: +dc:d4:74:51:9c:a3:b8:51:13:58:73:ee:21:9c:f9: +63:82:1b:c2:2c:49:c3:09:70:ff:a9:f3:af:a2:0c: +0b:60:2f:6a:db:a5:01:45:3e:34:90:8e:67:69:eb: +45:f3:34:29:85:db:39:8a:99:c2:0f:72:15:21:fd: +54:35:a6:7b:a7:30:cb:1e:4d:3d:32:24:c6:4b:84: +4f:5f:60:ff:64:5e:68:ca:d8:fa:de:98:7d:40:04: +60:b7:ae:50:ec:c8:8c:ae:dd:94:81:41:18:5b:03: +63:0f:2b:02:63:0a:95:6a:ed:7e:68:e6:b6:d5:56: +e9:4e:60:ea:1d:95:58:33:be:a2:12:55:cb:7f:9c: +c4:97:0b:db:c0:94:09:2a:b3:9f:e1:6b:78:0d:63: +1a:41:d5:6b:db:d8:48:59:04:88:d1:11:d5:e7:45: +28:0e:7c:1b:78:75:20:7d:ff:7f:e1:d6:ea:e4:c5: +51:77:41:42:30:4b:ff:29:33:3d:89:58:94:69:5b: +70:27 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: @@ -37,43 +37,43 @@ Certificate: Netscape Comment: OpenSSL Generated Certificate X509v3 Subject Key Identifier: -36:5C:54:F4:2E:91:6D:E7:BC:DD:94:C7:F8:D7:55:01:4A:F7:7D:CD +30:DB:AB:70:94:34:CA:FD:75:46:AB:CE:E2:4A:A9:9E:74:BC:69:BB X509v3 Authority Key Identifier: keyid:B0:3B:BC:C9:FA:28:5F:3E:04:1F:9B:6C:C7:8B:68:D8:01:B0:F8:3D Signature Algorithm: sha1WithRSAEncryption -30:d5:b3:07:2d:04:25:9b:f1:20:bb:91:49:dc:3d:bf:7e:1c: -2d:09:01:87:a0:30:2b:50:fe:3b:17:34:c6:1d:fa:51:c0:b3: -af:f5:62:a6:de:3a:bf:6c:f7:07:e6:80:26:08:d1:84:5b:a3: -5a:0c:6a:07:de:d6:26:1d:c1:89:ed:8a:15:1d:1a:36:0c:13: -db:ab:7c:43:35:0b:c2:c6:63:a6:43:81:ce:e5:52:28:cd:ee:
svn commit: r1451106 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/net/
Author: markt Date: Thu Feb 28 05:48:58 2013 New Revision: 1451106 URL: http://svn.apache.org/r1451106 Log: New certs. Same DNs. Same CNs. Expiry in ~2 years Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-copy1.jks tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost.jks tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/user1.jks Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1451105 Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem?rev=1451106&r1=1451105&r2=1451106&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem Thu Feb 28 05:48:58 2013 @@ -1,35 +1,35 @@ Certificate: Data: Version: 3 (0x2) -Serial Number: 4096 (0x1000) -Signature Algorithm: sha1WithRSAEncryption +Serial Number: 4099 (0x1003) +Signature Algorithm: sha1WithRSAEncryption Issuer: C=US, CN=ca-test.tomcat.apache.org Validity -Not Before: Feb 28 23:10:55 2011 GMT -Not After : Feb 27 23:10:55 2013 GMT +Not Before: Feb 28 05:28:42 2013 GMT +Not After : Feb 28 05:28:42 2015 GMT Subject: C=US, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption -RSA Public Key: (2048 bit) -Modulus (2048 bit): -00:b0:e3:8b:82:f8:b1:82:d9:b1:e8:e8:08:fd:3c: -8a:14:d1:cd:a1:b7:d8:f8:58:93:46:54:c2:6b:b3: -52:fe:ae:7f:a5:70:9e:6c:cf:1f:c7:fb:d7:c2:c2: -5d:0f:18:c9:66:2a:c4:8a:57:ca:0e:4d:b0:0b:af: -1b:26:e9:ad:dd:95:86:69:e4:ac:60:9d:b9:ae:65: -aa:d4:9d:3b:02:19:31:60:df:c3:3e:a5:85:cd:49: -01:12:84:36:4c:02:f5:9c:38:b2:20:bf:43:1d:5f: -0c:ae:86:5a:67:24:65:74:77:fa:f4:cd:04:9f:8c: -c0:f2:5e:4f:bf:db:da:ce:d2:db:a6:51:82:40:ce: -62:0c:9b:5e:d3:10:7b:49:d5:7a:c9:8e:bf:4b:b8: -e3:ac:30:ed:d8:b7:25:1c:c5:5c:0e:1e:57:7c:ad: -60:44:ba:65:6d:45:26:e4:08:a2:1f:c9:3a:cf:7d: -bc:e5:61:23:ea:3e:19:46:f0:16:f8:26:e5:32:c6: -69:e5:ea:18:62:2e:05:65:93:49:23:45:11:c3:da: -4c:3b:b4:c6:4a:72:ea:0b:e9:26:06:2c:69:4d:e7: -b2:a5:3d:54:ae:7f:17:d3:63:8f:d8:36:5b:46:43: -af:bc:c1:09:fc:98:e1:4f:be:74:68:a2:3e:d5:21: -31:d3 +Public-Key: (2048 bit) +Modulus: +00:e7:6f:79:3f:18:87:91:dd:27:98:34:24:79:58: +47:f9:c2:69:2b:d8:5b:c0:e0:bb:4a:57:d6:00:b5: +bb:6a:b0:66:84:5c:b8:f0:12:0a:27:27:32:9c:82: +2a:2f:0f:69:77:a6:e9:0d:df:64:31:51:c0:41:1e: +dc:d4:74:51:9c:a3:b8:51:13:58:73:ee:21:9c:f9: +63:82:1b:c2:2c:49:c3:09:70:ff:a9:f3:af:a2:0c: +0b:60:2f:6a:db:a5:01:45:3e:34:90:8e:67:69:eb: +45:f3:34:29:85:db:39:8a:99:c2:0f:72:15:21:fd: +54:35:a6:7b:a7:30:cb:1e:4d:3d:32:24:c6:4b:84: +4f:5f:60:ff:64:5e:68:ca:d8:fa:de:98:7d:40:04: +60:b7:ae:50:ec:c8:8c:ae:dd:94:81:41:18:5b:03: +63:0f:2b:02:63:0a:95:6a:ed:7e:68:e6:b6:d5:56: +e9:4e:60:ea:1d:95:58:33:be:a2:12:55:cb:7f:9c: +c4:97:0b:db:c0:94:09:2a:b3:9f:e1:6b:78:0d:63: +1a:41:d5:6b:db:d8:48:59:04:88:d1:11:d5:e7:45: +28:0e:7c:1b:78:75:20:7d:ff:7f:e1:d6:ea:e4:c5: +51:77:41:42:30:4b:ff:29:33:3d:89:58:94:69:5b: +70:27 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: @@ -37,43 +37,43 @@ Certificate: Netscape Comment: OpenSSL Generated Certificate X509v3 Subject Key Identifier: -36:5C:54:F4:2E:91:6D:E7:BC:DD:94:C7:F8:D7:55:01:4A:F7:7D:CD +30:DB:AB:70:94:34:CA:FD:75:46:AB:CE:E2:4A:A9:9E:74:BC:69:BB X509v3 Authority Key Identifier: keyid:B0:3B:BC:C9:FA:28:5F:3E:04:1F:9B:6C:C7:8B:68:D8:01:B0:F8:3D Signature Algorithm: sha1WithRSAEncryption -30:d5:b3:07:2d:04:25:9b:f1:20:bb:91:49:dc:3d:bf
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1085 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] 1451106 Blamelist: markt Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4002 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1451105 Blamelist: markt Build succeeded! sincerely, -The Buildbot
