Author: andrei_exadel Date: 2009-01-28 08:43:19 -0500 (Wed, 28 Jan 2009) New Revision: 12463 Modified: trunk/test-applications/realworld/ear/pom.xml trunk/test-applications/realworld/pom.xml trunk/test-applications/realworld/tests/pom.xml Log: Move integration tests to separate project 'tests' Modified: trunk/test-applications/realworld/ear/pom.xml =================================================================== --- trunk/test-applications/realworld/ear/pom.xml 2009-01-28 13:34:24 UTC (rev 12462) +++ trunk/test-applications/realworld/ear/pom.xml 2009-01-28 13:43:19 UTC (rev 12463) @@ -86,77 +86,7 @@ </modules> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-beta-2</version> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>deploy</goal> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - <!--goal>undeploy</goal--> - </goals> - </execution> - </executions> - <configuration> - <wait>false</wait> - <container> - <containerId>jboss4x</containerId> - <append>false</append> - - <zipUrlInstaller> - <url>${jboss.installer.url}</url> - <installDir> - ${project.basedir}/target/installs - </installDir> - </zipUrlInstaller> - </container> - <configuration> - <home>${jbosshome}/server/${jbosscontext}</home> - <type>existing</type> - <properties> - <cargo.hostname>localhost</cargo.hostname> - <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration> - <cargo.rmi.port>1099</cargo.rmi.port> - </properties> - </configuration> - <deployer> - <type>installed</type> - <deployables> - <deployable> - <artifactId>${projectName}-ear</artifactId> - <type>ear</type> - </deployable> - </deployables> - </deployer> - </configuration> - </plugin> + </plugins> </build> - - <properties> - <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome> - <jbosscontext>default</jbosscontext> - <jboss.installer.url>file:D:\Install\Java\jboss-4.2.3.GA.zip</jboss.installer.url> - </properties> - - <profiles> - <profile> - <id>hudson</id> - <properties> - <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jbo... - </properties> - </profile> - </profiles> - </project> Modified: trunk/test-applications/realworld/pom.xml =================================================================== --- trunk/test-applications/realworld/pom.xml 2009-01-28 13:34:24 UTC (rev 12462) +++ trunk/test-applications/realworld/pom.xml 2009-01-28 13:43:19 UTC (rev 12463) @@ -17,6 +17,9 @@ <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion> <seamVersion>2.1.0.SP1</seamVersion> <faceletsVersion>1.1.14</faceletsVersion> + <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome> + <jbosscontext>default</jbosscontext> + <jboss.installer.url>file:D:\Install\Java\jboss-4.2.3.GA.zip</jboss.installer.url> </properties> <repositories> <repository> @@ -34,7 +37,7 @@ <module>ear</module> <module>ejb</module> <module>web</module> - <module>tests</module> + <!--module>tests</module--> </modules> <build> <plugins> @@ -77,4 +80,14 @@ </pluginManagement> </build> + + <profiles> + <profile> + <id>hudson</id> + <properties> + <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jbo... + </properties> + </profile> + </profiles> + </project> \ No newline at end of file Modified: trunk/test-applications/realworld/tests/pom.xml =================================================================== --- trunk/test-applications/realworld/tests/pom.xml 2009-01-28 13:34:24 UTC (rev 12462) +++ trunk/test-applications/realworld/tests/pom.xml 2009-01-28 13:43:19 UTC (rev 12463) @@ -11,6 +11,13 @@ <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>${projectName}-ear</artifactId> + <version>${project.version}</version> + <type>ear</type> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> @@ -93,6 +100,61 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0-beta-2</version> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>deploy</goal> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + <!--goal>undeploy</goal--> + </goals> + </execution> + </executions> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss4x</containerId> + <append>false</append> + + <zipUrlInstaller> + <url>${jboss.installer.url}</url> + <installDir> + ${project.basedir}/target/installs + </installDir> + </zipUrlInstaller> + </container> + <configuration> + <home>${jbosshome}/server/${jbosscontext}</home> + <type>existing</type> + <properties> + <cargo.hostname>localhost</cargo.hostname> + <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + </configuration> + <deployer> + <type>installed</type> + <deployables> + <deployable> + <artifactId>${projectName}-ear</artifactId> + <type>ear</type> + </deployable> + </deployables> + </deployer> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>