[jboss-cvs] JBossAS SVN: r61498 - in projects/microcontainer/trunk: aop-mc-int/src and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 20 15:19:09 EDT 2007


Author: pgier
Date: 2007-03-20 15:19:09 -0400 (Tue, 20 Mar 2007)
New Revision: 61498

Added:
   projects/microcontainer/trunk/aop-mc-int/src/assembly/
   projects/microcontainer/trunk/aop-mc-int/src/assembly/aspects.xml
   projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml
   projects/microcontainer/trunk/dependency/src/assembly/
   projects/microcontainer/trunk/dependency/src/assembly/plugins.xml
   projects/microcontainer/trunk/dependency/src/assembly/spi.xml
Modified:
   projects/microcontainer/trunk/aop-mc-int/pom.xml
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/dependency/pom.xml
Log:
JBMICROCONT-117; Adding assembly configuration to aop-mc-int and dependency.

Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-03-20 16:39:57 UTC (rev 61497)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -13,11 +13,39 @@
   <url>http://www.jboss.com/products/jbossmc</url>
   <description>JBoss Microcontainer</description>
   <build>
+    <resources>
+      <resource>
+        <directory>src/resources</directory>
+        <includes>
+          <include>schema/**</include>
+        </includes>
+      </resource>
+    </resources>
     <testResources>
       <testResource>
         <directory>src/resources/test</directory>
       </testResource>
     </testResources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/impl.xml</descriptor>
+            <descriptor>src/assembly/aspects.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
   <dependencies>
     <!-- Global dependencies -->

Added: projects/microcontainer/trunk/aop-mc-int/src/assembly/aspects.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/assembly/aspects.xml	                        (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/assembly/aspects.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -0,0 +1,16 @@
+<assembly>
+  <id>aspects</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+        <includes>
+          <include>org/jboss/aop/microcontainer/aspects/**</include>
+        </includes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml	                        (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -0,0 +1,16 @@
+<assembly>
+  <id>impl</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+        <excludes>
+          <eclude>org/jboss/aop/microcontainer/aspects/**</eclude>
+        </excludes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2007-03-20 16:39:57 UTC (rev 61497)
+++ projects/microcontainer/trunk/build/pom.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -44,24 +44,6 @@
     <sourceDirectory>src/main</sourceDirectory>
 	  <testSourceDirectory>src/tests</testSourceDirectory>
     <finalName>${artifactId}</finalName>
-    <resources>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          <include>etc/**</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src</directory>
-        <includes>
-          <include>resources/**</include>
-        </includes>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml	2007-03-20 16:39:57 UTC (rev 61497)
+++ projects/microcontainer/trunk/dependency/pom.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -21,11 +21,23 @@
   </scm>
   <build>
     <plugins>
-      <!-- The antrun plugin is used for generating jdk1.4 compatible classes.  
-           The configuration for this plugin is specified in the parent pom. -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/spi.xml</descriptor>
+            <descriptor>src/assembly/plugins.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Added: projects/microcontainer/trunk/dependency/src/assembly/plugins.xml
===================================================================
--- projects/microcontainer/trunk/dependency/src/assembly/plugins.xml	                        (rev 0)
+++ projects/microcontainer/trunk/dependency/src/assembly/plugins.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -0,0 +1,16 @@
+<assembly>
+  <id>plugins</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+        <excludes>
+          <eclude>org/jboss/dependency/plugins/**</eclude>
+        </excludes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: projects/microcontainer/trunk/dependency/src/assembly/spi.xml
===================================================================
--- projects/microcontainer/trunk/dependency/src/assembly/spi.xml	                        (rev 0)
+++ projects/microcontainer/trunk/dependency/src/assembly/spi.xml	2007-03-20 19:19:09 UTC (rev 61498)
@@ -0,0 +1,16 @@
+<assembly>
+  <id>spi</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+        <includes>
+          <include>org/jboss/dependency/spi/**</include>
+        </includes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list