6:49 a.m.
Author: julien_viet
Date: 2011-01-07 07:48:59 -0500 (Fri, 07 Jan 2011)
New Revision: 5703
Added:
components/pc/trunk/test/core/src/main/assembly/
components/pc/trunk/test/core/src/main/assembly/framework.xml
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/core/src/main/build.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat6/src/test/common.xml
Log:
GTNPC-46 : now generate portal-portlet-test-lib.jar with assembly plugin
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/core/pom.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -141,14 +141,36 @@
<build>
<plugins>
+
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <classifier>framework</classifier>
+ <descriptors>
+ <descriptor>src/main/assembly/framework.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<dependencies>
</dependencies>
<executions>
<execution>
- <id>test</id>
+ <id>package-test</id>
<phase>package</phase>
<goals>
<goal>run</goal>
@@ -173,6 +195,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
Added: components/pc/trunk/test/core/src/main/assembly/framework.xml
===================================================================
--- components/pc/trunk/test/core/src/main/assembly/framework.xml
(rev 0)
+++ components/pc/trunk/test/core/src/main/assembly/framework.xml 2011-01-07 12:48:59 UTC
(rev 5703)
@@ -0,0 +1,56 @@
+<!--
+ ~ Copyright (C) 2003-2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+ <id>framework</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <baseDirectory>/</baseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>META-INF/*.tld</include>
+ </includes>
+ </unpackOptions>
+ <includes>
+ <include>org.gatein.pc:pc-portlet</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/gatein/pc/test/unit/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+
+</assembly>
\ No newline at end of file
Modified: components/pc/trunk/test/core/src/main/build.xml
===================================================================
--- components/pc/trunk/test/core/src/main/build.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/core/src/main/build.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -105,7 +105,7 @@
<include name="org/gatein/pc/test/portlet/framework/**"/>
</zipfileset>
<zipfileset dir="${target}" prefix="WEB-INF/lib">
- <include name="portal-portlet-test-framework-lib.jar"/>
+ <include name="${artifactId}-${version}-framework.jar"/>
</zipfileset>
<fileset
dir="${basedir}/src/main/packaging/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/>
</jar>
@@ -121,25 +121,6 @@
<target name="package-tests">
- <!--Portlet test framework lib jar-->
- <jar jarfile="${target}/portal-portlet-test-framework-lib.jar">
-
- <!-- -->
- <fileset dir="${target}/classes"
includes="org/gatein/pc/test/unit/**"/>
-
- <!-- JSR 168 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet.tld"
- fullpath="META-INF/portlet.tld"/>
-
- <!-- JSR 286 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet_2_0.tld"
- fullpath="META-INF/portlet_2_0.tld"/>
- </jar>
-
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
<package-tck-test test="portletrequests"/>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 10:40:55 UTC (rev 5702)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-01-07 12:48:59 UTC (rev 5703)
@@ -135,6 +135,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <classifier>framework</classifier>
+ <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <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 10:40:55 UTC
(rev 5702)
+++ components/pc/trunk/test/servers/tomcat6/src/test/common.xml 2011-01-07 12:48:59 UTC
(rev 5703)
@@ -394,23 +394,6 @@
<fileset dir="${basedir}/../../core/target/test-classes"
includes="**/*"/>
</copy>
- <!--Portlet test framework lib jar-->
- <jar
jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
-
- <!-- -->
- <fileset dir="${target}/classes"
includes="org/gatein/pc/test/unit/**"/>
-
- <!-- JSR 168 TLD -->
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet.tld"
- fullpath="META-INF/portlet.tld"/>
- <zipfileset
- src="${dependency.portal-portlet-portlet.jar}"
- includes="META-INF/portlet_2_0.tld"
- fullpath="META-INF/portlet_2_0.tld"/>
- </jar>
-
<package-tck-test test="portletinterface"/>
<package-tck-test test="dispatcher"/>
<package-tck-test test="portletrequests"/>