[jboss-cvs] JBossAS SVN: r92086 - trunk/varia.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-08-06 16:18:43 -0400 (Thu, 06 Aug 2009)
New Revision: 92086

Modified:
   trunk/varia/pom.xml
Log:
[JBAS-7152] Fixing resource inclusion in generated jars.  Missing configuration files found by smcgowan.

Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml	2009-08-06 19:44:10 UTC (rev 92085)
+++ trunk/varia/pom.xml	2009-08-06 20:18:43 UTC (rev 92086)
@@ -21,6 +21,28 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>src/resources</directory>
+                </resource>
+              </resources>
+              <outputDirectory>target/resources</outputDirectory>
+              <includeEmptyDirs>true</includeEmptyDirs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
@@ -94,19 +116,6 @@
                   </fileset>
                 </copy>
 
-                <mkdir dir="target/resources"/>
-                <copy todir="target/resources" filtering="yes">
-                  <fileset dir="src/resources">
-                    <include name="**"/>
-                    <exclude name="jmx/html/images/**"/>
-                  </fileset>
-                </copy>
-                <copy todir="target/resources" filtering="no">
-                  <fileset dir="src/resources">
-                    <include name="jmx/html/images/**"/>
-                  </fileset>
-                </copy>
-                                
                 <!-- build deployers -->
             
                 <property name="build.deployers" location="target/deployers"/>