[jboss-cvs] JBossAS SVN: r69335 - in branches/JBPAPP_4_2_0_GA_CP: ejb3 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 24 19:36:35 EST 2008
Author: dbhole
Date: 2008-01-24 19:36:35 -0500 (Thu, 24 Jan 2008)
New Revision: 69335
Added:
branches/JBPAPP_4_2_0_GA_CP/build/build.properties
Modified:
branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml
branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
branches/JBPAPP_4_2_0_GA_CP/build/build.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/imports/build-mq2jbm.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml
branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml
Log:
Build changes to allow building of 4.2/4.3 via changes to a single properties file.
This change does away with the need for defining version and other properties at
build time, thus making it easier to hardcode a build version right before tagging
4.2/4.3 releases.
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-release.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -73,13 +73,13 @@
<property name="cvs.module" value="jboss-${release.version.major}.${release.version.minor}.x"/>
<!-- Set the cvs.tag based on the release.version.* properties -->
<!-- Set the cvs.tag based on the release.version.* properties -->
- <condition property="cvs.tag" value="JBoss_${release.version.major}_${release.version.minor}_${release.version.revision}_${release.version.tag}">
+ <condition property="cvs.tag" value="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}_${release.version.tag}">
<isset property="release.version.tag"/>
</condition>
<condition property="version" value="${release.version.major}.${release.version.minor}.${release.version.revision}.${release.version.tag}">
<isset property="release.version.tag"/>
</condition>
- <condition property="cvs.tag" value="JBoss_${release.version.major}_${release.version.minor}_${release.version.revision}">
+ <condition property="cvs.tag" value="JBPAPP_${release.version.major}_${release.version.minor}_${release.version.revision}">
<not>
<isset property="release.version.tag"/>
</not>
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-thirdparty.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -4,6 +4,7 @@
<!-- Property File definitions -->
<property file="local.properties"/>
+ <property file="build.properties"/>
<property file="synchronize.properties"/>
<property environment="env"/>
@@ -28,13 +29,18 @@
<setproxy proxyhost="<your.proxy.host>" proxyport="<your.proxy.port>"/>
-->
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- set jbossws component name/version depending on whether we are building 4.2 or 4.3 -->
<condition property="jbws.version" value="1.2.1.GA_CP01" else="1.2.1.GA_CP01">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jbws.name" value="jboss/jbossws-jboss42" else="jboss/jbossws-jboss42">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!-- Main Definition of dependencies -->
Copied: branches/JBPAPP_4_2_0_GA_CP/build/build.properties (from rev 68225, branches/JBPAPP_4_3_tmp/build/build.properties)
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.properties 2008-01-25 00:36:35 UTC (rev 69335)
@@ -0,0 +1,9 @@
+# This file defines default property set for build variables
+
+version.major=4
+version.minor=2
+version.revision=0
+version.tag=GA_CP02
+version.name=EAP
+
+build.soa=false
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -34,6 +34,24 @@
<!-- Initialization -->
<!-- ================================================================== -->
+ <condition property="build.properties.file.exists">
+ <available file="build.properties" type="file"/>
+ </condition>
+
+ <fail unless="build.properties.file.exists">
+ build.properties file not found.
+Please ensure that build.properties exists in the build dir of the checkout tree.
+ </fail>
+
+
+ <!-- Read in properties file for configuration to go smoothly -->
+ <property file="build.properties"/>
+
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!--
| Initialize the build system. Must depend on '_buildmagic:init'.
| Other targets should depend on 'init' or things will mysteriously fail.
@@ -42,7 +60,6 @@
<target name="init" unless="init.disable" depends="_buildmagic:init">
</target>
-
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
@@ -200,6 +217,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
@@ -389,7 +407,7 @@
</target>
<!-- Parameter target - The target which will be replaced by jboss-messaging -->
- <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init" if="build.soa">
+ <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init" if="build.soa.bits">
<ant antfile="build-distr.xml" target="replace-messaging">
<property name="target" value="default" />
@@ -1005,14 +1023,14 @@
<condition property="verconf.to.keep" value="43CONF" else="42CONF">
<or>
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
<isset property="build.with.jbm"/>
</or>
</condition>
<condition property="verconf.to.delete" value="42CONF" else="43CONF">
<or>
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
<isset property="build.with.jbm"/>
</or>
</condition>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -33,14 +33,19 @@
<property name="buildlog.level" value="info" />
<property environment="env"/>
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- TODO: integrate jboss.jms.provider and jboss.jms.product -->
<condition property="jboss.jms.provider" value="jbm" else="mq">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jms.product" value="messaging" else="mq">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -36,6 +36,11 @@
<!-- Initialization -->
<!-- ================================================================== -->
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!--
Configure the right JMSDestinationFactory, in EAP 4.2 we communicate with JBossMQ,
in EAP 4.3 we communicate with JBoss Messaging.
@@ -43,7 +48,7 @@
<condition property="JMSDestinationFactory"
value="org.jboss.ejb3.jms.ServerPeerJMSDestinationFactory"
else="org.jboss.ejb3.jms.DestinationManagerJMSDestinationFactory">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!--
@@ -383,7 +388,7 @@
</jar>
<!-- set JMSDestinationFactory -->
- <echo level="warning" message="build.soa = ${build.soa}"/>
+ <echo level="warning" message="build.soa.bits = ${build.soa.bits}"/>
<mkdir dir="${build.resources}/META-INF"/>
<copy todir="${build.resources}/META-INF" file="${resources}/META-INF/jboss-service.xml"/>
<replace file="${build.resources}/META-INF/jboss-service.xml"
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/imports/build-mq2jbm.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/imports/build-mq2jbm.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/imports/build-mq2jbm.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -1,11 +1,17 @@
<project name="build-mq2jbm">
- <target name="_build-mq2jbm-transform" if="build.soa">
+
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
+ <target name="_build-mq2jbm-transform" if="build.soa.bits">
<xslt style="${resources}/test/mq2jbm.xsl"
in="${resources}/test/${testname}/${descriptor}"
out="${target.resources}/test/${testname}/${descriptor}"/>
</target>
- <target name="_build-mq2jbm-copymq" unless="build.soa">
+ <target name="_build-mq2jbm-copymq" unless="build.soa.bits">
<copy todir="${target.resources}/test/${testname}" file="${resources}/test/${testname}/${descriptor}"/>
</target>
@@ -39,4 +45,4 @@
</xslt>
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/build-common.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -70,6 +70,7 @@
<!-- Include user and project property overrides. -->
<import file="version-info.xml" />
<property file="${project.build}/local.properties"/>
+ <property file="${project.build}/build.properties"/>
<available file="${module.root}/etc/local.properties-example"
property="init.have-local-properties"/>
@@ -86,6 +87,10 @@
<!-- Marker to disable mbeans -->
<property name="mbean-bypass.marker" value="${module.output}/mbean-marker"/>
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
<!-- Initialize the build.log -->
<target name="_buildmagic:init:buildlog">
@@ -778,6 +783,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/buildmagic.ent 2008-01-25 00:36:35 UTC (rev 69335)
@@ -53,6 +53,7 @@
<!-- Setup the module environment. -->
<property name="module.root" value="${basedir}"/>
<property file="${module.root}/local.properties"/>
+ <property file="${project.build}/build.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"/>
@@ -104,7 +105,7 @@
<property name="version.tag" value="GA_CP02"/>
<property name="version.name" value="Trinity"/>
<!-- 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}" />
+ <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}" />
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
@@ -909,6 +910,7 @@
version.tag,
version.name,
version.cvstag,
+ build.soa,
specification.title,
specification.version,
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/common.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -37,6 +37,7 @@
<!-- Setup the project environment. -->
<property file="${project.build}/local.properties"/>
+ <property file="${project.build}/build.properties"/>
<property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
@@ -78,6 +79,11 @@
<call target="_buildmagic:init:show-environment" if="init.verbose"/>
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- Finish up -->
<property name="init.disable" value="true"/>
</target>
Modified: branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml 2008-01-25 00:36:33 UTC (rev 69334)
+++ branches/JBPAPP_4_2_0_GA_CP/tools/etc/buildmagic/version-info.xml 2008-01-25 00:36:35 UTC (rev 69335)
@@ -20,7 +20,7 @@
<property name="version.tag" value="GA_CP02"/>
<property name="version.name" value="Trinity"/>
<!-- 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}"/>
+ <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
More information about the jboss-cvs-commits
mailing list