12:31 p.m.
Author: kurt.stam(a)jboss.com
Date: 2010-10-05 13:31:18 -0400 (Tue, 05 Oct 2010)
New Revision: 1019
Modified:
branches/RiftSaw-2.1.x/distribution/pom.xml
branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml
branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
branches/RiftSaw-2.1.x/runtime/uddi/pom.xml
branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
RIFTSAW-280, also applying revision 1018 to this 2.1.x branch
Modified: branches/RiftSaw-2.1.x/distribution/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/pom.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -205,6 +205,12 @@
<version>1.0</version>
</dependency>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>3.0.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
Modified: branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml 2010-10-05 15:44:31 UTC
(rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/src/main/assembly/bin.xml 2010-10-05 17:31:18 UTC
(rev 1019)
@@ -207,6 +207,13 @@
</includes>
</dependencySet>
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <dependencySet>
+ <outputDirectory>/db/juddi</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddi-client</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
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-10-05
15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-05
17:31:18 UTC (rev 1019)
@@ -275,6 +275,14 @@
<replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
token="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"
value="bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistration"/>
+
+ <!-- juddi-client, should be removed once esb catches up to 3.0.4-->
+ <copy todir="${deployers.dir}/esb.deployer/lib"
overwrite="true">
+ <fileset dir="../db/juddi">
+ <include name="juddi-client-*.jar"/>
+ </fileset>
+ </copy>
+
</target>
<target name="renameEsbJUDDIClientXML" if="isNot.renamedToOld"
depends="check.esb.juddi.client.xml.old">
Modified: branches/RiftSaw-2.1.x/runtime/uddi/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/uddi/pom.xml 2010-10-05 15:44:31 UTC (rev 1018)
+++ branches/RiftSaw-2.1.x/runtime/uddi/pom.xml 2010-10-05 17:31:18 UTC (rev 1019)
@@ -25,7 +25,7 @@
<dependency>
<artifactId>juddi-client</artifactId>
<groupId>org.apache.juddi</groupId>
- <version>3.0.3</version>
+ <version>3.0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
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-10-05
15:44:31 UTC (rev 1018)
+++
branches/RiftSaw-2.1.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-10-05
17:31:18 UTC (rev 1019)
@@ -204,15 +204,25 @@
bindingKey =
TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + bindingName,
properties);
}
bindingKey = bindingKey.toLowerCase();
- //Lookup the binding
- BindingTemplate binding = null;
- try {
- binding = bpelClerk.findServiceBinding(bindingKey,
bpelClerk.getUDDINode().getApiNode());
- //TODO Kurt: Just delete this binding -not all bindings- upgrade the jUDDI client
to support this.
- BusinessService businessService = bpelClerk.findService(binding.getServiceKey(),
bpelClerk.getUDDINode().getApiNode());
- bpelClerk.unRegister(businessService, bpelClerk.getUDDINode().getApiNode());
+ try {
+ boolean isRemoveServiceIfNoTemplates = true; //we can make this configurable if
needed.
+ if (isRemoveServiceIfNoTemplates) {
+ BindingTemplate bindingTemplate = bpelClerk.findServiceBinding(bindingKey,
bpelClerk.getUDDINode().getApiNode());
+ BusinessService businessService =
bpelClerk.findService(bindingTemplate.getServiceKey(),
bpelClerk.getUDDINode().getApiNode());
+ if (businessService.getBindingTemplates().getBindingTemplate().size()==1
&&
+ businessService.getBindingTemplates().getBindingTemplate().get(0).getBindingKey().equals(bindingKey))
{
+ log.info("info removing service " + businessService.getServiceKey() +
"from UDDI.");
+ bpelClerk.unRegisterService(businessService.getServiceKey(),bpelClerk.getUDDINode().getApiNode());
+ } else {
+ log.info("info removing binding " + bindingKey + "from
UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
+ } else {
+ log.info("info removing binding " + bindingKey + "from
UDDI.");
+ bpelClerk.unRegisterBinding(bindingKey, bpelClerk.getUDDINode().getApiNode());
+ }
} catch (Exception e) {
- log.warn("Could not find BindingTemplate with key " + bindingKey +
" for unRegistration.");
+ log.warn("Could not unRegister BindingTemplate with key " +
bindingKey);
}
} catch (Exception e) {
log.error("Unable to unRegister EPR " + bindingName