[jboss-cvs] JBossAS SVN: r82348 - in projects/microcontainer/trunk/build: src/assembly and 1 other directory.

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

Author: pgier
Date: 2008-12-17 12:35:36 -0500 (Wed, 17 Dec 2008)
New Revision: 82348

Modified:
   projects/microcontainer/trunk/build/pom.xml
   projects/microcontainer/trunk/build/src/assembly/dist.xml
Log:
[JBBUILD-507] Updates to building the dist zip.

Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml	2008-12-17 17:00:05 UTC (rev 82347)
+++ projects/microcontainer/trunk/build/pom.xml	2008-12-17 17:35:36 UTC (rev 82348)
@@ -16,44 +16,63 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.microcontainer</groupId>
-  <artifactId>jboss-microcontainer-combined</artifactId>
+  <artifactId>jboss-microcontainer-dist</artifactId>
   <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>JBoss Microcontainer Combined Assembly</name>
+  <name>JBoss Microcontainer Distribution Build</name>
   <description>
     The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
     and configuration.
   </description>
 
-  <profiles>
-    <profile>
-      <id>assembly</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2-beta-2</version>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-                <configuration>
-                  <finalName>jboss-microcontainer-${project.version}</finalName>
-                  <descriptors>
-                    <descriptor>src/assembly/dist.xml</descriptor>
-                    <descriptor>src/assembly/src.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+            <configuration>
+              <finalName>jboss-microcontainer-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/dist.xml</descriptor>
+                <descriptor>src/assembly/src.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-aop-mc-int</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-dependency</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-kernel</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-guice-int</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-spring-int</artifactId>
+    </dependency>
+    
+  </dependencies>
 
 </project>

Modified: projects/microcontainer/trunk/build/src/assembly/dist.xml
===================================================================
--- projects/microcontainer/trunk/build/src/assembly/dist.xml	2008-12-17 17:00:05 UTC (rev 82347)
+++ projects/microcontainer/trunk/build/src/assembly/dist.xml	2008-12-17 17:35:36 UTC (rev 82348)
@@ -3,21 +3,9 @@
     <!--<format>tar.gz</format>-->
     <format>zip</format>
   </formats>
-  <fileSets>
-    <fileSet>
-      <directory>../kernel/docs/release</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../kernel/examples</directory>
-      <outputDirectory>examples</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../docs/gettingstarted/target/docbkx</directory>
-      <outputDirectory>docs/gettingstarted/en</outputDirectory>
-    </fileSet>
-  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+    </dependencySet>
+  </dependencySets>
 </assembly>