[jboss-cvs] JBossAS SVN: r81498 - in trunk: system and 1 other directories.

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

Author: pgier
Date: 2008-11-24 11:37:13 -0500 (Mon, 24 Nov 2008)
New Revision: 81498

Removed:
   trunk/system/src/assembly/profileservice-spi.xml
Modified:
   trunk/spring-int/pom.xml
   trunk/system/pom.xml
Log:
[JBBUILD-498] Update maven assemblies to match ant output.

Modified: trunk/spring-int/pom.xml
===================================================================
--- trunk/spring-int/pom.xml	2008-11-24 16:25:21 UTC (rev 81497)
+++ trunk/spring-int/pom.xml	2008-11-24 16:37:13 UTC (rev 81498)
@@ -12,9 +12,24 @@
   <name>JBoss Application Server Spring Integration</name>
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (spring-int module)</description>
+
   <build>
     <sourceDirectory>src/main</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>org/jboss/spring/deployment/**</exclude>
+            <exclude>org/jboss/spring/loader/**</exclude>
+            <exclude>org/jboss/spring/kernel/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
+
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>

Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml	2008-11-24 16:25:21 UTC (rev 81497)
+++ trunk/system/pom.xml	2008-11-24 16:37:13 UTC (rev 81498)
@@ -12,8 +12,17 @@
   <name>JBoss Application Server System</name>
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (system module)</description>
+  
   <build>
     <sourceDirectory>src/main</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+        <includes>
+          <include>dtd/**</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -33,6 +42,7 @@
       </plugin>
     </plugins>
   </build>
+  
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>

Deleted: trunk/system/src/assembly/profileservice-spi.xml
===================================================================
--- trunk/system/src/assembly/profileservice-spi.xml	2008-11-24 16:25:21 UTC (rev 81497)
+++ trunk/system/src/assembly/profileservice-spi.xml	2008-11-24 16:37:13 UTC (rev 81498)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>profileservice-spi</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>org/jboss/deployers/spi/**</include>
-                <include>org/jboss/profileservice/**</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>