[jboss-cvs] JBossAS SVN: r69714 - in branches/JBPAPP_4_2_0_GA_CP: ejb3 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 7 18:56:08 EST 2008
Author: dbhole
Date: 2008-02-07 18:56:08 -0500 (Thu, 07 Feb 2008)
New Revision: 69714
Modified:
branches/JBPAPP_4_2_0_GA_CP/build/README
branches/JBPAPP_4_2_0_GA_CP/build/build-distr.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/server/build.xml
branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml
branches/JBPAPP_4_2_0_GA_CP/webservices/build.xml
Log:
Update parts of the newly merged code so that it can process the build.soa
switch in the new way introduced in CP02.
Modified: branches/JBPAPP_4_2_0_GA_CP/build/README
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/README 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/build/README 2008-02-07 23:56:08 UTC (rev 69714)
@@ -1,10 +1,13 @@
Build files allow for conditional switching between MQ and JBM:
--Dbuild.soa=true passed to build/build.xml builds with JBM
--Djbosstest.useJBM=true passed to testsuite/build.xml tests with JBM
+-Dbuild.soa=true passed to build/build.xml builds with JBM and WS 2.0.x
+-Djbosstest.useJBM=true passed to testsuite/build.xml tests with JBM and WS 2.0.x
-Not supplying -Dbuild.soa=true will build with MQ
-Not supplying -Djbosstest.useJBM will run MQ tests
+-Dbuild.soa=false passed to build/build.xml builds with MQ and WS 1.2.x
-The version with MQ will identify itself as EAP 4.2
-The version with JBM, however, will identify itself as EAP 4.3
+
+Note:
+- build.soa *MUST* be supplied as either true or false -- either on
+ commandline or via the build.properties file.
+- To run MQ tests, do *not* supply -Djbosstest.useJBM
+
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build-distr.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -10,6 +10,11 @@
&libraries;
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- ================================================================== -->
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
@@ -1692,7 +1697,7 @@
<target name="ws-thirdparty" description = "Thirdparty setup for WS. This target works with ws 1.2.x and 2.x" depends="ws-thirdparty-12,ws-thirdparty-20"/>
- <target name="ws-thirdparty-12" description = "Thirdparty setup for WS 1.2.x" unless="build.soa">
+ <target name="ws-thirdparty-12" description = "Thirdparty setup for WS 1.2.x" unless="build.soa.bits">
<!-- copy thirdparty items to client dir -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1728,7 +1733,7 @@
</target>
- <target name="ws-thirdparty-20" description = "Thirdparty setup for WS 2.0.x" if="build.soa">
+ <target name="ws-thirdparty-20" description = "Thirdparty setup for WS 2.0.x" if="build.soa.bits">
<!-- copy thirdparty items to client dir -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -99,7 +99,7 @@
<and>
<isset property="HAVE_JDK_1.5"/>
<not>
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</not>
</and>
</condition>
@@ -107,7 +107,7 @@
<condition property="build-jdk5" value="ejb3x,ejb3,webservices">
<and>
<isset property="HAVE_JDK_1.5"/>
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</and>
</condition>
@@ -591,11 +591,11 @@
<!-- Webservices -->
<!-- =========== -->
- <target name="_module-webservices-most" if="build.soa">
+ <target name="_module-webservices-most" if="build.soa.bits">
<ant antfile="build-distr.xml" target="_module-webservices-most"/>
</target>
- <target name="_module-webservices-all" depends="_module-webservices-most" if="build.soa">
+ <target name="_module-webservices-all" depends="_module-webservices-most" if="build.soa.bits">
<ant antfile="build-distr.xml" target="_module-webservices-all"/>
</target>
@@ -1086,7 +1086,7 @@
<target name="conditional.eap.patches" depends="patch.for.42,patch.for.43"/>
- <target name="patch.for.42" unless="build.soa">
+ <target name="patch.for.42" unless="build.soa.bits">
<!-- Fix up the EOL characters for Windows files -->
<antcall target="fixEOL"/>
@@ -1201,7 +1201,7 @@
</target>
- <target name="patch.for.43" if="build.soa">
+ <target name="patch.for.43" if="build.soa.bits">
<!-- Fix up the EOL characters for Windows files -->
<antcall target="fixEOL"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -33,23 +33,24 @@
<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>
+
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
- <!-- 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">
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -31,27 +31,28 @@
&buildmagic;
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
- <!-- ================================================================== -->
- <!-- 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.
Modified: branches/JBPAPP_4_2_0_GA_CP/server/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/build.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/server/build.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -32,16 +32,21 @@
&buildmagic;
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!-- ================================================================== -->
Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/build.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -31,16 +31,21 @@
&buildmagic;
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!--
Modified: branches/JBPAPP_4_2_0_GA_CP/webservices/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/webservices/build.xml 2008-02-07 22:14:50 UTC (rev 69713)
+++ branches/JBPAPP_4_2_0_GA_CP/webservices/build.xml 2008-02-07 23:56:08 UTC (rev 69714)
@@ -37,16 +37,21 @@
-->
&targets;
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
+
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa"/>
+ <isset property="build.soa.bits"/>
</condition>
<!-- ================================================================== -->
More information about the jboss-cvs-commits
mailing list