[jboss-cvs] JBossAS SVN: r84671 - in trunk: build and 2 other directories.

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

Author: pgier
Date: 2009-02-24 10:40:29 -0500 (Tue, 24 Feb 2009)
New Revision: 84671

Modified:
   trunk/build/build.xml
   trunk/cluster/pom.xml
   trunk/messaging/pom.xml
   trunk/pom.xml
Log:
[JBBUILD-506] Switch messaging and cluster modules to maven.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-02-24 15:36:30 UTC (rev 84670)
+++ trunk/build/build.xml	2009-02-24 15:40:29 UTC (rev 84671)
@@ -89,7 +89,7 @@
       <!-- Modules -->
       <module name="aspects"/>
       <module name="bootstrap" externalBuild="true"/>
-      <module name="cluster"/>
+      <module name="cluster" externalBuild="true"/>
       <module name="connector"/>
       <module name="console"/>
       <module name="deployment" externalBuild="true"/>
@@ -99,7 +99,7 @@
       <module name="iiop"/>
       <module name="main" externalBuild="true"/>
       <module name="management"/>
-      <module name="messaging"/>
+      <module name="messaging" externalBuild="true"/>
       <module name="jbossas/remoting" externalBuild="true"/>
       <module name="jmx-remoting" externalBuild="true"/>
       <module name="jbossas/jmx-remoting" externalBuild="true"/>

Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml	2009-02-24 15:36:30 UTC (rev 84670)
+++ trunk/cluster/pom.xml	2009-02-24 15:40:29 UTC (rev 84671)
@@ -69,7 +69,7 @@
           <execution>
             <id>assembly</id>
             <goals>
-              <goal>attached</goal>
+              <goal>single</goal>
             </goals>
             <phase>package</phase>
           </execution>
@@ -78,6 +78,76 @@
           <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-output</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                                
+                <mkdir dir="output/etc"/>
+                <copy todir="output/etc" filtering="yes">
+                  <fileset dir="src/etc">
+                    <include name="**"/>
+                  </fileset>
+                </copy>
+                
+                <mkdir dir="output/lib"/>
+                <copy file="target/${artifactId}-${version}.jar"
+                      tofile="output/lib/jbossha.jar"/>
+                <copy file="target/${artifactId}-${version}-jboss-ha-legacy-client.jar"
+                      tofile="output/lib/jboss-ha-legacy-client.jar"/>
+                
+                <property name="build.resources.dir" location="output/resources"/>
+                <mkdir dir="${build.resources.dir}"/>
+
+                <!-- Build jgroups-channelfactory.sar -->
+                <mkdir dir="${build.resources.dir}/jgroups-channelfactory.sar/META-INF"/>   
+                <copy todir="${build.resources.dir}/jgroups-channelfactory.sar/META-INF" filtering="yes">
+                  <fileset dir="src/resources/jgroups">
+                    <include name="**"/>
+                  </fileset>
+                </copy>
+                
+                <!-- Build jboss-cache-manager.sar -->
+                <mkdir dir="${build.resources.dir}/jboss-cache-manager.sar"/>   
+                <copy todir="${build.resources.dir}/jboss-cache-manager.sar" filtering="yes">
+                  <fileset dir="src/resources/jboss-cache-manager.sar">
+                    <include name="**"/>
+                  </fileset>
+                </copy>
+
+             </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>clean-output</id>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <phase>clean</phase>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>output</directory>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml	2009-02-24 15:36:30 UTC (rev 84670)
+++ trunk/messaging/pom.xml	2009-02-24 15:40:29 UTC (rev 84671)
@@ -19,6 +19,59 @@
         <directory>src/resources</directory>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-output</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                                
+                <mkdir dir="output/etc"/>
+                <copy todir="output/etc" filtering="yes">
+                  <fileset dir="src/etc">
+                    <include name="**"/>
+                  </fileset>
+                </copy>
+                
+                <mkdir dir="output/lib"/>
+                <copy file="target/${artifactId}-${version}.jar"
+                      tofile="output/lib/jboss-messaging-int.jar"/>
+                <copy file="target/${artifactId}-${version}.jar"
+                      tofile="output/lib/jboss-messaging-int-client.jar"/>
+                
+             </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>clean-output</id>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <phase>clean</phase>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>output</directory>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
   <dependencies>
     <!-- Compile (global dependencies) -->

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-02-24 15:36:30 UTC (rev 84670)
+++ trunk/pom.xml	2009-02-24 15:40:29 UTC (rev 84671)
@@ -384,7 +384,7 @@
         <module>hibernate-int</module>
         <module>console</module>
         <module>spring-int</module>
-        <module>embedded</module>
+        <!--<module>embedded</module>-->
         <module>client</module>
         <module>build</module>
       </modules>
@@ -416,6 +416,8 @@
         <module>deployment</module>
         <module>jbossas</module>
         <module>jmx-remoting</module>
+        <module>messaging</module>
+        <module>cluster</module>
       </modules>
     </profile>