continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r744174 - in /continuum/trunk/continuum-webapp-test: Readme.txt pom-it.xml
Date Fri, 13 Feb 2009 16:51:44 GMT
Author: wsmoak
Date: Fri Feb 13 16:51:44 2009
New Revision: 744174

URL: http://svn.apache.org/viewvc?rev=744174&view=rev
Log:
[CONTINUUM-2073] Add pom-it.xml to work with the code in src/test/it and start Tomcat using
the Cargo plugin with support for multiple data sources.

Added:
    continuum/trunk/continuum-webapp-test/pom-it.xml
      - copied, changed from r743581, continuum/trunk/continuum-webapp-test/pom.xml
Modified:
    continuum/trunk/continuum-webapp-test/Readme.txt

Modified: continuum/trunk/continuum-webapp-test/Readme.txt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/Readme.txt?rev=744174&r1=744173&r2=744174&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/Readme.txt (original)
+++ continuum/trunk/continuum-webapp-test/Readme.txt Fri Feb 13 16:51:44 2009
@@ -11,6 +11,15 @@
  * modify src/test/resources/it.properties as needed
  * mvn clean install
 
+Run Selenium tests in src/test/it with Maven
+ * modify src/test/resources/it.properties as needed
+ * mvn clean install -f pom-it.xml
+
+Run Selenium teests in src/test/pom2 with Maven
+ * set TOMCAT_HOME environment variable to location of Tomcat 5.5.x installation
+ * modify src/test/resources/it.properties as needed
+ * mvn clean install -f pom2.xml
+
 ======= OLD INSTRUCTIONS FOR src/test/it BELOW =======
 
 Test Continuum with Tomcat 5.x and firefox

Copied: continuum/trunk/continuum-webapp-test/pom-it.xml (from r743581, continuum/trunk/continuum-webapp-test/pom.xml)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom-it.xml?p2=continuum/trunk/continuum-webapp-test/pom-it.xml&p1=continuum/trunk/continuum-webapp-test/pom.xml&r1=743581&r2=744174&rev=744174&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom-it.xml Fri Feb 13 16:51:44 2009
@@ -29,7 +29,7 @@
   <packaging>pom</packaging>
 
   <build>
-    <!--testSourceDirectory>src/test/it</testSourceDirectory-->
+    <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -72,6 +72,107 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <wait>false</wait>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <phase>post-integration-test</phase>
+            <goals>
+                <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <container>
+            <containerId>${container.name}</containerId>
+            <zipUrlInstaller>
+              <url>${container.url}</url>
+              <installDir>${project.build.directory}/installs/${container.name}</installDir>
+            </zipUrlInstaller>
+            <log>${project.build.directory}/logs/${container.name}.log</log>
+            <output>${project.build.directory}/logs/${container.name}.out</output>
+            <timeout>600000</timeout>
+            <systemProperties>
+              <appserver.base>${project.build.directory}</appserver.base>
+            </systemProperties>
+            <dependencies>
+              <dependency>
+              <groupId>org.apache.derby</groupId>
+              <artifactId>derby</artifactId>
+            </dependency>
+              <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+              </dependency>
+              <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+              </dependency>
+        </dependencies>
+          </container>
+          <configuration>
+            <home>${project.build.directory}/${container.name}</home>
+            <type>standalone</type>
+            <properties>
+              <cargo.servlet.port>9595</cargo.servlet.port>
+            </properties>
+            <resources>
+              <resource>
+                <name>jdbc/users</name>
+                <type>javax.sql.DataSource</type>
+                <parameters>
+                  <driverClassName>org.apache.derby.jdbc.EmbeddedDataSource</driverClassName>
+                  <url>jdbc:derby:${project.build.directory}/databases/${container.name}/users;create=true</url>
+                  <username>sa</username>
+                  <password></password>
+                </parameters>
+              </resource>
+              <resource>
+                <name>jdbc/continuum</name>
+                <type>javax.sql.DataSource</type>
+                <parameters>
+                  <driverClassName>org.apache.derby.jdbc.EmbeddedDataSource</driverClassName>
+                  <url>jdbc:derby:${project.build.directory}/databases/${container.name}/data/builds;create=true</url>
+                  <username>sa</username>
+                  <password></password>
+                </parameters>
+              </resource>
+              <resource>
+                <name>mail/Session</name>
+                <type>javax.mail.Session</type>
+                <parameters>
+                  <mail.smtp.host>localhost</mail.smtp.host>
+                </parameters>
+              </resource>
+            </resources>
+            <deployables>
+              <deployable>
+                <groupId>${project.goupId}</groupId>
+                <artifactId>continuum-webapp</artifactId>
+                <type>war</type>
+                <properties>
+                  <context>continuum</context>
+                </properties>
+              </deployable>
+            </deployables>
+          </configuration>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -105,18 +206,80 @@
       <version>0.8.1</version>
       <scope>test</scope>
     </dependency>
-    
-    <!-- dependencies below are for code in src/test/it -->
+
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.4</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.openqa.selenium.server</groupId>
       <artifactId>selenium-server</artifactId>
       <version>0.8.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- deployables -->
+    <dependency>
+      <groupId>org.apache.continuum</groupId>
+      <artifactId>continuum-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+
+     <!-- container dependencies -->
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+       <artifactId>derby</artifactId>
+       <version>10.1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
     </dependency>
 
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>tomcat5x</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <container.name>tomcat5x</container.name>
+        <container.url>http://apache.mirrors.redwire.net/tomcat/tomcat-5/v5.5.27/bin/apache-tomcat-5.5.27.zip</container.url>
+      </properties>
+    </profile>
+    <profile>
+      <id>firefox</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <browser>*firefox</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>iexplore</id>
+      <properties>
+        <browser>*iexplore</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>otherbrowser</id>
+      <properties>
+        <browser>*custom ${browserPath}</browser>
+      </properties>
+    </profile>
+
+  </profiles>
+
 </project>



Mime
View raw message