Author: olamy
Date: Fri Oct 14 09:27:43 2011
New Revision: 1183258
URL: http://svn.apache.org/viewvc?rev=1183258&view=rev
Log:
add integration test to ensure we start https and ajp in tomcat6 plugin
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1183258&r1=1183257&r2=1183258&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Oct 14 09:27:43 2011
@@ -57,6 +57,8 @@
<distributionIdSnapshots>apache.snapshots</distributionIdSnapshots>
<!-- http port used to run it test -->
<its.http.port>1973</its.http.port>
+ <!-- https port used to run it test -->
+ <its.https.port>2003</its.https.port>
<!-- ajp port used to run it test -->
<its.ajp.port>2001</its.ajp.port>
<!-- server port for it tests -->
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1183258&r1=1183257&r2=1183258&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Fri Oct 14 09:27:43 2011
@@ -211,6 +211,11 @@ public abstract class AbstractWarProject
return System.getProperty( "its.http.port" );
}
+ protected static String getHttpsItPort()
+ {
+ return System.getProperty( "its.https.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=1183258&r1=1183257&r2=1183258&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Oct 14 09:27:43
2011
@@ -37,6 +37,7 @@
<tomcat.version>6.0.33</tomcat.version>
<managerWebAppPath>${basedir}/target/</managerWebAppPath>
<warTestPath>${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war</warTestPath>
+ <keystoreTestPath>${basedir}/src/test/keystore</keystoreTestPath>
</properties>
<prerequisites>
<maven>${mavenVersion}</maven>
@@ -256,6 +257,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.https.port>${its.https.port}</its.https.port>
<its.ajp.port>${its.ajp.port}</its.ajp.port>
</systemPropertyVariables>
</configuration>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java?rev=1183258&r1=1183257&r2=1183258&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat6RunMultiConfigIT.java
Fri Oct 14 09:27:43 2011
@@ -32,5 +32,7 @@ public class Tomcat6RunMultiConfigIT
throws VerificationException
{
verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" +
getHttpItPort());
+ verifier.verifyTextInLog("INFO: Starting Coyote HTTP/1.1 on http-" +
getHttpsItPort());
+ verifier.verifyTextInLog("INFO: JK: ajp13 listening on /0.0.0.0:" +
getAjpItPort());
}
}
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore?rev=1183258&view=auto
==============================================================================
Files tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore (added)
and tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/keystore Fri Oct 14
09:27:43 2011 differ
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1183258&r1=1183257&r2=1183258&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
Fri Oct 14 09:27:43 2011
@@ -68,11 +68,10 @@
<configurationDir>\${project.build.directory}/tc</configurationDir>
<path>/multi-config</path>
<port>${its.http.port}</port>
- <!--
- <httpsPort>8002</httpsPort>
- <keystoreFile>\${basedir}/src/keystore</keystoreFile>
- <ajpPort>8003</ajpPort>
- -->
+
+ <httpsPort>${its.https.port}</httpsPort>
+ <keystoreFile>${keystoreTestPath}</keystoreFile>
+ <ajpPort>${its.ajp.port}</ajpPort>
<uriEncoding>UTF-8</uriEncoding>
<systemProperties>
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
