[jboss-cvs] JBossAS SVN: r83697 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 30 11:55:46 EST 2009
Author: pgier
Date: 2009-01-30 11:55:46 -0500 (Fri, 30 Jan 2009)
New Revision: 83697
Removed:
trunk/system/component-info.xml
Modified:
trunk/build/build.xml
trunk/main/pom.xml
trunk/pom.xml
trunk/system-jmx/pom.xml
trunk/system/pom.xml
Log:
[JBBUILD-506] Switch system and system-jmx modules over to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/build/build.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -110,8 +110,8 @@
<module name="security"/>
<module name="server"/>
<module name="spring-int"/>
- <module name="system"/>
- <module name="system-jmx"/>
+ <module name="system" externalBuild="true"/>
+ <module name="system-jmx" externalBuild="true"/>
<module name="testsuite"/>
<module name="tomcat"/>
<module name="varia"/>
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/main/pom.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -70,10 +70,6 @@
<property file="../tools/etc/buildmagic/version.properties"/>
- <echo message="build.id = ${build.id}"/>
- <echo message="version.major = ${version.major}"/>
- <mkdir dir="output/resources"/>
-
<filter filtersfile="../tools/etc/buildmagic/version.properties"/>
<filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
<filter token="build.number" value="${build.number}"/>
@@ -95,6 +91,7 @@
<filter token="os.arch" value="${os.arch}"/>
<filter token="os.version" value="${os.version}"/>
+ <mkdir dir="output/resources"/>
<copy todir="output/resources" filtering="yes">
<fileset dir="src/resources">
</fileset>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/pom.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -436,6 +436,8 @@
<module>j2se</module>
<module>mbeans</module>
<module>jmx</module>
+ <module>system</module>
+ <module>system-jmx</module>
</modules>
</profile>
Deleted: trunk/system/component-info.xml
===================================================================
--- trunk/system/component-info.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/system/component-info.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -1,39 +0,0 @@
-<project name="system-component-info">
- <!-- ============================================================ -->
- <!-- System -->
- <!-- ============================================================ -->
-
- <component id="system"
- module="jboss-system"
- version="5.0-SNAPSHOT"
- specTitle="JBoss"
- specVersion="5.0.0"
- specVendor="JBoss (http://www.jboss.org)"
- implTitle="JBoss"
- implURL="http://www.jboss.org"
- implVersion="5.0.0"
- implVendor="JBoss.org"
-
-
- >
- <artifact id="jboss-system.jar"/>
- <artifact id="jboss-system-client.jar"/>
- <artifact id="jboss-boot.jar"/>
- <artifact id="run.jar"/>
- <artifact id="log4j-boot.jar"/>
- <artifact id="testsuite-support.jar"/>
- <artifact id="jboss-service_3_2.dtd" release="docs/dtd"/>
- <artifact id="jboss-service_4_0.dtd" release="docs/dtd"/>
- <artifact id="jboss-subscription.dtd" release="docs/dtd"/>
- <export>
- <include input="jboss-system.jar"/>
- </export>
-
- <artifact id="run.sh"/>
- <artifact id="run.bat"/>
- <artifact id="run.conf"/>
- <artifact id="classpath.sh"/>
-
- </component>
-
-</project>
\ No newline at end of file
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/system/pom.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -40,6 +40,86 @@
<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>
+
+ <tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm"/>
+ <format property="YEAR" pattern="yyyy"/>
+ </tstamp>
+ <property name="build.id" value="${build.number}"/>
+
+ <property file="../tools/etc/buildmagic/version.properties"/>
+
+ <filter filtersfile="../tools/etc/buildmagic/version.properties"/>
+ <filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+ <filter token="build.number" value="${build.number}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="DSTAMP" value="${DSTAMP}"/>
+ <filter token="TSTAMP" value="${TSTAMP}"/>
+ <filter token="TODAY" value="${TODAY}"/>
+
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
+ <filter token="java.vm.specification.version" value="${java.vm.specification.version}"/>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.name" value="${java.vm.name}"/>
+ <filter token="java.vm.info" value="${java.vm.info}"/>
+ <filter token="java.specification.version" value="${java.specification.version}"/>
+ <filter token="java.class.version" value="${java.class.version}"/>
+
+ <filter token="os.name" value="${os.name}"/>
+ <filter token="os.arch" value="${os.arch}"/>
+ <filter token="os.version" value="${os.version}"/>
+
+ <mkdir dir="output/resources"/>
+ <copy todir="output/resources" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jboss-system.jar"/>
+ <copy file="target/${artifactId}-${version}-client.jar"
+ tofile="output/lib/jboss-system-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/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2009-01-30 16:53:25 UTC (rev 83696)
+++ trunk/system-jmx/pom.xml 2009-01-30 16:55:46 UTC (rev 83697)
@@ -31,6 +31,88 @@
<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>
+
+ <!--<tstamp>
+ <format property="build.number" pattern="yyyyMMddHHmm"/>
+ <format property="YEAR" pattern="yyyy"/>
+ </tstamp>
+ <property name="build.id" value="${build.number}"/>
+
+ <property file="../tools/etc/buildmagic/version.properties"/>
+
+ <filter filtersfile="../tools/etc/buildmagic/version.properties"/>
+ <filter token="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+ <filter token="build.number" value="${build.number}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="DSTAMP" value="${DSTAMP}"/>
+ <filter token="TSTAMP" value="${TSTAMP}"/>
+ <filter token="TODAY" value="${TODAY}"/>
+
+ <filter token="java.version" value="${java.version}"/>
+ <filter token="java.vendor" value="${java.vendor}"/>
+ <filter token="java.vm.specification.version" value="${java.vm.specification.version}"/>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.name" value="${java.vm.name}"/>
+ <filter token="java.vm.info" value="${java.vm.info}"/>
+ <filter token="java.specification.version" value="${java.specification.version}"/>
+ <filter token="java.class.version" value="${java.class.version}"/>
+
+ <filter token="os.name" value="${os.name}"/>
+ <filter token="os.arch" value="${os.arch}"/>
+ <filter token="os.version" value="${os.version}"/>-->
+
+ <mkdir dir="output/resources"/>
+ <copy todir="output/resources" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jboss-system-jmx.jar"/>
+ <copy file="target/${artifactId}-${version}-client.jar"
+ tofile="output/lib/jboss-system-jmx-client.jar"/>
+ <copy file="target/${artifactId}-${version}-testsuite-support.jar"
+ tofile="output/lib/testsuite-support.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>
More information about the jboss-cvs-commits
mailing list