[jboss-cvs] JBossAS SVN: r82911 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 15 11:22:00 EST 2009
Author: pgier
Date: 2009-01-15 11:22:00 -0500 (Thu, 15 Jan 2009)
New Revision: 82911
Added:
trunk/tools/etc/buildmagic/version.properties
Removed:
trunk/tools/etc/buildmagic/common.xml
Modified:
trunk/build/build.xml
trunk/main/pom.xml
trunk/main/src/assembly/run.xml
trunk/pom.xml
trunk/tools/etc/buildmagic/buildmagic.ent
Log:
[JBBUILD-506] Switch main module over to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/build/build.xml 2009-01-15 16:22:00 UTC (rev 82911)
@@ -93,7 +93,7 @@
<module name="iiop"/>
<module name="j2se"/>
<module name="jmx"/>
- <module name="main"/>
+ <module name="main" externalBuild="true"/>
<module name="management"/>
<module name="mbeans"/>
<module name="messaging"/>
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/main/pom.xml 2009-01-15 16:22:00 UTC (rev 82911)
@@ -49,6 +49,117 @@
</execution>
</executions>
</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"/>
+
+ <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}"/>
+ <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}"/>
+
+ <copy todir="output/resources" filtering="yes">
+ <fileset dir="src/resources">
+ </fileset>
+ </copy>
+
+ <jar destfile="target/${artifactId}-${version}-run.jar"
+ basedir="output/resources"
+ includes="org/jboss/version.properties"
+ update="true"/>
+
+ <mkdir dir="output/bin"/>
+ <copy todir="output/bin" filtering="yes">
+ <fileset dir="src/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <fixcrlf srcdir="output/bin"
+ eol="lf" eof="remove"
+ includes="**/*.sh, **/*.conf"/>
+
+ <fixcrlf srcdir="output/bin"
+ eol="crlf" eof="remove"
+ includes="**/*.bat, **/*.cmd"/>
+
+ <chmod perm="+x">
+ <fileset dir="output/bin">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jboss-main.jar"/>
+ <copy file="target/${artifactId}-${version}-client.jar"
+ tofile="output/lib/jboss-main-client.jar"/>
+ <copy file="target/${artifactId}-${version}-log4j-boot.jar"
+ tofile="output/lib/log4j-boot.jar"/>
+ <copy file="target/${artifactId}-${version}-run.jar"
+ tofile="output/lib/run.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>
Modified: trunk/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/main/src/assembly/run.xml 2009-01-15 16:22:00 UTC (rev 82911)
@@ -19,7 +19,7 @@
<includes>
<include>*.properties</include>
<include>jdklogger.xml</include>
- <include>org/jboss/version.properties</include>
+ <!--<include>org/jboss/version.properties</include>-->
</includes>
</fileSet>
</fileSets>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/pom.xml 2009-01-15 16:22:00 UTC (rev 82911)
@@ -420,6 +420,7 @@
<modules>
<module>component-matrix</module>
<module>bootstrap</module>
+ <module>main</module>
</modules>
</profile>
Modified: trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- trunk/tools/etc/buildmagic/buildmagic.ent 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/tools/etc/buildmagic/buildmagic.ent 2009-01-15 16:22:00 UTC (rev 82911)
@@ -86,11 +86,8 @@
<property name="build.id" value="${build.number}"/>
<!-- Version identifiers for the server. -->
- <property name="version.major" value="6"/>
- <property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="Alpha1"/>
- <property name="version.name" value="Neo"/>
+ <property file="${project.tools}/etc/buildmagic/version.properties"/>
+
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="JBoss_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
Deleted: trunk/tools/etc/buildmagic/common.xml
===================================================================
--- trunk/tools/etc/buildmagic/common.xml 2009-01-15 16:02:45 UTC (rev 82910)
+++ trunk/tools/etc/buildmagic/common.xml 2009-01-15 16:22:00 UTC (rev 82911)
@@ -1,324 +0,0 @@
-<!-- $Id$ -->
-
-<!-- ================================================================== -->
-<!-- Initialization -->
-<!-- ================================================================== -->
-
-<!-- Load Buildmagic extention tasks. -->
-<taskdef resource="org/jboss/tools/buildmagic/task/autoload.properties"/>
-<taskdef name="property" classname="org.jboss.tools.buildmagic.task.Property"/>
-
-<!-- Initialize the build system. -->
-<target name="_buildmagic:init">
- <!-- fail unless we have been started from the build script -->
- <require property="build.script">
-
- The build system MUST be executed with one of the provided build scripts.
-
- </require>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
- <available classname="java.lang.ThreadLocal" property="HAVE_JDK_1.2"/>
- <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <available classname="java.lang.management.LockInfo" property="HAVE_JDK_1.6"/>
-
- <!-- Setup the basic project roots. -->
- <property name="_project.root" value=".."/>
- <path id="project.root"><pathelement location="${_project.root}"/></path>
- <property name="project.root" refid="project.root"/>
- <property name="project.build" value="${project.root}/build"/>
-
- <!-- Include user and project property overrides. -->
- <property file="${user.home}/.buildmagic.properties"/>
- <property file="${user.home}/.ant.properties"/>
-
- <!-- Setup the project environment. -->
- <property file="${project.build}/local.properties"/>
- <property name="project.tools" value="${project.root}/tools"/>
- <property name="project.thirdparty" value="${project.root}/thirdparty"/>
-
- <!-- Setup the module environment. -->
- <property name="module.root" value="${basedir}"/>
-
- <available file="${module.root}/etc/local.properties-example"
- property="init.have-local-properties"/>
- <call target="_buildmagic:init:local-properties" if="init.have-local-properties"/>
-
- <property file="${module.root}/local.properties"/>
- <property name="module.source" value="${module.root}/src"/>
- <property name="module.output" value="${module.root}/output"/>
- <property name="module.tools" value="${module.root}/tools"/>
- <property name="module.thirdparty" value="${module.root}/thirdparty"/>
-
- <!-- Setup the build.log -->
- <call target="_buildmagic:init:buildlog" unless="init-buildlog.disable"/>
-
- <!-- Load common properties -->
- <property resource="org/jboss/tools/buildmagic/common.properties"/>
-
- <!-- Setup the build timestamp & build identifer properties -->
- <tstamp>
- <format property="build.number" pattern="yyyyMMddHHmm"/>
- <format property="YEAR" pattern="yyyy"/>
- </tstamp>
- <property name="build.id" value="${build.number}"/>
-
- <!-- Invoke the configure task -->
- <call target="configure" unless="configure.disable"/>
-
- <!-- Load common task properties -->
- <property resource="org/jboss/tools/buildmagic/task.properties"/>
-
- <!-- Late bind properties & install filters -->
- <resolver force="${buildmagic.resolveproperties.force}"/>
- <propertyfilter all="${buildmagic.propertyfilter.all}"/>
-
- <call target="_buildmagic:init:show-environment" if="init.verbose"/>
-
- <!-- Finish up -->
- <property name="init.disable" value="true"/>
-</target>
-
-<!-- Install the local.properties example if it is there -->
-<target name="_buildmagic:init:local-properties">
- <!-- Setup the local.properties file as needed -->
- <copy file="${module.root}/etc/local.properties-example"
- tofile="${module.root}/local.properties" filtering="yes"/>
- <property file="${module.root}/local.properties"/>
-</target>
-
-<!-- Initialize the build.log -->
-<target name="_buildmagic:init:buildlog">
- <record name="${basedir}/build.log" append="no"/>
- <property name="init-buildlog.disable" value="true" system="true"/>
-</target>
-
-<!-- Show the running environment if -Dinit.verbose=true -->
-<target name="_buildmagic:init:show-environment">
- <echo><![CDATA[
-project.root: ${project.root}
-module.root: ${module.root}
-user.home: ${user.home}
-build.compiler: ${build.compiler}
-java.home: ${java.home}
-java.class.path: ${java.class.path}
-java.version: ${java.version}
-java.vendor: ${java.vendor}
-java.vm.version: ${java.vm.version}
-java.vm.name: ${java.vm.name}
-java.vm.info: ${java.vm.info}
-os.name: ${os.name}
-os.arch: ${os.arch}
-os.version: ${os.version}
-]]></echo>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Cleaning -->
-<!-- ================================================================== -->
-
-<!-- Clean up all build output -->
-<target name="_buildmagic:clean" depends="init">
- <delete dir="${module.output}"/>
-</target>
-
-<!-- Clean up all generated files -->
-<target name="_buildmagic:clobber" depends="init">
-
- <!--
- | Try to stop the build log before we delete the file.
- -->
- <record name="${module.root}/build.log" action="stop"/>
-
- <!--
- | This file may be opened still due and fail to be removed on win32
- | systems, so lets just ignore those errors for now.
- -->
- <delete file="${module.root}/build.log" quiet="true" failonerror="false"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Help -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:help:standard" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-<target name="_buildmagic:help:build" depends="init">
- <projecthelp taskname="help">
- <header><![CDATA[
- The ${module.Name} module.
-]]></header>
- <footer><![CDATA[
- -Dgroups=<group>[(,<group>)*] Specify the module groups.
- -Dmodules=<module>[(,<module>)*] Specify the modules.
- (overrides groups).
- -projecthelp for all targets
- -help for full options
-]]></footer>
- </projecthelp>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Release -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:release:zip" depends="init">
- <zip zipfile="${module.output}/${release.id}.zip">
- <fileset dir="${module.output}">
- <include name="${release.id}/**"/>
- </fileset>
- </zip>
-</target>
-
-<target name="_buildmagic:release:tar" depends="init">
- <tar tarfile="${module.output}/${release.id}.tar" longfile="gnu"
- basedir="${module.output}"
- includes="${release.id}/**">
- </tar>
-</target>
-
-<target name="_buildmagic:release:tgz" depends="_buildmagic:release:tar">
- <gzip src="${module.output}/${release.id}.tar"
- zipfile="${module.output}/${release.id}.tgz"/>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Install -->
-<!-- ================================================================== -->
-
-<target name="_buildmagic:install:default" depends="init">
- <!-- Copy the output directory to the install directory -->
- <mkdir dir="${install.root}"/>
- <copy todir="${install.root}" filtering="no">
- <fileset dir="${module.output}">
- <include name="**/*"/>
- <exclude name="${install.id}/**"/>
- </fileset>
- </copy>
-</target>
-
-
-<!-- ================================================================== -->
-<!-- Module Pass-through Targets -->
-<!-- ================================================================== -->
-
-<!-- Invoke the 'all' on all configured modules -->
-<target name="_buildmagic:modules:all" depends="init">
- <execmodules target="all"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'most' on all configured modules -->
-<target name="_buildmagic:modules:most" depends="init">
- <execmodules target="most"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module-${module}-${target}-prepare"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'main' on all configured modules -->
-<target name="_buildmagic:modules:main" depends="init">
- <execmodules target="main"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <before target="_module-${module}-${target}-prepare"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'release' on all configured modules -->
-<target name="_buildmagic:modules:release" depends="init">
- <execmodules target="release"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'tests' on all configured modules -->
-<target name="_buildmagic:modules:tests" depends="init">
- <execmodules target="tests"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}"
- exportproperties="${executemodules.exportproperties}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clean' on all configured modules -->
-<target name="_buildmagic:modules:clean" depends="init">
- <execmodules target="clean"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
-<!-- Invoke the 'clobber' on all configured modules -->
-<target name="_buildmagic:modules:clobber" depends="init">
- <execmodules target="clobber"
- modules="${modules}"
- root="${project.root}/${module}"
- skipmissing="${executemodules.skipmissing}">
- <before target="_module-${module}-${target}-prepare"/>
- <header message="${executemodules.header}"/>
- <footer message="${executemodules.footer}"/>
- <after target="_module-${module}-${target}"/>
- <property name="init.have-parent" value="true"/>
- </execmodules>
-</target>
-
Added: trunk/tools/etc/buildmagic/version.properties
===================================================================
--- trunk/tools/etc/buildmagic/version.properties (rev 0)
+++ trunk/tools/etc/buildmagic/version.properties 2009-01-15 16:22:00 UTC (rev 82911)
@@ -0,0 +1,7 @@
+# Properties containing the version information for the release.
+version.major=6
+version.minor=0
+version.revision=0
+version.tag=Alpha1
+version.name=Neo
+
Property changes on: trunk/tools/etc/buildmagic/version.properties
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list