[jboss-cvs] JBossAS SVN: r69444 - in projects/ejb3/trunk/installer-assembly: src/main/resources and 1 other directory.

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

Author: wolfc
Date: 2008-01-29 07:05:46 -0500 (Tue, 29 Jan 2008)
New Revision: 69444

Modified:
   projects/ejb3/trunk/installer-assembly/pom.xml
   projects/ejb3/trunk/installer-assembly/src/main/resources/installer.xml
Log:
Correct version of assembly plugin
Assembly using dependencies instead of modules

Modified: projects/ejb3/trunk/installer-assembly/pom.xml
===================================================================
--- projects/ejb3/trunk/installer-assembly/pom.xml	2008-01-29 11:36:53 UTC (rev 69443)
+++ projects/ejb3/trunk/installer-assembly/pom.xml	2008-01-29 12:05:46 UTC (rev 69444)
@@ -21,19 +21,6 @@
   <description>JBoss EJB3 Plugin Installer Assembly</description>
   <packaging>pom</packaging>
   
-  <!-- Modules -->
-  <modules>
-    <module>../core</module>
-    <module>../cache</module>
-    <module>../ext-api</module>
-    <module>../ext-api-impl</module>
-    <module>../injection</module>
-    <module>../installer</module>
-    <module>../interceptors</module>
-    <module>../metadata</module>
-    <module>../pool</module>
-  </modules>
-  
   <!-- Build Configuration -->
   <build>
 
@@ -41,6 +28,7 @@
       <!-- Assembly Plugin -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -65,4 +53,55 @@
     </plugins>
   </build>
   
-</project>
\ No newline at end of file
+  <!-- Explicit versions, because here we define the installer product -->
+  <dependencies>
+    <!-- The installer program -->
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-installer</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
+    
+    <!-- The things to install -->
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-cache</artifactId>
+      <version>0.13.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-core</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-ext-api</artifactId>
+      <version>0.1.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-ext-api-impl</artifactId>
+      <version>0.1.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-injection</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-interceptors</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-metadata</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-pool</artifactId>
+      <version>0.13.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: projects/ejb3/trunk/installer-assembly/src/main/resources/installer.xml
===================================================================
--- projects/ejb3/trunk/installer-assembly/src/main/resources/installer.xml	2008-01-29 11:36:53 UTC (rev 69443)
+++ projects/ejb3/trunk/installer-assembly/src/main/resources/installer.xml	2008-01-29 12:05:46 UTC (rev 69444)
@@ -4,16 +4,25 @@
 -->
 <assembly xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"
 >
   <id>installer</id>
   <formats>
     <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <moduleSets>
-    <moduleSet>
+  <dependencySets>
+    <dependencySet>
+      <outputFileNameMapping></outputFileNameMapping>
+      <unpack>true</unpack>
       <includes>
+        <include>org.jboss.ejb3:jboss-ejb3-installer</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+      <includes>
+        <include>ant-contrib:ant-contrib</include>
         <include>org.jboss.ejb3:jboss-ejb3-cache</include>
         <include>org.jboss.ejb3:jboss-ejb3-core</include>
         <include>org.jboss.ejb3:jboss-ejb3-ext-api</include>
@@ -22,33 +31,7 @@
         <include>org.jboss.ejb3:jboss-ejb3-metadata</include>
         <include>org.jboss.ejb3:jboss-ejb3-pool</include>
       </includes>
-      <binaries>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-        <outputDirectory>lib</outputDirectory>
-        <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-        <include>org.jboss.ejb3:jboss-ejb3-installer</include>
-      </includes>
-      <binaries>
-        <unpack>true</unpack>
-        <includeDependencies>false</includeDependencies>
-        <dependencySets>
-          <dependencySet>
-            <includes>
-              <include>ant-contrib:ant-contrib</include>
-            </includes>
-            <unpack>false</unpack>
-            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-            <outputDirectory>lib</outputDirectory>
-          </dependencySet>
-        </dependencySets>
-        <outputFileNameMapping></outputFileNameMapping>
-        <outputDirectory></outputDirectory>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
-</assembly>
\ No newline at end of file
+      <outputDirectory>lib</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+</assembly>