[riftsaw-commits] riftsaw SVN: r514 - in trunk: runtime/engine-assembly/src/main/resources and 1 other directory.

Author: kurtstam Date: 2010-02-25 11:31:53 -0500 (Thu, 25 Feb 2010) New Revision: 514 Modified: trunk/distribution/src/main/release/install/build.xml trunk/runtime/engine-assembly/src/main/resources/bpel.properties Log: RIFTSAW-166, turn UDDI integration off by default, only activate when jbossesb-registry is detected at install time. Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-02-25 10:06:58 UTC (rev 513) +++ trunk/distribution/src/main/release/install/build.xml 2010-02-25 16:31:53 UTC (rev 514) @@ -233,13 +233,13 @@ <delete dir="${deploy.dir}/juddi-service.sar"/> </target> - <target name="check.jbossesb"> - <condition property="is.jbossesb"> - <available file="${deploy.dir}/jbossesb.sar" /> + <target name="check.jbossesb-registry"> + <condition property="is.jbossesb-registry"> + <available file="${deploy.dir}/jbossesb-registry.sar" /> </condition> </target> - <target name="deploy.esb.uddi.config" if="is.jbossesb" depends="check.jbossesb"> + <target name="deploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry"> <echo>deploy jUDDI configuration</echo> <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old"/> <copy file="../db/juddi/esb.juddi.client.xml" @@ -250,14 +250,15 @@ todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> <copy file="../db/juddi/jbossesb_BusinessEntity.xml" todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> + <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.registration=false" value="bpel.uddi.registration=true"/> </target> - <target name="undeploy.esb.uddi.config" if="is.jbossesb" depends="check.jbossesb"> - <echo>undeploy jUDDI configuration</echo> - <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml"/> - <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old" - tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml"/> - <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_BusinessEntity.xml" /> - </target> + <target name="undeploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry"> + <echo>undeploy jUDDI configuration</echo> + <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml"/> + <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old" + tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml"/> + <delete file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_BusinessEntity.xml" /> + </target> </project> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel.properties =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-02-25 10:06:58 UTC (rev 513) +++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-02-25 16:31:53 UTC (rev 514) @@ -90,7 +90,7 @@ # if set to true will self-register BPEL endpoints upon deployment to a UDDI. # this uses the juddi-client-3.0.0 and the uddi client config can be set in the uddi.xml # file -bpel.uddi.registration=true +bpel.uddi.registration=false hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update