[Bug 53186] JIoEndpoint LimitLatch will leak if setsockopt is called on a closed socket on Solaris
https://issues.apache.org/bugzilla/show_bug.cgi?id=53186 --- Comment #3 from Pid --- I concur, but I'd suggest we leave it open for Filip to review. -- You are receiving this mail because: You are the assignee for the bug.
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 21 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-04052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-04052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-04052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-04052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-04052012.jar:/srv/gump/ public/workspace/junit/dist/junit-04052012.jar - [junit] May 4, 2012 7:05:12 AM org.apache.catalina.startup.Contex
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 24 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-04052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-04052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-04052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org .eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-04052012.jar:/srv/gump/public/workspace
svn commit: r1333827 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: markt
Date: Fri May 4 09:43:38 2012
New Revision: 1333827
URL: http://svn.apache.org/viewvc?rev=1333827&view=rev
Log:
Use a proper URL else attempts to external entities will fail.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1333827&r1=1333826&r2=1333827&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Fri May 4
09:43:38 2012
@@ -451,7 +451,7 @@ public class Catalina {
FileInputStream fis = null;
try {
InputSource is =
-new InputSource("file://" + file.getAbsolutePath());
+new InputSource(file.toURI().toURL().toString());
fis = new FileInputStream(file);
is.setByteStream(fis);
digester.push(this);
@@ -539,7 +539,7 @@ public class Catalina {
try {
file = configFile();
inputStream = new FileInputStream(file);
-inputSource = new InputSource("file://" + file.getAbsolutePath());
+inputSource = new InputSource(file.toURI().toURL().toString());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("catalina.configFail", file), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1333829 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt
Date: Fri May 4 09:46:59 2012
New Revision: 1333829
URL: http://svn.apache.org/viewvc?rev=1333829&view=rev
Log:
Use a proper URL else attempts to external entities will fail.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1333827
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1333829&r1=1333828&r2=1333829&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Fri May
4 09:46:59 2012
@@ -454,7 +454,7 @@ public class Catalina {
FileInputStream fis = null;
try {
InputSource is =
-new InputSource("file://" + file.getAbsolutePath());
+new InputSource(file.toURI().toURL().toString());
fis = new FileInputStream(file);
is.setByteStream(fis);
digester.push(this);
@@ -542,7 +542,7 @@ public class Catalina {
try {
file = configFile();
inputStream = new FileInputStream(file);
-inputSource = new InputSource("file://" + file.getAbsolutePath());
+inputSource = new InputSource(file.toURI().toURL().toString());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("catalina.configFail", file), e);
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=1333829&r1=1333828&r2=1333829&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri May 4 09:46:59 2012
@@ -80,6 +80,11 @@
DefaultInstanceManager by trimming annotation lists
to their size. (kkolinko)
+
+Correctly configure the parser used to process server.xml so that
+external entities may be used to include the content of external files
+into server.xml. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53112] Following asynchronous responses do not contain set response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=53112 --- Comment #2 from Stig Runar Vangen --- Created attachment 28729 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28729&action=edit Tomcat backend for XMPP connection -- You are receiving this mail because: You are the assignee for the bug.
[Bug 53112] Following asynchronous responses do not contain set response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=53112 --- Comment #3 from Stig Runar Vangen --- Created attachment 28730 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28730&action=edit Jetty backend for XMPP connection -- You are receiving this mail because: You are the assignee for the bug.
[Bug 53112] Following asynchronous responses do not contain set response headers
https://issues.apache.org/bugzilla/show_bug.cgi?id=53112 --- Comment #4 from Stig Runar Vangen --- My original report might not have been too clear. I'll try to clearify a bit. I've added two attachments to this bug, logs that describes how both Jetty and Tomcat handles the same code for handling XMPP requests. First off, with "request" I meant several blocks of communication back and forth between the server and client in the same HTTP request. Using async communication, it is possible to leave the connection open, and let the client and server talk to eachother at any time. Between each communication block, the request is "ended" as a normal request would be, using the content-length header to determine where the request and response ends. This is supported by both Tomcat and Jetty. The difference is that while Jetty correctly hands out the headers you configure every single time, this only works for the first block for Tomcat. The request would work as follows: * Client connects to server to servlet defined with async support * Client sends first request as normal * Server responds with content-length * AsyncContext.dispatch() * Client reads response, leaves connection open * Client sends new "request" in the same manner as last time * Server again responds with content-length * AsyncContext.dispatch() * Client reads response, leaves connection open ... This is how I've understood that this should work, and this is how Jetty currently does it. It might be that I'm wrong, so please correct me. -- You are receiving this mail because: You are the assignee for the bug.
[jira] [Created] (MTOMCAT-150) expose ports used with tomcat7:run as sys props
Olivier Lamy (*$^¨%`£) created MTOMCAT-150: -- Summary: expose ports used with tomcat7:run as sys props Key: MTOMCAT-150 URL: https://issues.apache.org/jira/browse/MTOMCAT-150 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Reporter: Olivier Lamy (*$^¨%`£) Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.0 For folks using port 0 (auto allocation), they need to know which port is really use. Do exposing sys props * tomcat.maven.http.port * tomcat.maven.https.port * tomcat.maven.ajp.port -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1333926 - in /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run: AbstractRunMojo.java RunMojo.java
Author: olamy
Date: Fri May 4 13:05:53 2012
New Revision: 1333926
URL: http://svn.apache.org/viewvc?rev=1333926&view=rev
Log:
[MTOMCAT-150] expose ports used with tomcat7:run as sys props
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1333926&r1=1333925&r2=1333926&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Fri May 4 13:05:53 2012
@@ -372,6 +372,13 @@ public abstract class AbstractRunMojo
*/
protected String classLoaderClass;
+/**
+ * @parameter default-value="${session}"
+ * @readonly
+ * @required
+ */
+protected MavenSession session;
+
// --
// Fields
// --
@@ -863,7 +870,6 @@ public abstract class AbstractRunMojo
embeddedTomcat.setDefaultRealm( memoryRealm );
-
Context ctx = createContext( embeddedTomcat );
if ( useNaming )
@@ -871,7 +877,6 @@ public abstract class AbstractRunMojo
embeddedTomcat.enableNaming();
}
-
embeddedTomcat.getHost().setAppBase( new File(
configurationDir, "webapps" ).getAbsolutePath() );
createStaticContext( embeddedTomcat, ctx,
embeddedTomcat.getHost() );
@@ -896,9 +901,10 @@ public abstract class AbstractRunMojo
embeddedTomcat.getHost().getPipeline().addValve( alv );
// create https connector
+Connector httpsConnector = null;
if ( httpsPort > 0 )
{
-Connector httpsConnector = new Connector( protocol );
+httpsConnector = new Connector( protocol );
httpsConnector.setPort( httpsPort );
httpsConnector.setSecure( true );
httpsConnector.setProperty( "SSLEnabled", "true" );
@@ -921,9 +927,10 @@ public abstract class AbstractRunMojo
}
// create ajp connector
+Connector ajpConnector = null;
if ( ajpPort > 0 )
{
-Connector ajpConnector = new Connector( ajpProtocol );
+ajpConnector = new Connector( ajpProtocol );
ajpConnector.setPort( ajpPort );
ajpConnector.setURIEncoding( uriEncoding );
embeddedTomcat.getEngine().getService().addConnector(
ajpConnector );
@@ -941,6 +948,25 @@ public abstract class AbstractRunMojo
}
embeddedTomcat.start();
+
+session.getExecutionProperties().put( "tomcat.maven.http.port",
+ Integer.toString(
connector.getLocalPort() ) );
+System.setProperty( "tomcat.maven.http.port",
Integer.toString( connector.getLocalPort() ) );
+
+if ( httpsConnector != null )
+{
+session.getExecutionProperties().put(
"tomcat.maven.https.port",
+ Integer.toString(
httpsConnector.getLocalPort() ) );
+System.setProperty( "tomcat.maven.https.port",
Integer.toString( httpsConnector.getLocalPort() ) );
+}
+
+if ( ajpConnector != null )
+{
+session.getExecutionProperties().put(
"tomcat.maven.ajp.port",
+ Integer.toString(
ajpConnector.getLocalPort() ) );
+System.setProperty( "tomcat.maven.ajp.port",
Integer.toString( ajpConnector.getLocalPort() ) );
+}
+
EmbeddedRegistry.getInstance().register( embeddedTomcat );
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1333926&r1=1333925&r2=1333926&view=diff
svn commit: r1333928 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Fri May 4 13:06:08 2012
New Revision: 1333928
URL: http://svn.apache.org/viewvc?rev=1333928&view=rev
Log:
[MTOMCAT-150] expose ports used with tomcat7:run as sys props: add javadoc
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1333928&r1=1333927&r2=1333928&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Fri May 4 13:06:08 2012
@@ -109,6 +109,7 @@ public abstract class AbstractRunMojo
/**
* The port to run the Tomcat server on.
+ * Will be exposed as System props and session.executionProperties with
key tomcat.maven.http.port
*
* @parameter expression="${maven.tomcat.port}" default-value="8080"
*/
@@ -118,6 +119,7 @@ public abstract class AbstractRunMojo
* The AJP port to run the Tomcat server on.
* By default it's 0 this means won't be started.
* The ajp connector will be started only for value > 0.
+ * Will be exposed as System props and session.executionProperties with
key tomcat.maven.ajp.port
*
* @parameter expression="${maven.tomcat.ajp.port}" default-value="0"
* @since 2.0
@@ -143,6 +145,7 @@ public abstract class AbstractRunMojo
* The https port to run the Tomcat server on.
* By default it's 0 this means won't be started.
* The https connector will be started only for value > 0.
+ * Will be exposed as System props and session.executionProperties with
key tomcat.maven.https.port
*
* @parameter expression="${maven.tomcat.httpsPort}" default-value="0"
* @since 1.0
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1333929 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Fri May 4 13:06:23 2012
New Revision: 1333929
URL: http://svn.apache.org/viewvc?rev=1333929&view=rev
Log:
[MTOMCAT-150] expose ports used with tomcat7:run as sys props: feature to dump
ports in a property file to be able to use later with a forked surefire
execution
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1333929&r1=1333928&r2=1333929&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Fri May 4 13:06:23 2012
@@ -31,6 +31,7 @@ import org.apache.catalina.startup.Catal
import org.apache.catalina.startup.CatalinaProperties;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -69,6 +70,7 @@ import javax.xml.stream.XMLStreamReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -78,6 +80,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
/**
@@ -382,6 +385,14 @@ public abstract class AbstractRunMojo
*/
protected MavenSession session;
+/**
+ * Will dump port in a properties file (see ports for property names).
+ * If empty no file generated
+ *
+ * @parameter expression="${maven.tomcat.propertiesPortFilePath}"
+ */
+protected String propertiesPortFilePath;
+
// --
// Fields
// --
@@ -952,6 +963,10 @@ public abstract class AbstractRunMojo
embeddedTomcat.start();
+Properties portProperties = new Properties();
+
+portProperties.put( "tomcat.maven.http.port",
Integer.toString( connector.getLocalPort() ) );
+
session.getExecutionProperties().put( "tomcat.maven.http.port",
Integer.toString(
connector.getLocalPort() ) );
System.setProperty( "tomcat.maven.http.port",
Integer.toString( connector.getLocalPort() ) );
@@ -960,6 +975,7 @@ public abstract class AbstractRunMojo
{
session.getExecutionProperties().put(
"tomcat.maven.https.port",
Integer.toString(
httpsConnector.getLocalPort() ) );
+portProperties.put( "tomcat.maven.https.port",
Integer.toString( connector.getLocalPort() ) );
System.setProperty( "tomcat.maven.https.port",
Integer.toString( httpsConnector.getLocalPort() ) );
}
@@ -967,8 +983,26 @@ public abstract class AbstractRunMojo
{
session.getExecutionProperties().put(
"tomcat.maven.ajp.port",
Integer.toString(
ajpConnector.getLocalPort() ) );
+portProperties.put( "tomcat.maven.ajp.port",
Integer.toString( ajpConnector.getLocalPort() ) );
System.setProperty( "tomcat.maven.ajp.port",
Integer.toString( ajpConnector.getLocalPort() ) );
}
+if ( propertiesPortFilePath != null )
+{
+File propertiesPortsFile = new File(
propertiesPortFilePath );
+if ( propertiesPortsFile.exists() )
+{
+propertiesPortsFile.delete();
+}
+FileOutputStream fileOutputStream = new FileOutputStream(
propertiesPortsFile );
+try
+{
+portProperties.store( fileOutputStream, "Apache Tomcat
Maven plugin port used" );
+}
+finally
+{
+IOUtils.closeQuietly( fileOutputStream );
+}
+}
EmbeddedRegistry.g
[jira] [Closed] (MTOMCAT-150) expose ports used with tomcat7:run as sys props
[ https://issues.apache.org/jira/browse/MTOMCAT-150?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-150. -- Resolution: Fixed > expose ports used with tomcat7:run as sys props > --- > > Key: MTOMCAT-150 > URL: https://issues.apache.org/jira/browse/MTOMCAT-150 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Reporter: Olivier Lamy (*$^¨%`£) >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.0 > > > For folks using port 0 (auto allocation), they need to know which port is > really use. > Do exposing sys props > * tomcat.maven.http.port > * tomcat.maven.https.port > * tomcat.maven.ajp.port -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-150) expose ports used with tomcat7:run as sys props
[ https://issues.apache.org/jira/browse/MTOMCAT-150?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13268344#comment-13268344 ] Hudson commented on MTOMCAT-150: Integrated in TomcatMavenPlugin-mvn3.x #147 (See [https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/147/]) [MTOMCAT-150] expose ports used with tomcat7:run as sys props: feature to dump ports in a property file to be able to use later with a forked surefire execution (Revision 1333929) [MTOMCAT-150] expose ports used with tomcat7:run as sys props: add javadoc (Revision 1333928) [MTOMCAT-150] expose ports used with tomcat7:run as sys props (Revision 1333926) Result = FAILURE olamy : http://svn.apache.org/viewvc/?view=rev&rev=1333929 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java olamy : http://svn.apache.org/viewvc/?view=rev&rev=1333928 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java olamy : http://svn.apache.org/viewvc/?view=rev&rev=1333926 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java > expose ports used with tomcat7:run as sys props > --- > > Key: MTOMCAT-150 > URL: https://issues.apache.org/jira/browse/MTOMCAT-150 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Reporter: Olivier Lamy (*$^¨%`£) >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: 2.0 > > > For folks using port 0 (auto allocation), they need to know which port is > really use. > Do exposing sys props > * tomcat.maven.http.port > * tomcat.maven.https.port > * tomcat.maven.ajp.port -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [jira] [Commented] (MTOMCAT-150) expose ports used with tomcat7:run as sys props
svn commit: r1334119 - in /tomcat/jk/trunk: native/common/jk_shm.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Fri May 4 18:56:54 2012
New Revision: 1334119
URL: http://svn.apache.org/viewvc?rev=1334119&view=rev
Log:
Fix dead-lock caused by not releasing mutex on close
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1334119&r1=1334118&r2=1334119&view=diff
==
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Fri May 4 18:56:54 2012
@@ -359,6 +359,7 @@ void jk_shm_close(jk_logger_t *l)
#if defined (WIN32)
if (jk_shm_hlock) {
WaitForSingleObject(jk_shm_hlock, 6);
+ReleaseMutex(jk_shm_hlock);
CloseHandle(jk_shm_hlock);
jk_shm_hlock = NULL;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1334119&r1=1334118&r2=1334119&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri May 4 18:56:54 2012
@@ -45,6 +45,9 @@
+Fix dead-lock caused by not releasing mutex on close. (mturk)
+
+
Fix compilation of mod_jk for HTTPD 1.3. (rjung)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1334119 - in /tomcat/jk/trunk: native/common/jk_shm.c xdocs/miscellaneous/changelog.xml
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 50 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-04052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-04052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-04052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-04052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-04052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-04052012.jar:/srv/gump/ public/workspace/junit/dist/junit-04052012.jar - [junit] May 5, 2012 12:06:36 AM org.apache.catalina.startup.Conte
Re: [GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
Unregister
