[jboss-cvs] JBossAS SVN: r61617 - in projects/microcontainer/trunk: aop-mc-int and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 22 15:52:55 EDT 2007
Author: pgier
Date: 2007-03-22 15:52:54 -0400 (Thu, 22 Mar 2007)
New Revision: 61617
Added:
projects/microcontainer/trunk/container/src/assembly/
projects/microcontainer/trunk/container/src/assembly/classloading-spi.xml
projects/microcontainer/trunk/container/src/assembly/metadata-spi.xml
projects/microcontainer/trunk/container/src/assembly/metadata.xml
projects/microcontainer/trunk/deployers/src/assembly/
projects/microcontainer/trunk/deployers/src/assembly/metadata.xml
projects/microcontainer/trunk/deployers/src/assembly/plugins.xml
projects/microcontainer/trunk/deployers/src/assembly/spi.xml
projects/microcontainer/trunk/kernel/src/assembly/
projects/microcontainer/trunk/kernel/src/assembly/plugins.xml
projects/microcontainer/trunk/kernel/src/assembly/spi.xml
projects/microcontainer/trunk/managed/src/assembly/
projects/microcontainer/trunk/managed/src/assembly/api.xml
projects/microcontainer/trunk/managed/src/assembly/plugins.xml
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/dependency/pom.xml
projects/microcontainer/trunk/deployers/pom.xml
projects/microcontainer/trunk/kernel/pom.xml
projects/microcontainer/trunk/managed/pom.xml
projects/microcontainer/trunk/pom.xml
projects/microcontainer/trunk/spring-int/pom.xml
Log:
JBMICROCONT-117; Added more subproject assemblies. Moved some of the assembly configuration to the parent pom.
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -34,15 +34,6 @@
<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>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/container/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -25,6 +25,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/classloading-spi.xml</descriptor>
+ <descriptor>src/assembly/metadata-spi.xml</descriptor>
+ <descriptor>src/assembly/metadata.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Added: projects/microcontainer/trunk/container/src/assembly/classloading-spi.xml
===================================================================
--- projects/microcontainer/trunk/container/src/assembly/classloading-spi.xml (rev 0)
+++ projects/microcontainer/trunk/container/src/assembly/classloading-spi.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>classloading-spi</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <includes>
+ <include>org/jboss/classloading/spi/**</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: projects/microcontainer/trunk/container/src/assembly/metadata-spi.xml
===================================================================
--- projects/microcontainer/trunk/container/src/assembly/metadata-spi.xml (rev 0)
+++ projects/microcontainer/trunk/container/src/assembly/metadata-spi.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>metadata-spi</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <includes>
+ <include>org/jboss/metadata/spi/**</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: projects/microcontainer/trunk/container/src/assembly/metadata.xml
===================================================================
--- projects/microcontainer/trunk/container/src/assembly/metadata.xml (rev 0)
+++ projects/microcontainer/trunk/container/src/assembly/metadata.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -0,0 +1,19 @@
+<assembly>
+ <id>metadata</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <includes>
+ <include>org/jboss/metadata/plugins/**</include>
+ <include>org/jboss/metadata/annotation/**</include>
+ <include>org/jboss/metadata/generic/**</include>
+ <include>org/jboss/metadata/repository/**</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -28,15 +28,6 @@
<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>
Modified: projects/microcontainer/trunk/deployers/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/deployers/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -14,10 +14,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ <descriptor>src/assembly/metadata.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
</plugins>
Added: projects/microcontainer/trunk/deployers/src/assembly/metadata.xml
===================================================================
--- projects/microcontainer/trunk/deployers/src/assembly/metadata.xml (rev 0)
+++ projects/microcontainer/trunk/deployers/src/assembly/metadata.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>metadata</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <excludes>
+ <eclude>org/jboss/deployers/plugins/**</eclude>
+ </excludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: projects/microcontainer/trunk/deployers/src/assembly/plugins.xml
===================================================================
--- projects/microcontainer/trunk/deployers/src/assembly/plugins.xml (rev 0)
+++ projects/microcontainer/trunk/deployers/src/assembly/plugins.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -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/deployers/plugins/**</eclude>
+ </excludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: projects/microcontainer/trunk/deployers/src/assembly/spi.xml
===================================================================
--- projects/microcontainer/trunk/deployers/src/assembly/spi.xml (rev 0)
+++ projects/microcontainer/trunk/deployers/src/assembly/spi.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -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/deployers/spi/**</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/kernel/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -20,6 +20,14 @@
</includes>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>org</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -33,10 +41,12 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
</plugins>
Added: projects/microcontainer/trunk/kernel/src/assembly/plugins.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/assembly/plugins.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/assembly/plugins.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -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/kernel/src/assembly/spi.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/assembly/spi.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/assembly/spi.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -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
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/managed/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -14,10 +14,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <descriptors>
+ <descriptor>src/assembly/api.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ </descriptors>
</configuration>
</plugin>
</plugins>
Added: projects/microcontainer/trunk/managed/src/assembly/api.xml
===================================================================
--- projects/microcontainer/trunk/managed/src/assembly/api.xml (rev 0)
+++ projects/microcontainer/trunk/managed/src/assembly/api.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -0,0 +1,16 @@
+<assembly>
+ <id>api</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <includes>
+ <include>org/jboss/managed/api/**</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: projects/microcontainer/trunk/managed/src/assembly/plugins.xml
===================================================================
--- projects/microcontainer/trunk/managed/src/assembly/plugins.xml (rev 0)
+++ projects/microcontainer/trunk/managed/src/assembly/plugins.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -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/managed/plugins/**</eclude>
+ </excludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -98,6 +98,22 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<repositories>
<repository>
@@ -139,7 +155,7 @@
</reporting>
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
+ <dependencies>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2007-03-22 19:37:28 UTC (rev 61616)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2007-03-22 19:52:54 UTC (rev 61617)
@@ -11,6 +11,24 @@
<name>JBoss Microcontainer Spring Int</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Spring Integration</description>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>schema/**</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>xml-test</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
<!-- Global dependencies -->
<dependency>
More information about the jboss-cvs-commits
mailing list