[jboss-cvs] JBossAS SVN: r85264 - in trunk: build and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Mar 4 18:57:23 EST 2009


Author: pgier
Date: 2009-03-04 18:57:22 -0500 (Wed, 04 Mar 2009)
New Revision: 85264

Removed:
   trunk/connector/component-info.xml
Modified:
   trunk/build/build.xml
   trunk/ejb3/pom.xml
   trunk/management/pom.xml
   trunk/pom.xml
Log:
[JBBUILD-506] Switch management and ejb3 modules to maven.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-03-04 23:54:36 UTC (rev 85263)
+++ trunk/build/build.xml	2009-03-04 23:57:22 UTC (rev 85264)
@@ -92,12 +92,12 @@
       <module name="connector" externalBuild="true"/>
       <module name="console"/>
       <module name="deployment" externalBuild="true"/>
-      <module name="ejb3"/>
+      <module name="ejb3" externalBuild="true"/>
       <module name="embedded"/>
       <module name="hibernate-int"/>
       <module name="iiop" externalBuild="true"/>
       <module name="main" externalBuild="true"/>
-      <module name="management"/>
+      <module name="management" externalBuild="true"/>
       <module name="messaging" externalBuild="true"/>
       <module name="jbossas/remoting" externalBuild="true"/>
       <module name="jmx-remoting" externalBuild="true"/>

Deleted: trunk/connector/component-info.xml
===================================================================
--- trunk/connector/component-info.xml	2009-03-04 23:54:36 UTC (rev 85263)
+++ trunk/connector/component-info.xml	2009-03-04 23:57:22 UTC (rev 85264)
@@ -1,46 +0,0 @@
-<project name="connector-component-info">
-
-   <!-- ============================================================ -->
-   <!-- Connector                                                    -->
-   <!-- ============================================================ -->
-
-   <component id="connector"
-              module="jbosscx"
-              version="5.1-SNAPSHOT"
-              specTitle="JBoss"
-              specVersion="5.1.0"
-              specVendor="JBoss (http://www.jboss.org)"
-              implTitle="JBoss"
-              implURL="http://www.jboss.org"
-              implVersion="5.1.0"
-              implVendor="http://www.jboss.org"               
-   >
-      <artifact id="jboss-jca.jar"/>
-      <artifact id="jboss-common-jdbc-wrapper.jar"/>
-      <artifact id="jboss-local-jdbc.jar"/>
-      <artifact id="jboss-local-jdbc.rar"/>
-      <artifact id="jboss-ha-local-jdbc.jar"/>
-      <artifact id="jboss-ha-local-jdbc.rar"/>
-      <artifact id="jboss-xa-jdbc.jar" />
-      <artifact id="jboss-xa-jdbc.rar"/>
-      <artifact id="jboss-ha-xa-jdbc.jar" />
-      <artifact id="jboss-ha-xa-jdbc.rar"/>
-      <artifact id="jms-ra.jar"/>
-      <artifact id="jms-ra.rar"/>
-      <artifact id="mail-ra.jar"/>
-      <artifact id="mail-ra.rar"/>
-      <artifact id="jbosscx-client.jar"/>
-      <artifact id="jboss-ds_1_0.dtd"/>
-      <artifact id="jboss-ds_1_5.dtd"/>
-      <artifact id="jbossjca-service.xml" outputpath="resources/jca-sar"/>
-      <artifact id="hsqldb-ds.xml" outputpath="etc/example-config"/>
-      <artifact id="hajndi-jms-ds.xml" outputpath="etc/example-config"/>
-      <export>
-         <include input="jboss-jca.jar"/>
-         <include input="jboss-common-jdbc-wrapper.jar"/>
-         <include input="jboss-ha-local-jdbc.jar"/>
-      </export>
-   </component>
-
-
-</project>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2009-03-04 23:54:36 UTC (rev 85263)
+++ trunk/ejb3/pom.xml	2009-03-04 23:57:22 UTC (rev 85264)
@@ -37,6 +37,96 @@
           <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/resources"/>
+                <copy todir="output/resources" filtering="yes">
+                  <fileset dir="src/resources">
+                    <include name="**"/>
+                  </fileset>
+                </copy>
+                
+                <property name="output.lib" location="output/lib"/>
+                <mkdir dir="${output.lib}"/>
+                <copy file="target/${project.build.finalName}-client.jar"
+                      tofile="${output.lib}/jboss-appclient.jar"/>
+                <copy file="target/${project.build.finalName}-deployer.jar"
+                      tofile="${output.lib}/jboss-ejb3-deployer.jar"/>
+                <copy file="target/${project.build.finalName}-iiop.jar"
+                      tofile="${output.lib}/jboss-ejb3-iiop.jar"/>
+                
+                <unjar src="../thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" dest="output/resources">
+                  <patternset>
+                    <include name="*.xml" />
+                    <exclude name="META-INF/*.xml" />
+                    <include name="META-INF/*.properties" />
+                  </patternset>
+                </unjar>
+                <mkdir dir="${output.lib}/ejb3.deployer"/>
+                <copy todir="${output.lib}/ejb3.deployer">
+                   <fileset dir="${output.lib}">
+                      <include name="jboss-ejb3-deployer.jar"/>
+                      <include name="jboss-ejb3-iiop.jar"/>
+                   </fileset>
+                   <fileset dir="output/resources">
+                      <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
+                      <include name="META-INF/jpa-deployers-jboss-beans.xml"/>
+                   </fileset>
+                   <fileset dir="output/resources">
+                      <include name="META-INF/persistence.properties"/>
+                   </fileset>
+                </copy>
+                <copy todir="${output.lib}">
+                   <fileset dir="output/resources">
+                      <include name="ejb3-container-jboss-beans.xml"/>
+                      <include name="ejb3-connectors-jboss-beans.xml"/>
+                      <include name="ejb3-interceptors-aop.xml"/>
+                   </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>
   

Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml	2009-03-04 23:54:36 UTC (rev 85263)
+++ trunk/management/pom.xml	2009-03-04 23:57:22 UTC (rev 85264)
@@ -65,6 +65,62 @@
           <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>
+                
+                <property name="output.lib" location="output/lib"/>
+                <mkdir dir="${output.lib}"/>
+                <copy file="target/${project.build.finalName}.jar"
+                      tofile="${output.lib}/jboss-management.jar"/>
+                <copy file="target/${project.build.finalName}-ejb-management.jar"
+                      tofile="${output.lib}/ejb-management.jar"/>
+                <copy file="target/${project.build.finalName}-jsr77.jar"
+                      tofile="${output.lib}/jboss-jsr77.jar"/>
+                <copy file="target/${project.build.finalName}-jsr77-client.jar"
+                      tofile="${output.lib}/jboss-jsr77-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>
   

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-03-04 23:54:36 UTC (rev 85263)
+++ trunk/pom.xml	2009-03-04 23:57:22 UTC (rev 85264)
@@ -416,6 +416,8 @@
         <module>aspects</module>
         <module>profileservice</module>
         <module>connector</module>
+        <module>management</module>
+        <module>ejb3</module>
       </modules>
     </profile>
     




More information about the jboss-cvs-commits mailing list