[gatein-commits] gatein SVN: r5705 - in components/pc/trunk/test: servers/tomcat6 and 1 other directories.

Author: julien_viet Date: 2011-01-07 08:47:58 -0500 (Fri, 07 Jan 2011) New Revision: 5705 Modified: components/pc/trunk/test/core/pom.xml components/pc/trunk/test/servers/tomcat6/pom.xml components/pc/trunk/test/servers/tomcat6/src/test/common.xml Log: GTNPC-46 : make jar usage more mavenish Modified: components/pc/trunk/test/core/pom.xml =================================================================== --- components/pc/trunk/test/core/pom.xml 2011-01-07 12:50:28 UTC (rev 5704) +++ components/pc/trunk/test/core/pom.xml 2011-01-07 13:47:58 UTC (rev 5705) @@ -142,8 +142,34 @@ <build> <plugins> + <!-- Deploy the test jar and its sources --> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <goals> + <goal>test-jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2</version> <executions> Modified: components/pc/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:50:28 UTC (rev 5704) +++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 13:47:58 UTC (rev 5705) @@ -135,6 +135,14 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-test-core</artifactId> + <version>2.3.0-Alpha01-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- JSTL for Tomcat --> <dependency> <groupId>apache-taglibs</groupId> Modified: components/pc/trunk/test/servers/tomcat6/src/test/common.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 12:50:28 UTC (rev 5704) +++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 13:47:58 UTC (rev 5705) @@ -387,13 +387,6 @@ <target name="package-tests"> - <copy todir="${target}/classes"> - <fileset dir="${basedir}/../../core/target/classes" includes="**/*"/> - </copy> - <copy todir="${target}/test-classes"> - <fileset dir="${basedir}/../../core/target/test-classes" includes="**/*"/> - </copy> - <package-tck-test test="portletinterface"/> <package-tck-test test="dispatcher"/> <package-tck-test test="portletrequests"/> @@ -453,18 +446,17 @@ <package-jsr286-ext-test test="portletmode"/> <!-- --> - <jar jarfile="${test.temp.lib}/portlet-test-lib.jar"> - <fileset dir="${target}/test-classes"/> - <fileset dir="${target}/classes"/> - </jar> - <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"> <fileset dir="${target}/test-classes/portlet-test-war"/> </copy> <copy todir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war/WEB-INF/lib" flatten="true"> - <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> <path refid="${test.server.name}-${test.server.version}"/> + <path> + <pathelement location="${org.gatein.pc:pc-test-core:jar}"/> + <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/> + </path> </copy> + <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/> <jar jarfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"> <fileset dir="${test.temp.dir}/${test.server.name}-${test.server.version}/portlet-test-war"/> @@ -510,9 +502,7 @@ </reports> <classpath> - <pathelement location="${target}/classes"/> <pathelement location="${test.temp.lib}"/> - <pathelement location="${target}/classes/test"/> <pathelement location="${target}/test-classes/test"/> <pathelement path="${test_classpath}"/> </classpath> @@ -521,6 +511,7 @@ </target> +<!-- <target name="package-tck-portal" depends="prepare_env"> <property name="tck" value="${target}/tck"/> @@ -558,5 +549,6 @@ <delete file="${target}/portlet-test-lib.jar"/> </target> +--> </project>