Permalink
Browse files

Fix for Bug 7031 except for client wsdd warning on broker, need input…

… about broker independence
  • Loading branch information...
1 parent 8f011d9 commit bcd1cd4f9e7e9d31950cd37736bae8ddd4732cd6 @timf timf committed May 30, 2010
@@ -32,6 +32,7 @@ nimbus.autoconfig.gt4_0.gar.build.schema.dir=${nimbus.autoconfig.gt4_0.gar.build
nimbus.autoconfig.gt4_0.gar.build.docs.dir=${nimbus.autoconfig.gt4_0.gar.build.dir}/docs
nimbus.autoconfig.gt4_0.gar.build.bin.dir=${nimbus.autoconfig.gt4_0.gar.build.dir}/bin
+nimbus.autoconfig.gt4_0.build.packages.xml=../scripts/lib/gt4.0/build/build-packages.xml
###############################
# Dependencies from source tree
@@ -26,8 +26,7 @@
<property environment="env"/>
<property name="abs.deploy.dir" location="${env.GLOBUS_LOCATION}"/>
<property name="gt4_0.lib.dir" location="${abs.deploy.dir}/lib"/>
- <property name="build.packages"
- location="${abs.deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.packages" location="${nimbus.autoconfig.gt4_0.build.packages.xml}"/>
<!-- *******************************************************************
@@ -226,6 +225,9 @@
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -20,6 +20,8 @@ vws.gt4_0-elastic.stubs.dist.dir=dist
vws.gt4_0-elastic.stubs.build.tmpschemas.dir=build/tmpschemas
+vws.gt4_0-elastic.stubs.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
+
vws.gt4_0-elastic.stubs.package.name=nimbus-messaging-stubs-gt4.0-elastic
vws.gt4_0-elastic.stubs.jar.name=${vws.gt4_0-elastic.stubs.package.name}.jar
@@ -18,8 +18,7 @@
location="${env.GLOBUS_LOCATION}"/>
<property name="gt4_0.lib.dir"
location="${abs.deploy.dir}/lib"/>
- <property name="build.packages"
- location="${abs.deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.packages" location="${vws.gt4_0-elastic.stubs.build.packages.xml}"/>
<property name="build.stubs"
location="${abs.deploy.dir}/share/globus_wsrf_tools/build-stubs.xml"/>
@@ -230,6 +229,9 @@
<target name="_dist" depends="copyjar">
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -13,6 +13,8 @@ vws.gt4_0-elastic.schemas.build.docs.dir=build/docs
vws.gt4_0-elastic.schemas.build.bin.dir=build/bin
vws.gt4_0-elastic.schemas.dist.dir=dist
+vws.gt4_0-elastic.schemas.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
+
# you can override this in ~/nimbus.build.properties
nimbus.java.compilerarg=-nowarn
@@ -14,8 +14,7 @@
<property name="gar.name"
value="${vws.gt4_0-elastic.schemas.dist.dir}/${vws.gt4_0-elastic.schemas.package.name}.gar"/>
- <property name="build.packages" location=
- "${deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.packages" location="${vws.gt4_0-elastic.schemas.build.packages.xml}"/>
<!--
<property name="noSchema" value="true"/>
@@ -72,6 +71,9 @@
<echo message="**** Module: ${basedir}" />
<echo>Building: ${vws.gt4_0-elastic.schemas.print-noun}</echo>
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -48,6 +48,8 @@ nimbus.messaging.gt4_0.gar.build.schema.dir=${nimbus.messaging.gt4_0.gar.build.d
nimbus.messaging.gt4_0.gar.build.docs.dir=${nimbus.messaging.gt4_0.gar.build.dir}/docs
nimbus.messaging.gt4_0.gar.build.bin.dir=${nimbus.messaging.gt4_0.gar.build.dir}/bin
+# custom build-packages to bundle gar file
+nimbus.messaging.gt4_0.gar.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
##############################################
# Directories to copy into GAR's ETC directory
@@ -28,7 +28,7 @@
<property name="abs.deploy.dir"
location="${env.GLOBUS_LOCATION}"/>
<property name="build.packages"
- location="${abs.deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ location="${nimbus.messaging.gt4_0.gar.build.packages.xml}"/>
<!-- *******************************************************************
@@ -192,6 +192,7 @@
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.client-deploy.wsdd" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -25,6 +25,8 @@ vws.gt4_0.stubs.dist.dir=dist
vws.gt4_0.stubs.build.tmpschemas.dir=build/tmpschemas
+vws.gt4_0.stubs.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
+
vws.gt4_0.stubs.package.name=nimbus-messaging-stubs-gt4.0
vws.gt4_0.stubs.jar.name=${vws.gt4_0.stubs.package.name}.jar
@@ -18,8 +18,7 @@
location="${env.GLOBUS_LOCATION}"/>
<property name="gt4_0.lib.dir"
location="${abs.deploy.dir}/lib"/>
- <property name="build.packages"
- location="${abs.deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.packages" location="${vws.gt4_0.stubs.build.packages.xml}"/>
<property name="build.stubs"
location="${abs.deploy.dir}/share/globus_wsrf_tools/build-stubs.xml"/>
@@ -284,6 +283,9 @@
<target name="_dist" depends="copyjar">
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -13,6 +13,8 @@ vws.gt4_0.schemas.build.docs.dir=build/docs
vws.gt4_0.schemas.build.bin.dir=build/bin
vws.gt4_0.schemas.dist.dir=dist
+vws.gt4_0.schemas.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
+
# you can override this in ~/nimbus.build.properties
nimbus.java.compilerarg=-nowarn
@@ -14,8 +14,7 @@
<property name="gar.name"
value="${vws.gt4_0.schemas.dist.dir}/${vws.gt4_0.schemas.package.name}.gar"/>
- <property name="build.packages" location=
- "${deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ <property name="build.packages" location="${vws.gt4_0.schemas.build.packages.xml}"/>
<!--
<property name="noSchema" value="true"/>
@@ -72,6 +71,9 @@
<echo message="**** Module: ${basedir}" />
<echo>Building: ${vws.gt4_0.schemas.print-noun}</echo>
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>
@@ -33,6 +33,8 @@ nimbus.client.gt4_0.gar.build.bin.dir=${nimbus.client.gt4_0.gar.build.dir}/bin
nimbus.client.gt4_0.gar.build.schema.dir=${nimbus.client.gt4_0.gar.build.dir}/schema
nimbus.client.gt4_0.gar.build.docs.dir=${nimbus.client.gt4_0.gar.build.dir}/docs
+nimbus.client.gt4_0.build.packages.xml=../../../../scripts/lib/gt4.0/build/build-packages.xml
+
###############################
# Dependencies from source tree
@@ -27,7 +27,7 @@
<property name="abs.deploy.dir" location="${env.GLOBUS_LOCATION}"/>
<property name="gt4_0.lib.dir" location="${abs.deploy.dir}/lib"/>
<property name="build.packages"
- location="${abs.deploy.dir}/share/globus_wsrf_common/build-packages.xml"/>
+ location="${nimbus.client.gt4_0.build.packages.xml}"/>
<!-- *******************************************************************
@@ -226,6 +226,9 @@
<ant antfile="${build.packages}" target="makeGar">
+ <property name="forget.server-deploy.wsdd" value="x" />
+ <property name="forget.client-deploy.wsdd" value="x" />
+ <property name="forget.jndi-config-deploy.xml" value="x" />
<reference refid="${garjars.id}"/>
<reference refid="${garetc.id}"/>
<reference refid="${garshare.id}"/>

0 comments on commit bcd1cd4

Please sign in to comment.