Author: mwringe Date: 2010-06-18 13:36:40 -0400 (Fri, 18 Jun 2010) New Revision: 3386 Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml Log: GTNWSRP-46: Update the test build so it can now use a zip or a exploded directory for building. Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 13:30:33 UTC (rev 3385) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 17:36:40 UTC (rev 3386) @@ -35,27 +35,76 @@ <packaging>war</packaging> <name>GateIn WSRP Producer WAR</name> + <properties> + <!-- the default jvmargs which should be used for the tests --> + <!-- We need to set the STRICT_SERVLET_COMPLIANCE to false since we are using mock http requests --> + <cargo.jvmargs.default>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs.default> + <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs> + </properties> + <profiles> - <profile> - <id>cargo-debug</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0.1</version> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <cargo.jvmargs>${cargo.jvmargs.default}</cargo.jvmargs> + </properties> + </profile> + <profile> + <id>cargo-debug</id> + <properties> + <!-- add the jdwp setup for the testus --> + <cargo.jvmargs.debug>-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n</cargo.jvmargs.debug> + <cargo.jvmargs>${cargo.jvmargs.default} ${cargo.jvmargs.debug}</cargo.jvmargs> + </properties> + </profile> + <profile> + <!-- uses a zip of jboss as instead of an exploded directory --> + <id>server-url</id> + <activation> + <property> + <name>jboss.zip.url</name> + </property> + </activation> + <properties> + <JBOSS_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_HOME> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-distribution</artifactId> + <version>5.1.0.GA</version> + <scope>system</scope> + <type>zip</type> + <systemPath>${jboss.zip.url}</systemPath> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>dependency-unpack</id> + <phase>pre-integration-test</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> <configuration> - <configuration> - <properties> - <cargo.jvmargs> - <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y]]></cargo.jvmargs> - </properties> - </configuration> + <includeGroupIds>org.jboss.jbossas</includeGroupIds> + <includeArtifactIds>jboss-as-distribution</includeArtifactIds> + <outputDirectory>${project.build.directory}/cargo/servers</outputDirectory> </configuration> - </plugin> - </plugins> - </build> - </profile> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> @@ -320,8 +369,9 @@ <includes> <include>org/gatein/wsrp/protocol/v1/MarkupTestCase.class</include> <include>org/gatein/wsrp/protocol/v1/PortletManagementTestCase.class</include> - <!-- <include>org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.class</include> --> + <!--<include>org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.class</include>--> <include>org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.class</include> + <!--<include>org/gatein/wsrp/protocol/v1/RegistrationTestCase.class</include>--> <include>org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.class</include> </includes> <excludes> @@ -342,9 +392,9 @@ <log>${basedir}/target/jboss51x/container.log</log> <systemProperties> <!-- Since the tests run on the server, we need to pass system properties to the - server so that the tests can use them. --> + server so that the tests can use them. --> <!-- The tests need to deploy and undeploy artifacts during the test so we need to pass - properties to enable this behaviour. --> + properties to enable this behaviour. --> <jboss.deploy.dir>${jboss.server.home.dir}/conf</jboss.deploy.dir> <test.deployables.dir>${basedir}/target/test-archives</test.deployables.dir> <jboss.deploy.url.prefix>http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&amp;name=jboss.system:service%3DMainDeployer&amp;methodName=deploy&amp;argType=java.net.URL&amp;arg0=</jboss.deploy.url.prefix> @@ -353,10 +403,10 @@ </container> <wait>false</wait> <configuration> - <home>${basedir}/target/cargo</home> + <home>${basedir}/target/cargo/standalone</home> <properties> <cargo.logging>low</cargo.logging> - <cargo.jvmargs>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs> + <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs> </properties> <deployables> <deployable> @@ -364,6 +414,13 @@ <type>sar</type> </deployable> </deployables> + <configfiles> + <!-- hack to get normal logging instead of incredibly versbose --> + <configfile> + <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file> + <tofile>/conf/jboss-log4j.xml</tofile> + </configfile> + </configfiles> </configuration> </configuration> <executions>