[riftsaw-commits] riftsaw SVN: r849 - in branches/RiftSaw-2.1.x: runtime and 1 other directories.

Author: objectiser Date: 2010-07-09 06:35:36 -0400 (Fri, 09 Jul 2010) New Revision: 849 Removed: branches/RiftSaw-2.1.x/runtime/uddi300/ Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml branches/RiftSaw-2.1.x/runtime/pom.xml branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java Log: RIFTSAW-234 - applied Kurt's fix to 2.1.x branch. Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-07-09 10:32:44 UTC (rev 848) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-07-09 10:35:36 UTC (rev 849) @@ -240,20 +240,10 @@ <isfalse value="${is.renamedToOld}"/> </condition> </target> - - <target name="check.UDDI300" if="is.jbossesb-registry" depends="check.jbossesb-registry"> - <condition property="is.juddi300"> - <available file="${deployers.dir}/esb.deployer/lib/juddi-client-3.0.0.aop.jar" /> - </condition> - <condition property="is.juddi"> - <isfalse value="${is.juddi300}"/> - </condition> - </target> - <target name="deploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry,removeUDDI,removeUDDI300,renameEsbJUDDIClientXML"> + <target name="deploy.esb.uddi.config" if="is.jbossesb-registry" depends="check.jbossesb-registry,renameEsbJUDDIClientXML"> <echo>deploy jUDDI configuration</echo> - <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml" tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old"/> <copy file="../db/juddi/jbossesb_tModels.xml" @@ -270,44 +260,21 @@ <replacetoken><![CDATA[juddi.seed.always">false]]></replacetoken> <replacevalue><![CDATA[juddi.seed.always">true]]></replacevalue> </replace> - <echo>${manager.name}</echo> <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.clerk.manager=esb-registry" - value="bpel.uddi.clerk.manager=${manager.name}"/> + value="bpel.uddi.clerk.manager=esb-registry"/> <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration" - value="bpel.uddi.client.impl=${UDDI.impl}"/> + value="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"/> </target> <target name="renameEsbJUDDIClientXML" if="isNot.renamedToOld" depends="check.esb.juddi.client.xml.old"> <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.version}.client.xml" + <copy file="../db/juddi/esb.juddi.client.xml" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml" /> </target> - <!-- remove riftsaw-uddi jar if esb contains juddi-300 client artifacts --> - <target name="removeUDDI" if="is.juddi300" depends="check.UDDI300"> - <echo>remove riftsaw-uddi.jar</echo> - <property name="juddi.version" value="juddi300"/> - <property name="manager.name" value="test-manager"/> - <property name="UDDI.impl" value="org.jboss.soa.bpel.uddi300.UDDI300Registration" /> - <delete> - <fileset dir="${deploy.dir}/riftsaw.sar/lib/" includes="riftsaw-uddi-*.jar"/> - </delete> - </target> - - <!-- remove riftsaw-uddi300 jar if esb contains juddi-301 or higher client artifacts --> - <target name="removeUDDI300" if="is.juddi" depends="check.UDDI300"> - <echo>remove riftsaw-uddi300.jar</echo> - <property name="juddi.version" value="juddi"/> - <property name="manager.name" value="esb-registry"/> - <property name="UDDI.impl" value="org.jboss.soa.bpel.uddi.UDDIRegistration" /> - <delete> - <fileset dir="${deploy.dir}/riftsaw.sar/lib/" includes="riftsaw-uddi300-*.jar"/> - </delete> - </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"/> Modified: branches/RiftSaw-2.1.x/runtime/pom.xml =================================================================== --- branches/RiftSaw-2.1.x/runtime/pom.xml 2010-07-09 10:32:44 UTC (rev 848) +++ branches/RiftSaw-2.1.x/runtime/pom.xml 2010-07-09 10:35:36 UTC (rev 849) @@ -18,7 +18,6 @@ <module>deployer</module> <module>engine</module> <module>uddi</module> - <module>uddi300</module> <module>engine-assembly</module> <module>jbossesb-bpel</module> <module>jbossesb-bpel-assembly</module> Modified: branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java =================================================================== --- branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-07-09 10:32:44 UTC (rev 848) +++ branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-07-09 10:35:36 UTC (rev 849) @@ -129,11 +129,11 @@ return (properties.getProperty(BPEL_UDDI_CLERK, DEFAULT_BPEL_UDDI_CLERK)); } - private UDDIClerk getBPELClerk() throws ConfigurationException { + private synchronized UDDIClerk getBPELClerk() throws ConfigurationException { if (bpelClerk==null) { UDDIClerkManager clerkManager = UDDIClientContainer.getUDDIClerkManager(getClerkManagerName()); Map<String,UDDIClerk> clerks = clerkManager.getClientConfig().getUDDIClerks(); - UDDIClerk bpelClerk = clerks.get(getClerkName()); + bpelClerk = clerks.get(getClerkName()); if (bpelClerk==null) { throw new ConfigurationException("Could not find UDDI Clerk named "+ getClerkName()); }