Author: olamy
Date: Mon Oct 10 07:48:38 2011
New Revision: 1180810
URL: http://svn.apache.org/viewvc?rev=1180810&view=rev
Log:
add it tests configuration to ensure ajp port can be started too
Modified:
tomcat/maven-plugin/trunk/BUILD.TXT
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
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/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
Modified: tomcat/maven-plugin/trunk/BUILD.TXT
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/BUILD.TXT?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/BUILD.TXT (original)
+++ tomcat/maven-plugin/trunk/BUILD.TXT Mon Oct 10 07:48:38 2011
@@ -1,6 +1,7 @@
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 port 1973, you could have some
port allocation issues).
-mvn clean install -Prun-its will run integration tests too: to override the
default used htpp port you can use -Dits.http.port=
+mvn clean install will install the mojos without running integration tests.
+As there are some hardcoded integration tests with http port 1973 and ajp
2001, 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=
To deploy a snaphot version to
http://people.apache.org/repo/m2-snapshot-repository/ (which is proxying by
https://repository.apache.org/content/groups/snapshots-group/) you must run :
mvn clean deploy .
Note you need some configuration in ~/.m2/settings.xml:
<server>
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Oct 10 07:48:38 2011
@@ -57,6 +57,8 @@
<distributionIdSnapshots>apache.snapshots</distributionIdSnapshots>
<!-- http port used to run it test -->
<its.http.port>1973</its.http.port>
+ <!-- ajp port used to run it test -->
+ <its.ajp.port>2001</its.ajp.port>
</properties>
<prerequisites>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
Mon Oct 10 07:48:38 2011
@@ -21,6 +21,7 @@ package org.codehaus.mojo.tomcat.it;
+import org.apache.maven.it.VerificationException;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,6 +65,12 @@ public abstract class AbstractSimpleWarP
LOG.info( "Error Free Log check" );
verifier.verifyErrorFreeLog();
+ verifyConnectorsStarted();
}
+ /**
+ * impls check the logs if http/https/apr has been started
+ */
+ protected abstract void verifyConnectorsStarted()
+ throws VerificationException;
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
Mon Oct 10 07:48:38 2011
@@ -213,4 +213,9 @@ public abstract class AbstractWarProject
return System.getProperty( "its.http.port" );
}
+ protected static String getAjpItPort()
+ {
+ return System.getProperty( "its.ajp.port" );
+ }
+
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Oct 10 07:48:38
2011
@@ -221,6 +221,7 @@
<verifier.maven.debug>${verifier.maven.debug}</verifier.maven.debug>
<verifier.debugJvm>${verifier.debugJvm}</verifier.debugJvm>
<its.http.port>${its.http.port}</its.http.port>
+ <its.ajp.port>${its.ajp.port}</its.ajp.port>
</systemPropertyVariables>
</configuration>
</execution>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
Mon Oct 10 07:48:38 2011
@@ -18,11 +18,19 @@ package org.codehaus.mojo.tomcat.it;
* under the License.
*/
+import org.apache.maven.it.VerificationException;
+
/**
* @author Olivier Lamy
*/
public class Tomcat6SimpleWarProjectIT
extends AbstractSimpleWarProjectIT
{
- // no op
+ @Override
+ protected void verifyConnectorsStarted()
+ throws VerificationException
+ {
+ verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" +
getHttpItPort());
+ verifier.verifyTextInLog("INFO: JK: ajp13 listening on /0.0.0.0:" +
getAjpItPort());
+ }
}
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
Mon Oct 10 07:48:38 2011
@@ -66,6 +66,7 @@
<phase>pre-integration-test</phase>
<configuration>
<port>${its.http.port}</port>
+ <ajpPort>${its.ajp.port}</ajpPort>
<fork>true</fork>
<path>/</path>
<systemProperties>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Mon Oct 10 07:48:38
2011
@@ -231,6 +231,7 @@
<verifier.maven.debug>${verifier.maven.debug}</verifier.maven.debug>
<verifier.debugJvm>${verifier.debugJvm}</verifier.debugJvm>
<its.http.port>${its.http.port}</its.http.port>
+ <its.ajp.port>${its.ajp.port}</its.ajp.port>
</systemPropertyVariables>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<useFile>false</useFile>
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=1180810&r1=1180809&r2=1180810&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
Mon Oct 10 07:48:38 2011
@@ -114,7 +114,7 @@ public abstract class AbstractRunMojo
* By default it's ajp.
* NOTE The ajp connector will be started only if {@link #ajpPort} > 0.
*
- * @parameter expression="${maven.tomcat.ajp.protocol}" default-value="ajp"
+ * @parameter expression="${maven.tomcat.ajp.protocol}"
default-value="org.apache.coyote.ajp.AjpProtocol"
* @since 2.0
*/
private String ajpProtocol;
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7SimpleWarProjectIT.java
Mon Oct 10 07:48:38 2011
@@ -18,6 +18,7 @@ package org.apache.tomcat.maven.plugin.t
* under the License.
*/
+import org.apache.maven.it.VerificationException;
import org.codehaus.mojo.tomcat.it.AbstractSimpleWarProjectIT;
/**
@@ -30,4 +31,13 @@ public class Tomcat7SimpleWarProjectIT
{
return 20000;
}
+
+ @Override
+ protected void verifyConnectorsStarted()
+ throws VerificationException
+ {
+ verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-"
+ getHttpItPort() + "\"]");
+
+ verifier.verifyTextInLog( "INFO: Starting ProtocolHandler
[\"ajp-bio-"+ getAjpItPort() +"\"]" );
+ }
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1180810&r1=1180809&r2=1180810&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/simple-war-project/pom.xml
Mon Oct 10 07:48:38 2011
@@ -67,6 +67,7 @@
<configuration>
<fork>true</fork>
<port>${its.http.port}</port>
+ <ajpPort>${its.ajp.port}</ajpPort>
<path>/</path>
<systemProperties>
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
