[jboss-cvs] JBossAS SVN: r68857 - branches/JBPAPP_4_2-4243merge-temp/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 10 19:11:25 EST 2008
Author: dbhole
Date: 2008-01-10 19:11:25 -0500 (Thu, 10 Jan 2008)
New Revision: 68857
Modified:
branches/JBPAPP_4_2-4243merge-temp/build/build-thirdparty.xml
branches/JBPAPP_4_2-4243merge-temp/build/build.xml
Log:
Allow switchable WS1 and 2 package heirarchies to build 4.2 and 4.3 from pristine WS1 and WS2
Modified: branches/JBPAPP_4_2-4243merge-temp/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2-4243merge-temp/build/build-thirdparty.xml 2008-01-10 23:48:57 UTC (rev 68856)
+++ branches/JBPAPP_4_2-4243merge-temp/build/build-thirdparty.xml 2008-01-11 00:11:25 UTC (rev 68857)
@@ -29,7 +29,7 @@
-->
<!-- set jbossws version -->
- <condition property="jbws.version" value="2.0.1.SP2-brew" else="1.2.1.GA_CP_snapshot">
+ <condition property="jbws.version" value="2.0.1.SP2-brew" else="1.2.1.GA_CP01">
<isset property="build.soa"/>
</condition>
Modified: branches/JBPAPP_4_2-4243merge-temp/build/build.xml
===================================================================
--- branches/JBPAPP_4_2-4243merge-temp/build/build.xml 2008-01-10 23:48:57 UTC (rev 68856)
+++ branches/JBPAPP_4_2-4243merge-temp/build/build.xml 2008-01-11 00:11:25 UTC (rev 68857)
@@ -1079,18 +1079,66 @@
<replace file="../server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"
summary="true">
<replacetoken><![CDATA[
-import javax.naming.Context;
import javax.naming.NamingException;
]]></replacetoken>
<replacevalue><![CDATA[
-import javax.naming.Context;
import javax.naming.NamingException;
import javax.xml.soap.FactoryLoader;
]]></replacevalue>
</replace>
+
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/deployment/ClientDeployer.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/ejb/Container.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/BeanMetaData.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/ClientMetaData.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/WebMetaData.java"/>
+ </antcall>
+ <antcall target="useWS1PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/web/AbstractWebDeployer.java"/>
+ </antcall>
+
</target>
<target name="patch.for.43" if="build.soa">
@@ -1121,7 +1169,6 @@
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
delegate = spiProvider.getSPI(ServiceRefHandlerFactory.class).getServiceRefHandler();
]]></replacevalue>
-
</replace>
<replace file="../server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"
@@ -1144,24 +1191,126 @@
]]></replacevalue>
</replace>
- <replace file="..//server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"
+ <replace file="../server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"
summary="true">
-
<replacetoken><![CDATA[
-import javax.naming.Context;
import javax.naming.NamingException;
import javax.xml.soap.FactoryLoader;
]]></replacetoken>
<replacevalue><![CDATA[
-import javax.naming.Context;
import javax.naming.NamingException;
]]></replacevalue>
</replace>
+
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/injection/WebServiceRefInjector.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/deployment/ClientDeployer.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/ejb/Container.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/BeanMetaData.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/ClientMetaData.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/serviceref/ServiceRefObjectFactory.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/metadata/WebMetaData.java"/>
+ </antcall>
+ <antcall target="useWS2PackageHeirarchy">
+ <param name="file.with.ws.imports" value="../server/src/main/org/jboss/web/AbstractWebDeployer.java"/>
+ </antcall>
+
</target>
+ <target name="useWS1PackageHeirarchy">
+ <replace file="${file.with.ws.imports}" summary="true">
+ <replacefilter
+ token="import org.jboss.wsf.spi.util.KernelLocator"
+ value="import org.jboss.ws.integration.KernelLocator"/>
+
+ <replacefilter
+ token="import org.jboss.wsf.spi.deployment.UnifiedVirtualFile"
+ value="import org.jboss.ws.integration.UnifiedVirtualFile"/>
+
+ <replacefilter
+ token="import org.jboss.wsf.spi.serviceref.ServiceRefElement"
+ value="import org.jboss.ws.integration.ServiceRefElement"/>
+
+ <replacefilter
+ token="import org.jboss.wsf.spi.serviceref.ServiceRefMetaData"
+ value="import org.jboss.ws.integration.ServiceRefMetaData"/>
+
+ <replacefilter
+ token="import org.jboss.wsf.spi.serviceref.ServiceRefHandler"
+ value="import org.jboss.ws.integration.ServiceRefHandler"/>
+
+ <replacefilter
+ token="import org.jboss.wsf.common.URLLoaderAdapter"
+ value="import org.jboss.ws.integration.URLLoaderAdapter"/>
+ </replace>
+ </target>
+
+ <target name="useWS2PackageHeirarchy">
+ <replace file="${file.with.ws.imports}" summary="true">
+ <replacefilter
+ token="import org.jboss.ws.integration.KernelLocator"
+ value="import org.jboss.wsf.spi.util.KernelLocator"/>
+
+ <replacefilter
+ token="import org.jboss.ws.integration.UnifiedVirtualFile"
+ value="import org.jboss.wsf.spi.deployment.UnifiedVirtualFile"/>
+
+ <replacefilter
+ token="import org.jboss.ws.integration.ServiceRefElement"
+ value="import org.jboss.wsf.spi.serviceref.ServiceRefElement"/>
+
+ <replacefilter
+ token="import org.jboss.ws.integration.ServiceRefMetaData"
+ value="import org.jboss.wsf.spi.serviceref.ServiceRefMetaData"/>
+
+ <replacefilter
+ token="import org.jboss.ws.integration.ServiceRefHandler"
+ value="import org.jboss.wsf.spi.serviceref.ServiceRefHandler"/>
+ <replacefilter
+ token="import org.jboss.ws.integration.URLLoaderAdapter"
+ value="import org.jboss.wsf.common.URLLoaderAdapter"/>
+ </replace>
+ </target>
+
<!-- Before executing <replace> task on Windows, convert the target files from -->
<!-- UNIX line termination (LF) to Windows line termination (CRLF) so that -->
<!-- <replace> does not break due to line termination inconsistencies -->
More information about the jboss-cvs-commits
mailing list