You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by pt...@apache.org on 2008/07/03 00:25:11 UTC

svn commit: r673529 - /jakarta/cactus/trunk/samples/ejb/pom.xml

Author: ptahchiev
Date: Wed Jul  2 15:25:10 2008
New Revision: 673529

URL: http://svn.apache.org/viewvc?rev=673529&view=rev
Log:
Changed the pom.xml to execute with the cactifyear maven2 plugin.

Modified:
    jakarta/cactus/trunk/samples/ejb/pom.xml

Modified: jakarta/cactus/trunk/samples/ejb/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/pom.xml?rev=673529&r1=673528&r2=673529&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/pom.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/pom.xml Wed Jul  2 15:25:10 2008
@@ -27,7 +27,7 @@
 	<artifactId>cactus.samples.ejb</artifactId>
 	<name>Cactus Ejb Samples - Parent Project</name>
 	<description>Cactus Ejb Samples - the parent project</description>
-	<packaging>jar</packaging>
+	<packaging>ear</packaging>
 		<dependencies>
 		<dependency>
 			<groupId>org.apache.cactus</groupId>
@@ -127,41 +127,131 @@
 	</dependencies>
 	<build>
 		<plugins>
-		  <plugin>
-			  <artifactId>maven-antrun-plugin</artifactId>
-  			<dependencies>	
-  				<dependency>
-  					<groupId>org.apache.ivy</groupId>
-  					<artifactId>ivy</artifactId>
-  					<version>2.0.0-beta1</version>
-  				</dependency>
-  	    	<dependency>
-      			<groupId>ant</groupId>
-      			<artifactId>ant-junit</artifactId>
-      			<version>1.6.5</version>
-          </dependency>
-          <dependency>
-      			<groupId>junit</groupId>
-      			<artifactId>junit</artifactId>
-      			<version>3.8.2</version>
-          </dependency>
-  			</dependencies>
-			   <executions>
-				    <execution>
-					    <phase>test</phase>
-					    <configuration>
-    						<tasks>
-    							    <ant antfile="build.xml">
-												<property name="cactus.version" value="${pom.version}"/>
-											</ant>
-    						</tasks>
-					    </configuration>
-					    <goals>
-						    <goal>run</goal>
-					    </goals>
-				    </execution>
-  			</executions>
-		   </plugin>
+			<plugin>
+				<groupId>org.apache.cactus</groupId>
+				<artifactId>cactus.integration.maven2</artifactId>
+				<version>1.8.1-SNAPSHOT</version>
+				<configuration>
+					<srcFile>${project.build.directory}/${pom.artifactId}-${pom.version}.ear</srcFile>
+					<destFile>${project.build.directory}/${pom.artifactId}-cactified.ear</destFile>
+					<!--mergeWebXml>src/main/webapp/WEB-INF/cactus-web.xml</mergeWebXml-->
+					<libDependencies>
+						<dependency>
+							<groupId>javax.servlet</groupId>
+							<artifactId>servlet-api</artifactId>
+						</dependency>
+						<dependency>
+							<groupId>httpunit</groupId>
+							<artifactId>httpunit</artifactId>
+						</dependency>
+					</libDependencies>
+					<redirectors>
+						<servletRedirector>
+							<name>ServletRedirectorSecure</name>
+							<mapping>/ServletRedirectorSecure</mapping>
+							<roles>test</roles>
+						</servletRedirector>
+						<servletRedirector/>
+						<filterRedirector>
+							<name>FilterRedirector</name>
+							<mapping>/test/filterRedirector</mapping>
+						</filterRedirector>
+					</redirectors>  
+				</configuration>
+				<executions>
+					<execution>
+						<id>cactus-cactifyear</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>cactifyear</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<version>1.0-alpha-4</version>
+				<executions>
+					<execution>
+						<id>start-container</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>start</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>stop-container</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<wait>false</wait>
+					<timeout>20000</timeout>
+					<container>
+						<containerId>tomcat5x</containerId>
+						<log>target/cargo.log</log>
+						<output>target/output.log</output>
+						<zipUrlInstaller>
+							<url>http://apache.speedbone.de/tomcat/tomcat-5/v5.5.25/bin/apache-tomcat-5.5.25.zip</url>
+							<installDir>${basedir}/install</installDir>
+						</zipUrlInstaller>
+					</container>
+					<configuration>
+						<deployables>
+							<deployable>
+								<location>target/cactus.samples.ejb-cactified.ear</location>
+								<type>war</type>
+								<properties>
+									<context>/test</context>
+								</properties>
+								<pingURL>http://localhost:8080/</pingURL>
+							</deployable>
+						</deployables>
+					</configuration>
+				</configuration> 
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<id>surefire-it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+							<!--The next line is because we need the tests in src/main/java to ensure
+											that the classes are included in the archive.-->
+							<testSourceDirectory>src/main/java</testSourceDirectory>
+							<testClassesDirectory>target/classes</testClassesDirectory>
+							<systemProperties>
+								<property>
+									<name>cactus.contextURL</name>
+									<value>http://localhost:8080/test/</value>
+								</property>
+								<property>
+									<name>cactus.filterRedirectorName</name>
+									<value>test/filterRedirector</value>
+								</property>
+							</systemProperties>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-ear-plugin</artifactId>
+				<configuration>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project> 



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org