[portal-commits] JBoss Portal SVN: r10178 - in modules/portlet/trunk: samples and 1 other directories.

Author: julien(a)jboss.com Date: 2008-03-03 05:17:14 -0500 (Mon, 03 Mar 2008) New Revision: 10178 Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/samples/pom.xml modules/portlet/trunk/samples/src/assemble/samples-basic-portlet.xml modules/portlet/trunk/samples/src/assemble/samples-google-portlet.xml modules/portlet/trunk/samples/src/assemble/samples-jsp-portlet.xml modules/portlet/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml modules/portlet/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml Log: better use of assembly plugin Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -135,19 +135,15 @@ <copy todir="${bin.dir}/lib" flatten="true"> <fileset dir="${source.dir}" includes="**/target/*.jar" excludes="**/*sources.jar"/> </copy> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-basic-portlet.war" tofile="${bin.dir}/samples/samples-basic-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-google-portlet.war" tofile="${bin.dir}/samples/samples-google-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-remotecontroller-portlet.war" tofile="${bin.dir}/samples/samples-remotecontroller-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-shoppingcart-portlet.war" tofile="${bin.dir}/samples/samples-shoppingcart-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-jsp-portlet.war" tofile="${bin.dir}/samples/samples-jsp-portlet.war"/> + <copy todir="${bin.dir}/samples"> + <fileset dir="${source.dir}/samples/target" includes="*.war"/> + </copy> </target> <target name="__package-bundled-binary" unless="bin-alone"> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-basic-portlet.war" tofile="${deploy.dir}/samples-basic-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-google-portlet.war" tofile="${deploy.dir}/samples-google-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-remotecontroller-portlet.war" tofile="${deploy.dir}/samples-remotecontroller-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-shoppingcart-portlet.war" tofile="${deploy.dir}/samples-shoppingcart-portlet.war"/> - <copy file="${source.dir}/samples/target/portlet-samples-${maven.version}-samples-jsp-portlet.war" tofile="${deploy.dir}/samples-jsp-portlet.war"/> + <copy todir="${bin.dir}/samples"> + <fileset dir="${source.dir}/samples/target" includes="*.war"/> + </copy> </target> <target name="__package-distrib"> Modified: modules/portlet/trunk/samples/pom.xml =================================================================== --- modules/portlet/trunk/samples/pom.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/pom.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -27,6 +27,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <finalName>samples</finalName> <descriptors> <descriptor>src/assemble/samples-basic-portlet.xml</descriptor> <descriptor>src/assemble/samples-shoppingcart-portlet.xml</descriptor> Modified: modules/portlet/trunk/samples/src/assemble/samples-basic-portlet.xml =================================================================== --- modules/portlet/trunk/samples/src/assemble/samples-basic-portlet.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/src/assemble/samples-basic-portlet.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -1,5 +1,5 @@ <assembly> - <id>samples-basic-portlet</id> + <id>basic-portlet</id> <formats> <format>war</format> </formats> Modified: modules/portlet/trunk/samples/src/assemble/samples-google-portlet.xml =================================================================== --- modules/portlet/trunk/samples/src/assemble/samples-google-portlet.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/src/assemble/samples-google-portlet.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -1,5 +1,5 @@ <assembly> - <id>samples-google-portlet</id> + <id>google-portlet</id> <formats> <format>war</format> </formats> Modified: modules/portlet/trunk/samples/src/assemble/samples-jsp-portlet.xml =================================================================== --- modules/portlet/trunk/samples/src/assemble/samples-jsp-portlet.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/src/assemble/samples-jsp-portlet.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -1,5 +1,5 @@ <assembly> - <id>samples-jsp-portlet</id> + <id>jsp-portlet</id> <formats> <format>war</format> </formats> Modified: modules/portlet/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml =================================================================== --- modules/portlet/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/src/assemble/samples-remotecontroller-portlet.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -1,5 +1,5 @@ <assembly> - <id>samples-remotecontroller-portlet</id> + <id>remotecontroller-portlet</id> <formats> <format>war</format> </formats> Modified: modules/portlet/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml =================================================================== --- modules/portlet/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml 2008-03-03 09:51:51 UTC (rev 10177) +++ modules/portlet/trunk/samples/src/assemble/samples-shoppingcart-portlet.xml 2008-03-03 10:17:14 UTC (rev 10178) @@ -1,5 +1,5 @@ <assembly> - <id>samples-shoppingcart-portlet</id> + <id>shoppingcart-portlet</id> <formats> <format>war</format> </formats>