riftsaw SVN: r595 - in trunk/runtime: engine/src/main/java/org/jboss/soa/bpel/runtime/ws and 2 other directories.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2010-03-23 21:52:50 -0400 (Tue, 23 Mar 2010)
New Revision: 595
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
Log:
RIFTSAW-158, simplifying API, correcting serviceName
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-03-23 18:51:21 UTC (rev 594)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-03-24 01:52:50 UTC (rev 595)
@@ -21,9 +21,10 @@
*/
package org.jboss.soa.bpel.runtime.engine.ode;
+import java.net.URL;
+
import javax.xml.namespace.QName;
-import org.jboss.soa.bpel.runtime.ws.EndpointMetaData;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
/**
@@ -40,7 +41,7 @@
* @param metaData
* @param wsdlRef
*/
- public void registerEPR(EndpointMetaData metaData, WSDLReference wsdlRef);
+ public void registerEPR(String serviceName, String portName, URL accessUrl);
/**
* UnRegisters the binding from the UDDI Registry.
* @param QName of the service
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-03-23 18:51:21 UTC (rev 594)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-03-24 01:52:50 UTC (rev 595)
@@ -150,7 +150,7 @@
ref
);
if (uddiRegistration!=null) {
- uddiRegistration.registerEPR(metaData, wsdlRef);
+ uddiRegistration.registerEPR(metaData.getServiceName().getLocalPart(), metaData.getPortName(), serviceUrl);
}
return ref;
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-03-23 18:51:21 UTC (rev 594)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-03-24 01:52:50 UTC (rev 595)
@@ -25,7 +25,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -50,8 +49,6 @@
import org.apache.juddi.v3.client.transport.TransportException;
import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
-import org.jboss.soa.bpel.runtime.ws.EndpointMetaData;
-import org.jboss.soa.bpel.runtime.ws.WSDLParser;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -136,10 +133,6 @@
return (properties.getProperty(BPEL_UDDI_CLERK, DEFAULT_BPEL_UDDI_CLERK));
}
- private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
- }
-
private UDDIClerk getBPELClerk() throws ConfigurationException {
if (bpelClerk==null) {
UDDIClerkManager clerkManager = UDDIClientContainer.getUDDIClerkManager(getClerkManagerName());
@@ -160,7 +153,7 @@
* @param metaData
* @param wsdlRef
*/
- public void registerEPR(EndpointMetaData metaData, WSDLReference wsdlRef) {
+ public void registerEPR(String serviceName, String portName, URL accessUrl) {
boolean selfRegister = false;
try {
UDDIClerkManager clerkManager = UDDIClientContainer.getUDDIClerkManager(getClerkManagerName());
@@ -170,13 +163,13 @@
UDDIClerk bpelClerk = clerks.get(getClerkName());
if (bpelClerk!=null) {
try {
- BusinessService service = createBusinessService(bpelClerk, metaData, wsdlRef);
+ BusinessService service = createBusinessService(bpelClerk, serviceName, portName, accessUrl);
bpelClerk.register(service, bpelClerk.getUDDINode().getApiNode());
} catch (Exception e) {
- log.error("Unable to register service " + metaData.getServiceName()
+ log.error("Unable to register service " + serviceName
+ " ." + e.getMessage(),e);
} catch (Throwable t) {
- log.error("Unable to register service " + metaData.getServiceName()
+ log.error("Unable to register service " + serviceName
+ " ." + t.getMessage(),t);
}
} else {
@@ -246,22 +239,22 @@
}
private BusinessService createBusinessService(UDDIClerk clerk,
- EndpointMetaData metaData, WSDLReference wsdlRef)
+ String serviceName, String portName, URL accessUrl)
throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
Properties properties = clerk.getUDDINode().getProperties();
//Constructing the serviceKey
- String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + metaData.getServiceName().getLocalPart(), properties);
+ String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties);
if (properties.containsKey(SERVICE_KEY_FORMAT)) {
- serviceKey = TokenResolver.replaceTokens((String)properties.get(SERVICE_KEY_FORMAT) + metaData.getServiceName(), properties);
+ serviceKey = TokenResolver.replaceTokens((String)properties.get(SERVICE_KEY_FORMAT) + serviceName, properties);
}
BusinessService service = null;
try {
//Checking if this serviceKey already exist
service = clerk.findService(serviceKey, clerk.getUDDINode().getApiNode());
- log.debug("Service " + metaData.getServiceName() + " already present in the UDDI Registry");
+ log.debug("Service " + serviceName + " already present in the UDDI Registry");
} catch (Exception e) {
//If it does not exist construct service information
- log.debug("Constructing Service UDDI Information for " + metaData.getServiceName());
+ log.debug("Constructing Service UDDI Information for " + serviceName);
service = new BusinessService();
service.setBusinessKey(TokenResolver.replaceTokens("uddi:${keyDomain}:${businessKey}", properties));
service.setServiceKey(serviceKey);
@@ -271,10 +264,10 @@
if (properties.containsKey(LANG)) lang = properties.getProperty(LANG);
description.setLang(lang);
description.setValue(properties.getProperty(SERVICE_DESCRIPTION));
- Name serviceName = new Name();
- serviceName.setLang(lang);
- serviceName.setValue(metaData.getServiceName().getLocalPart());
- service.getName().add(serviceName);
+ Name sName = new Name();
+ sName.setLang(lang);
+ sName.setValue(serviceName);
+ service.getName().add(sName);
service.getDescription().add(description);
}
//default categoryBag on the binding
@@ -286,7 +279,7 @@
}
}
//Construct bindingTemplate
- BindingTemplate binding = createBindingTemplate(clerk, metaData, wsdlRef);
+ BindingTemplate binding = createBindingTemplate(clerk, serviceName, portName, accessUrl);
//Add the bindingTemplate on the service
if (service.getBindingTemplates()==null) {
BindingTemplates bindingTemplates = new BindingTemplates();
@@ -297,16 +290,16 @@
}
private BindingTemplate createBindingTemplate(UDDIClerk clerk,
- EndpointMetaData metaData, WSDLReference wsdlRef) {
+ String serviceName, String portName, URL accessURL) {
Properties properties = clerk.getUDDINode().getProperties();
BindingTemplate bindingTemplate = new BindingTemplate();
//Constructing the bindingKey
- String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + metaData.getServiceName().getLocalPart() + "-"
- + metaData.getPortName(), properties);
+ String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + serviceName + "-"
+ + portName, properties);
if (properties.containsKey(BINDING_KEY_FORMAT)) {
- bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + metaData.getServiceName().getLocalPart() + "-"
- + metaData.getPortName(), properties);
+ bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + serviceName + "-"
+ + portName, properties);
}
bindingTemplate.setBindingKey(bindingKey);
@@ -322,13 +315,8 @@
AccessPoint accessPoint = new AccessPoint();
accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
- URL accessUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
- try {
- accessUrl = rewriteWSDLURL(accessUrl);
- } catch (MalformedURLException e) {
- log.error(e.getMessage(),e);
- }
- accessPoint.setValue(accessUrl.toExternalForm());
+ accessURL = rewriteWSDLURL(accessURL);
+ accessPoint.setValue(accessURL.toExternalForm());
bindingTemplate.setAccessPoint(accessPoint);
//default tModelKeys on the binding
@@ -388,39 +376,47 @@
List<ServiceInfo> serviceInfos = serviceList.getServiceInfos().getServiceInfo();
for (ServiceInfo serviceInfo : serviceInfos) {
String serviceKey = serviceInfo.getServiceKey();
- log.info("Found service " + serviceQName.getLocalPart()
- + " with serviceKey '" + serviceInfo.getServiceKey() + "'");
+
BusinessService service = bpelClerk.findService(serviceKey, bpelClerk.getUDDINode().getApiNode());
- BindingTemplates bindingservices = service.getBindingTemplates();
- //Loop over all bindingTemplates found
- for (BindingTemplate bindingTemplate : bindingservices.getBindingTemplate()) {
- AccessPoint accessPoint = bindingTemplate.getAccessPoint();
- if (AccessPointType.WSDL_DEPLOYMENT.toString().equals(accessPoint.getUseType())) {
- URL url = null;
- try {
- url = new URL(accessPoint.getValue());
- log.info("wsdlUrl for service " + serviceQName.getLocalPart() + " is " + url);
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def = wsdlReader.readWSDL(url.toExternalForm());
- if (log.isDebugEnabled()) {
- log.debug(getWSDL(url));
- }
- //Checking if this WSDL contains the right port name.
- Port port = def.getService(serviceQName).getPort(portName);
- if (port!=null) {
- //Current policy: "FirstSuccess" :)
- return new WSDLReference(def, url.toURI());
- } else {
- log.info("PortName " + portName + " could not be found in WSDL");
- }
- } catch (Exception e) {
- log.warn("Unable to obtain WSDL from " + url + ". " + e.getMessage(),e);
- }
- } else {
- log.debug("This accessPoint is of type " + accessPoint.getUseType() + " only "
- + AccessPointType.WSDL_DEPLOYMENT + " is supported at the moment.");
- }
- }
+ BindingTemplates bindingTemplates = service.getBindingTemplates();
+ if (bindingTemplates==null) {
+ log.warn("Found service " + serviceQName.getLocalPart()
+ + " with serviceKey '" + serviceInfo.getServiceKey() + "'"
+ + " but no EPRs");
+ } else {
+ log.info("Found service " + serviceQName.getLocalPart()
+ + " with serviceKey '" + serviceInfo.getServiceKey() + "'"
+ + " and " + bindingTemplates.getBindingTemplate().size() + " EPRs");
+ //Loop over all bindingTemplates found
+ for (BindingTemplate bindingTemplate : bindingTemplates.getBindingTemplate()) {
+ AccessPoint accessPoint = bindingTemplate.getAccessPoint();
+ if (AccessPointType.WSDL_DEPLOYMENT.toString().equals(accessPoint.getUseType())) {
+ URL url = null;
+ try {
+ url = new URL(accessPoint.getValue());
+ log.info("wsdlUrl for service " + serviceQName.getLocalPart() + " is " + url);
+ WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+ Definition def = wsdlReader.readWSDL(url.toExternalForm());
+ if (log.isDebugEnabled()) {
+ log.debug(getWSDL(url));
+ }
+ //Checking if this WSDL contains the right port name.
+ Port port = def.getService(serviceQName).getPort(portName);
+ if (port!=null) {
+ //Current policy: "FirstSuccess" :)
+ return new WSDLReference(def, url.toURI());
+ } else {
+ log.info("PortName " + portName + " could not be found in WSDL");
+ }
+ } catch (Exception e) {
+ log.warn("Unable to obtain WSDL from " + url + ". " + e.getMessage(),e);
+ }
+ } else {
+ log.debug("This accessPoint is of type " + accessPoint.getUseType() + " only "
+ + AccessPointType.WSDL_DEPLOYMENT + " is supported at the moment.");
+ }
+ }
+ }
}
} else {
log.info("No Service by the name " + serviceQName.getLocalPart() + " was found in the registry.");
@@ -470,17 +466,26 @@
in.close();
return buffer.toString();
}
-
-
/**
+ *
* @param urlIn
* @return
- * @throws MalformedURLException
*/
- public URL rewriteWSDLURL(URL urlIn) throws MalformedURLException {
-
- String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
- URL outUrl = new URL(urlString);
+ public URL rewriteWSDLURL(URL urlIn) {
+ URL outUrl = urlIn;
+ try {
+ String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
+ outUrl = new URL(urlString);
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ }
return outUrl;
}
+ /**
+ *
+ * @return
+ */
+ private String getWebserviceBaseUrl() {
+ return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
+ }
}
Modified: trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
===================================================================
--- trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-03-23 18:51:21 UTC (rev 594)
+++ trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-03-24 01:52:50 UTC (rev 595)
@@ -25,7 +25,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.List;
@@ -49,8 +48,6 @@
import org.apache.juddi.v3.client.transport.TransportException;
import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
-import org.jboss.soa.bpel.runtime.ws.EndpointMetaData;
-import org.jboss.soa.bpel.runtime.ws.WSDLParser;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -101,10 +98,6 @@
return (properties.getProperty(BPEL_UDDI_CLERK, DEFAULT_BPEL_UDDI_CLERK));
}
- private String getWebserviceBaseUrl() {
- return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
- }
-
private UDDIClerk getBPELClerk() throws ConfigurationException {
if (bpelClerk==null) {
Map<String,UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getUDDIClerks();
@@ -123,20 +116,20 @@
* @param metaData
* @param wsdlRef
*/
- public void registerEPR(EndpointMetaData metaData, WSDLReference wsdlRef) {
+ public void registerEPR(String serviceName, String portName, URL accessUrl) {
boolean selfRegister = false;
try {
selfRegister = UDDIClerkManager.getClientConfig().isRegisterOnStartup();
if (selfRegister) {
UDDIClerk bpelClerk = getBPELClerk();
try {
- BusinessService service = createBusinessService(bpelClerk, metaData, wsdlRef);
+ BusinessService service = createBusinessService(bpelClerk, serviceName, portName, accessUrl);
bpelClerk.register(service, bpelClerk.getUDDINode().getApiNode());
} catch (Exception e) {
- log.error("Unable to register service " + metaData.getServiceName()
+ log.error("Unable to register service " + serviceName
+ " ." + e.getMessage(),e);
} catch (Throwable t) {
- log.error("Unable to register service " + metaData.getServiceName()
+ log.error("Unable to register service " + serviceName
+ " ." + t.getMessage(),t);
}
}
@@ -202,22 +195,22 @@
}
private BusinessService createBusinessService(UDDIClerk clerk,
- EndpointMetaData metaData, WSDLReference wsdlRef)
+ String serviceName, String portName, URL accessUrl)
throws DispositionReportFaultMessage, RemoteException, ConfigurationException, TransportException {
Properties properties = clerk.getUDDINode().getProperties();
//Constructing the serviceKey
- String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + metaData.getServiceName().getLocalPart(), properties);
+ String serviceKey = TokenResolver.replaceTokens(DEFAULT_SERVICE_KEY_FORMAT + serviceName, properties);
if (properties.containsKey(SERVICE_KEY_FORMAT)) {
- serviceKey = TokenResolver.replaceTokens((String)properties.get(SERVICE_KEY_FORMAT) + metaData.getServiceName(), properties);
+ serviceKey = TokenResolver.replaceTokens((String)properties.get(SERVICE_KEY_FORMAT) + serviceName, properties);
}
BusinessService service = null;
try {
//Checking if this serviceKey already exist
service = clerk.findService(serviceKey, clerk.getUDDINode().getApiNode());
- log.debug("Service " + metaData.getServiceName() + " already present in the UDDI Registry");
+ log.debug("Service " + serviceName + " already present in the UDDI Registry");
} catch (Exception e) {
//If it does not exist construct service information
- log.debug("Constructing Service UDDI Information for " + metaData.getServiceName());
+ log.debug("Constructing Service UDDI Information for " + serviceName);
service = new BusinessService();
service.setBusinessKey(TokenResolver.replaceTokens("uddi:${keyDomain}:${businessKey}", properties));
service.setServiceKey(serviceKey);
@@ -227,10 +220,10 @@
if (properties.containsKey(LANG)) lang = properties.getProperty(LANG);
description.setLang(lang);
description.setValue(properties.getProperty(SERVICE_DESCRIPTION));
- Name serviceName = new Name();
- serviceName.setLang(lang);
- serviceName.setValue(metaData.getServiceName().getLocalPart());
- service.getName().add(serviceName);
+ Name sName = new Name();
+ sName.setLang(lang);
+ sName.setValue(serviceName);
+ service.getName().add(sName);
service.getDescription().add(description);
}
//default categoryBag on the binding
@@ -242,7 +235,7 @@
}
}
//Construct bindingTemplate
- BindingTemplate binding = createBindingTemplate(clerk, metaData, wsdlRef);
+ BindingTemplate binding = createBindingTemplate(clerk, serviceName, portName, accessUrl);
//Add the bindingTemplate on the service
if (service.getBindingTemplates()==null) {
BindingTemplates bindingTemplates = new BindingTemplates();
@@ -253,16 +246,16 @@
}
private BindingTemplate createBindingTemplate(UDDIClerk clerk,
- EndpointMetaData metaData, WSDLReference wsdlRef) {
+ String serviceName, String portName, URL accessURL) {
Properties properties = clerk.getUDDINode().getProperties();
BindingTemplate bindingTemplate = new BindingTemplate();
//Constructing the bindingKey
- String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + metaData.getServiceName().getLocalPart() + "-"
- + metaData.getPortName(), properties);
+ String bindingKey = TokenResolver.replaceTokens(DEFAULT_BINDING_KEY_FORMAT + serviceName + "-"
+ + portName, properties);
if (properties.containsKey(BINDING_KEY_FORMAT)) {
- bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + metaData.getServiceName().getLocalPart() + "-"
- + metaData.getPortName(), properties);
+ bindingKey = TokenResolver.replaceTokens((String)properties.get(BINDING_KEY_FORMAT) + serviceName + "-"
+ + portName, properties);
}
bindingTemplate.setBindingKey(bindingKey);
@@ -278,13 +271,8 @@
AccessPoint accessPoint = new AccessPoint();
accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
- URL accessUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
- try {
- accessUrl = rewriteWSDLURL(accessUrl);
- } catch (MalformedURLException e) {
- log.error(e.getMessage(),e);
- }
- accessPoint.setValue(accessUrl.toExternalForm());
+ accessURL = rewriteWSDLURL(accessURL);
+ accessPoint.setValue(accessURL.toExternalForm());
bindingTemplate.setAccessPoint(accessPoint);
//default tModelKeys on the binding
@@ -310,6 +298,7 @@
return bindingTemplate;
}
+
/**
* Looks up the WSDL for the requested service and portName. The BPELClerk
* is used to lookup the service in the UDDI Registry by ServiceName. For
@@ -343,39 +332,47 @@
List<ServiceInfo> serviceInfos = serviceList.getServiceInfos().getServiceInfo();
for (ServiceInfo serviceInfo : serviceInfos) {
String serviceKey = serviceInfo.getServiceKey();
- log.info("Found service " + serviceQName.getLocalPart()
- + " with serviceKey '" + serviceInfo.getServiceKey() + "'");
+
BusinessService service = bpelClerk.findService(serviceKey, bpelClerk.getUDDINode().getApiNode());
- BindingTemplates bindingservices = service.getBindingTemplates();
- //Loop over all bindingTemplates found
- for (BindingTemplate bindingTemplate : bindingservices.getBindingTemplate()) {
- AccessPoint accessPoint = bindingTemplate.getAccessPoint();
- if (AccessPointType.WSDL_DEPLOYMENT.toString().equals(accessPoint.getUseType())) {
- URL url = null;
- try {
- url = new URL(accessPoint.getValue());
- log.info("wsdlUrl for service " + serviceQName.getLocalPart() + " is " + url);
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def = wsdlReader.readWSDL(url.toExternalForm());
- if (log.isDebugEnabled()) {
- log.debug(getWSDL(url));
- }
- //Checking if this WSDL contains the right port name.
- Port port = def.getService(serviceQName).getPort(portName);
- if (port!=null) {
- //Current policy: "FirstSuccess" :)
- return new WSDLReference(def, url.toURI());
- } else {
- log.info("PortName " + portName + " could not be found in WSDL");
- }
- } catch (Exception e) {
- log.warn("Unable to obtain WSDL from " + url + ". " + e.getMessage(),e);
- }
- } else {
- log.debug("This accessPoint is of type " + accessPoint.getUseType() + " only "
- + AccessPointType.WSDL_DEPLOYMENT + " is supported at the moment.");
- }
- }
+ BindingTemplates bindingTemplates = service.getBindingTemplates();
+ if (bindingTemplates==null) {
+ log.warn("Found service " + serviceQName.getLocalPart()
+ + " with serviceKey '" + serviceInfo.getServiceKey() + "'"
+ + " but no EPRs");
+ } else {
+ log.info("Found service " + serviceQName.getLocalPart()
+ + " with serviceKey '" + serviceInfo.getServiceKey() + "'"
+ + " and " + bindingTemplates.getBindingTemplate().size() + " EPRs");
+ //Loop over all bindingTemplates found
+ for (BindingTemplate bindingTemplate : bindingTemplates.getBindingTemplate()) {
+ AccessPoint accessPoint = bindingTemplate.getAccessPoint();
+ if (AccessPointType.WSDL_DEPLOYMENT.toString().equals(accessPoint.getUseType())) {
+ URL url = null;
+ try {
+ url = new URL(accessPoint.getValue());
+ log.info("wsdlUrl for service " + serviceQName.getLocalPart() + " is " + url);
+ WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
+ Definition def = wsdlReader.readWSDL(url.toExternalForm());
+ if (log.isDebugEnabled()) {
+ log.debug(getWSDL(url));
+ }
+ //Checking if this WSDL contains the right port name.
+ Port port = def.getService(serviceQName).getPort(portName);
+ if (port!=null) {
+ //Current policy: "FirstSuccess" :)
+ return new WSDLReference(def, url.toURI());
+ } else {
+ log.info("PortName " + portName + " could not be found in WSDL");
+ }
+ } catch (Exception e) {
+ log.warn("Unable to obtain WSDL from " + url + ". " + e.getMessage(),e);
+ }
+ } else {
+ log.debug("This accessPoint is of type " + accessPoint.getUseType() + " only "
+ + AccessPointType.WSDL_DEPLOYMENT + " is supported at the moment.");
+ }
+ }
+ }
}
} else {
log.info("No Service by the name " + serviceQName.getLocalPart() + " was found in the registry.");
@@ -387,7 +384,7 @@
log.info("No WSDL could be obtained using the UDDI Registry Lookup.");
return null;
}
- /**
+ /**
* Obtains an authToken for this clerk.
*
* @param clerk
@@ -425,17 +422,26 @@
in.close();
return buffer.toString();
}
-
/**
*
* @param urlIn
* @return
- * @throws MalformedURLException
*/
- public URL rewriteWSDLURL(URL urlIn) throws MalformedURLException {
-
- String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
- URL outUrl = new URL(urlString);
+ public URL rewriteWSDLURL(URL urlIn) {
+ URL outUrl = urlIn;
+ try {
+ String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
+ outUrl = new URL(urlString);
+ } catch (Exception e) {
+ log.error(e.getMessage(),e);
+ }
return outUrl;
}
+ /**
+ *
+ * @return
+ */
+ private String getWebserviceBaseUrl() {
+ return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080"));
+ }
}
15 years, 6 months
riftsaw SVN: r594 - trunk/docs/docbook/userguide.
by riftsaw-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-03-23 14:51:21 -0400 (Tue, 23 Mar 2010)
New Revision: 594
Removed:
trunk/docs/docbook/userguide/.classpath
Log:
remove eclipse classpath file
Deleted: trunk/docs/docbook/userguide/.classpath
===================================================================
--- trunk/docs/docbook/userguide/.classpath 2010-03-23 18:47:50 UTC (rev 593)
+++ trunk/docs/docbook/userguide/.classpath 2010-03-23 18:51:21 UTC (rev 594)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
15 years, 6 months
riftsaw SVN: r593 - in trunk: console/integration and 7 other directories.
by riftsaw-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-03-23 14:47:50 -0400 (Tue, 23 Mar 2010)
New Revision: 593
Modified:
trunk/
trunk/console/integration/
trunk/docs/docbook/gettingstartedguide/
trunk/docs/docbook/userguide/
trunk/integration-tests/
trunk/runtime/
trunk/runtime/deployer/
trunk/runtime/engine/
trunk/runtime/jbossesb-bpel/
Log:
ignore eclipse project/classpath files
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
.project
.classpath
.settings
target
deployment.properties
bin
soa.properties
+ *.iml
*.ipr
*.iws
.project
.classpath
.settings
target
deployment.properties
soa.properties
Property changes on: trunk/console/integration
___________________________________________________________________
Name: svn:ignore
- target
.project
.classpath
*.iml
.settings
+ target
.project
.classpath
*.iml
.settings
Property changes on: trunk/docs/docbook/gettingstartedguide
___________________________________________________________________
Name: svn:ignore
- target
.project
.settings
.classpath
bin
+ target
.project
.settings
.classpath
Property changes on: trunk/docs/docbook/userguide
___________________________________________________________________
Name: svn:ignore
- target
.project
.settings
+ target
.project
.classpath
.settings
Property changes on: trunk/integration-tests
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
+ target
.classpath
.project
.settings
Property changes on: trunk/runtime
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
target
+ *.iml
*.ipr
*.iws
target
.settings
.project
Property changes on: trunk/runtime/deployer
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
target
.classpath
bin
.project
.settings
+ *.iml
*.ipr
*.iws
target
.classpath
.project
.settings
Property changes on: trunk/runtime/engine
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
.classpath
.project
target
classes
.settings
+ *.iml
*.ipr
*.iws
.classpath
.project
target
classes
.settings
Property changes on: trunk/runtime/jbossesb-bpel
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
target
bin
.classpath
.project
.settings
+ *.iml
*.ipr
*.iws
target
.classpath
.project
.settings
15 years, 6 months
riftsaw SVN: r592 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-03-23 09:48:17 -0400 (Tue, 23 Mar 2010)
New Revision: 592
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
Log:
Set the 'isTwoWay' property.
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-03-23 06:05:35 UTC (rev 591)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-03-23 13:48:17 UTC (rev 592)
@@ -101,7 +101,8 @@
if (__log.isDebugEnabled()) __log.debug("Starting transaction.");
odeMex = createMessageExchange(invocationAdapter);
- //odeMex.setProperty("isTwoWay", Boolean.toString(msgContext.getAxisOperation() instanceof TwoChannelAxisOperation));
+ odeMex.setProperty("isTwoWay", Boolean.toString(odeMex.getOperation().getOutput() != null));
+ if (__log.isDebugEnabled()) __log.debug("Is two way operation? "+odeMex.getProperty("isTwoWay"));
if (odeMex.getOperation() != null)
{
15 years, 6 months
riftsaw SVN: r591 - trunk/qa.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-03-23 02:05:35 -0400 (Tue, 23 Mar 2010)
New Revision: 591
Modified:
trunk/qa/hudson-riftsaw-db.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-soa-p.sh
Log:
* add the ws.stack.dir variable for hudson jobs, in this case, it won't download the ws stack every time.
Modified: trunk/qa/hudson-riftsaw-db.sh
===================================================================
--- trunk/qa/hudson-riftsaw-db.sh 2010-03-23 04:26:22 UTC (rev 590)
+++ trunk/qa/hudson-riftsaw-db.sh 2010-03-23 06:05:35 UTC (rev 591)
@@ -17,10 +17,11 @@
WS_VERSION="3.2.2.GA"
WS_STACK="native"
+WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
STARTUP_TIME="6"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2010-03-23 04:26:22 UTC (rev 590)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-03-23 06:05:35 UTC (rev 591)
@@ -18,8 +18,9 @@
WS_STACK="native"
WS_VERSION="3.2.2.GA"
+WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Modified: trunk/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- trunk/qa/hudson-riftsaw-soa-p.sh 2010-03-23 04:26:22 UTC (rev 590)
+++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-03-23 06:05:35 UTC (rev 591)
@@ -17,10 +17,11 @@
WS_VERSION="3.2.2.GA"
WS_STACK="native"
+WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
STARTUP_TIME="6"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dstartup.time=$STARTUP_TIME"
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
15 years, 6 months
riftsaw SVN: r590 - in trunk/runtime: uddi/src/test/java/org/jboss/soa/bpel and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2010-03-23 00:26:22 -0400 (Tue, 23 Mar 2010)
New Revision: 590
Removed:
trunk/runtime/uddi/src/test/java/org/jboss/soa/bpel/uddi/
Modified:
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
Log:
RIFTSAW-158, Found the code that creates the deployed WebService URL. Updating to use that instead.
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-03-23 02:39:00 UTC (rev 589)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-03-23 04:26:22 UTC (rev 590)
@@ -51,6 +51,7 @@
import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.EndpointMetaData;
+import org.jboss.soa.bpel.runtime.ws.WSDLParser;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -321,9 +322,9 @@
AccessPoint accessPoint = new AccessPoint();
accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
- URL accessUrl = wsdlRef.getWsdlURL();
+ URL accessUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
try {
- accessUrl = rewriteWSDLURL(wsdlRef.getWsdlURL());
+ accessUrl = rewriteWSDLURL(accessUrl);
} catch (MalformedURLException e) {
log.error(e.getMessage(),e);
}
@@ -472,24 +473,13 @@
/**
- * file:/Users/kstam/apps/jboss-5.1.0.GA/riftesb-4.7/
- * server/default/tmp/5c4o1j-2geosb-g71xfu32-1-g71xxyiq-bt/
- * BPEL_BluePrint1-1.jar/InventoryService.wsdl
- *
- * to
- *
- * http://localhost:8080/BPEL_BluePrint1_InventoryService?wsdl
- *
* @param urlIn
* @return
* @throws MalformedURLException
*/
public URL rewriteWSDLURL(URL urlIn) throws MalformedURLException {
- String[] path=urlIn.toExternalForm().split("/");
- String wsdlElement = path[path.length-1].replace(".wsdl", "?wsdl"); //InventoryService.wsdl
- String serviceName = path[path.length-2].substring(0,path[path.length-2].lastIndexOf("-"));
- String urlString = getWebserviceBaseUrl() + "/" + serviceName + "_" + wsdlElement;
+ String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
URL outUrl = new URL(urlString);
return outUrl;
}
Modified: trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java
===================================================================
--- trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-03-23 02:39:00 UTC (rev 589)
+++ trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-03-23 04:26:22 UTC (rev 590)
@@ -50,6 +50,7 @@
import org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.EndpointMetaData;
+import org.jboss.soa.bpel.runtime.ws.WSDLParser;
import org.jboss.soa.bpel.runtime.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -277,9 +278,9 @@
AccessPoint accessPoint = new AccessPoint();
accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
- URL accessUrl = wsdlRef.getWsdlURL();
+ URL accessUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(), metaData.getPortName());
try {
- accessUrl = rewriteWSDLURL(wsdlRef.getWsdlURL());
+ accessUrl = rewriteWSDLURL(accessUrl);
} catch (MalformedURLException e) {
log.error(e.getMessage(),e);
}
@@ -426,24 +427,14 @@
}
/**
- * file:/Users/kstam/apps/jboss-5.1.0.GA/riftesb-4.7/
- * server/default/tmp/5c4o1j-2geosb-g71xfu32-1-g71xxyiq-bt/
- * BPEL_BluePrint1-1.jar/InventoryService.wsdl
*
- * to
- *
- * http://localhost:8080/BPEL_BluePrint1_InventoryService?wsdl
- *
* @param urlIn
* @return
* @throws MalformedURLException
*/
public URL rewriteWSDLURL(URL urlIn) throws MalformedURLException {
- String[] path=urlIn.toExternalForm().split("/");
- String wsdlElement = path[path.length-1].replace(".wsdl", "?wsdl"); //InventoryService.wsdl
- String serviceName = path[path.length-2].substring(0,path[path.length-2].lastIndexOf("-"));
- String urlString = getWebserviceBaseUrl() + "/" + serviceName + "_" + wsdlElement;
+ String urlString = getWebserviceBaseUrl() + urlIn.getFile() + "?wsdl";
URL outUrl = new URL(urlString);
return outUrl;
}
15 years, 6 months
riftsaw SVN: r589 - trunk/docs/docbook/gettingstartedguide/src/main/module.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-03-22 22:39:00 -0400 (Mon, 22 Mar 2010)
New Revision: 589
Modified:
trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
Log:
* update the option for upgrade ws.
Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-03-22 21:49:08 UTC (rev 588)
+++ trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-03-23 02:39:00 UTC (rev 589)
@@ -158,7 +158,7 @@
It will help you download the web service stack, and then upgrade it for JBoss AS.
<itemizedlist>
<listitem>
- Available ws.stack options are: 'default', 'cxf', 'metro'. 'default' means the jbossws-native.
+ Available ws.stack options are: 'native', 'cxf', 'metro'.
</listitem>
<listitem>
Available ws.version options are: '3.2.1.GA', '3.2.2.GA'
15 years, 6 months
riftsaw SVN: r588 - trunk.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2010-03-22 17:49:08 -0400 (Mon, 22 Mar 2010)
New Revision: 588
Modified:
trunk/
Log:
adding to svn ignore
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- *.iml
*.ipr
*.iws
.project
.classpath
.settings
target
deployment.properties
+ *.iml
*.ipr
*.iws
.project
.classpath
.settings
target
deployment.properties
bin
soa.properties
15 years, 6 months
riftsaw SVN: r587 - trunk.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2010-03-22 17:46:54 -0400 (Mon, 22 Mar 2010)
New Revision: 587
Added:
trunk/README.txt
Log:
Adding Developer README
Added: trunk/README.txt
===================================================================
--- trunk/README.txt (rev 0)
+++ trunk/README.txt 2010-03-22 21:46:54 UTC (rev 587)
@@ -0,0 +1,21 @@
+Welcome to the RiftSaw project.
+
+1. To build the projects run
+
+mvn clean install.
+
+2. To also run the integration test, update the deployment.properties file to reflect your environment
+and execute
+
+mvn -Driftsaw.test.deployment.properties=<full-path-to>/deployment.properties clean install -Pintegration
+
+For more details on see: http://community.jboss.org/wiki/RunningRiftsawIntegrationTests
+
+3. To deploy RiftSaw unzip the RiftSaw in the distribution/target directory, and after expansion
+of this archive go into the install directory, update the and execute
+
+ant deploy
+
+Enjoy!
+
+The RiftSaw Team
\ No newline at end of file
15 years, 6 months
riftsaw SVN: r586 - in trunk/distribution/src/main/release: install and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2010-03-22 17:45:58 -0400 (Mon, 22 Mar 2010)
New Revision: 586
Modified:
trunk/distribution/src/main/release/db/bpel.properties
trunk/distribution/src/main/release/install/build.xml
Log:
RIFTSAW-158, Deploytime lookup of partnerChannel WSDL Endpoints
Modified: trunk/distribution/src/main/release/db/bpel.properties
===================================================================
--- trunk/distribution/src/main/release/db/bpel.properties 2010-03-22 21:42:53 UTC (rev 585)
+++ trunk/distribution/src/main/release/db/bpel.properties 2010-03-22 21:45:58 UTC (rev 586)
@@ -88,9 +88,13 @@
bpel.db.mode=EXTERNAL
bpel.db.ext.dataSource=java:BPELDB
# 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
+# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml
# file
bpel.uddi.registration=false
+# if set to true will lookup BPEL endpoints in a UDDI Registry.
+# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml
+# file
+bpel.uddi.lookup=false
# implementation of the client integration class
bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistrationImpl
# the uddi client config in case you want to use your own client config rather then
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-03-22 21:42:53 UTC (rev 585)
+++ trunk/distribution/src/main/release/install/build.xml 2010-03-22 21:45:58 UTC (rev 586)
@@ -263,10 +263,15 @@
<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"
- todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" />
+ 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"/>
+ 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"/>
+ <replace file="${deploy.dir}/riftsaw.sar/bpel.properties"
+ token="bpel.uddi.lookup=false"
+ value="bpel.uddi.lookup=true"/>
<replace file="${deploy.dir}/jbossesb-registry.sar/esb.juddi.xml">
<replacetoken><![CDATA[juddi.seed.always">false]]></replacetoken>
<replacevalue><![CDATA[juddi.seed.always">true]]></replacevalue>
15 years, 6 months