Author: julien(a)jboss.com
Date: 2008-03-02 14:44:08 -0500 (Sun, 02 Mar 2008)
New Revision: 10167
Added:
modules/portlet/trunk/portal/src/assemble/
Removed:
modules/portlet/trunk/portal/src/assemble/samples-basic.xml
modules/portlet/trunk/portal/src/assemble/samples-cart-event-portlet.xml
modules/portlet/trunk/portal/src/assembly/
Modified:
modules/portlet/trunk/portal/pom.xml
Log:
name should be "assemble" and not "assembly" for the directories
containing the assembly plugin files
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-03-02 19:38:44 UTC (rev 10166)
+++ modules/portlet/trunk/portal/pom.xml 2008-03-02 19:44:08 UTC (rev 10167)
@@ -192,8 +192,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
-
<descriptor>src/assembly/simple-portal-jboss42.xml</descriptor>
-
<descriptor>src/assembly/simple-portal-tomcat60.xml</descriptor>
+
<descriptor>src/assemble/simple-portal-jboss42.xml</descriptor>
+
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Copied: modules/portlet/trunk/portal/src/assemble (from rev 10165,
modules/portlet/trunk/portal/src/assembly)
Deleted: modules/portlet/trunk/portal/src/assemble/samples-basic.xml
===================================================================
--- modules/portlet/trunk/portal/src/assembly/samples-basic.xml 2008-03-02 19:37:21 UTC
(rev 10165)
+++ modules/portlet/trunk/portal/src/assemble/samples-basic.xml 2008-03-02 19:44:08 UTC
(rev 10167)
@@ -1,22 +0,0 @@
-<assembly>
- <id>samples-basic</id>
- <formats>
- <format>war</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>src/main/resources/samples/basic-war</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>WEB-INF/classes</outputDirectory>
- <includes>
-
<include>org/jboss/portal/portlet/portal/samples/basic/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
\ No newline at end of file
Deleted: modules/portlet/trunk/portal/src/assemble/samples-cart-event-portlet.xml
===================================================================
--- modules/portlet/trunk/portal/src/assembly/samples-cart-event-portlet.xml 2008-03-02
19:37:21 UTC (rev 10165)
+++ modules/portlet/trunk/portal/src/assemble/samples-cart-event-portlet.xml 2008-03-02
19:44:08 UTC (rev 10167)
@@ -1,22 +0,0 @@
-<assembly>
- <id>samples-google-weather-portlet</id>
- <formats>
- <format>war</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
-
<directory>src/main/resources/samples/cart-event-portlet-war</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>WEB-INF/classes</outputDirectory>
- <includes>
-
<include>org/jboss/portal/portlet/portal/samples/event/*.class</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
\ No newline at end of file