Author: kurt.stam(a)jboss.com Date: 2010-06-02 12:28:23 -0400 (Wed, 02 Jun 2010) New Revision: 692 Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java Modified: trunk/distribution/src/main/release/install/build.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 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/WebServiceClient.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-188, moving looking up the partner channel WSDLs to the first time the service is invoked, rather then at deploy time. This removes the deployment locking issue. Now turned the UDDI lookup on by default. Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-06-02 13:31:07 UTC (rev 691) +++ trunk/distribution/src/main/release/install/build.xml 2010-06-02 16:28:23 UTC (rev 692) @@ -277,11 +277,9 @@ <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.registration=false" value="bpel.uddi.registration=true"/> - <!-- uncomment to set UDDI lookup default to 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> Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-06-02 13:31:07 UTC (rev 691) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-06-02 16:28:23 UTC (rev 692) @@ -44,10 +44,6 @@ public class JAXWSBindingContext implements BindingContext { protected final Log log = LogFactory.getLog(getClass()); -//we should consider having our own OdeConfigProperties class if we need more properties - public final static String BPEL_UDDI_LOOKUP = "uddi.lookup"; - public final static String BPEL_WEBSERVICE_SECURE = "webservice.secure"; - public final static String BPEL_WEBSERVICE_BASEURL = "webservice.baseurl"; private BPELEngineImpl engine; private EndpointManager endpointManager; @@ -56,25 +52,7 @@ public JAXWSBindingContext(BPELEngineImpl server) { this.engine = server; this.endpointManager = new EndpointManager(this.engine); - if (isUDDILookup()) { - try { - String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost(); - int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); - URL url = new URL("http://" + webServiceHost + ":" + webServicePort); - if (isWebserviceSecure()) { - int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); - url = new URL("https://" + webServiceHost + ":" + secureWebServicePort); - } - //give the user the option to override - if (server.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)==null) { - server.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_BASEURL, url.toExternalForm()); - } - uddiRegistration = UDDIClientFactory.newInstance(server.getOdeConfig().getProperties()); - } catch (Exception e) { - log.error(e.getMessage()); - log.error("Continuing without UDDI integration."); - } - } + } public org.apache.ode.bpel.iapi.EndpointReference getEndpoint(QName serviceName, String portName) { @@ -98,7 +76,8 @@ } else { - WSDLReference wsdlReference = createWSDLReference(processId, myRoleEndpoint); + WSDLReference wsdlReference = new WSDLHelper().createWSDLReference(engine, processId, + myRoleEndpoint.serviceName, myRoleEndpoint.portName); try { @@ -122,48 +101,7 @@ return(ref); } - private WSDLReference createWSDLReference(QName processId, Endpoint myRoleEndpoint) - { - File targetWSDLFile = findWSDLFile(processId, myRoleEndpoint); - Definition wsdlDefinition = getWSDLDefinition(processId, myRoleEndpoint.serviceName); - return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI()); - } - - private File findWSDLFile(QName processId, Endpoint myRoleEndpoint) - { - ProcessConf pconf = engine._store.getProcessConfiguration(processId); - List<File> files = pconf.getFiles(); - File targetWsdlFile = null; - for(File f : files) - { - if(f.getName().endsWith(".wsdl")) - { - try - { - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - Definition def = wsdlReader.readWSDL(f.toURL().toExternalForm()); - URL url = new WSDLParser(def).getServiceLocationURL(myRoleEndpoint.serviceName, myRoleEndpoint.portName); - if(url!=null) - { - targetWsdlFile = f; - log.debug("Matching "+processId + " to WSDL file "+targetWsdlFile); - break; - } - - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - } - - if(null==targetWsdlFile) - throw new ContextException("Unable to find target WSDL file for "+ myRoleEndpoint); - - return targetWsdlFile; - } - + public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint) { log.info("Deactivate my role endpoint: "+myRoleEndpoint); @@ -195,22 +133,7 @@ Endpoint initialPartnerEndpoint) { // NOTE: This implementation assumes that the initial value of the // partner role determines the binding. - Definition wsdlDefinition = null; - URL wsdlUrl = null; - if (isUDDILookup()) { - WSDLReference wsdlReference = uddiRegistration.lookupWSDL( - initialPartnerEndpoint.serviceName, - initialPartnerEndpoint.portName); - if (wsdlReference!=null) { - wsdlDefinition = wsdlReference.getDefinition(); - wsdlUrl = wsdlReference.getWsdlURL(); - } - } - if (isUDDILookup()==false || wsdlUrl==null) { - WSDLReference wsdlReference = createWSDLReference(processId, initialPartnerEndpoint); - wsdlDefinition = wsdlReference.getDefinition(); - wsdlUrl = wsdlReference.getWsdlURL(); - } + // TODO: TEAM_ODE: @@ -231,7 +154,7 @@ try { - PartnerChannel channel = endpointManager.createClient(endpointMD, wsdlDefinition, wsdlUrl, pconf); + PartnerChannel channel = endpointManager.createClient(endpointMD, engine , pconf); return new PartnerRoleChannelImpl(channel); } @@ -241,29 +164,11 @@ } } - private Definition getWSDLDefinition(QName processId, QName serviceName) - { - ProcessConf pconf = engine._store.getProcessConfiguration(processId); - Definition wsdl = pconf.getDefinitionForService(serviceName); - if (wsdl == null) - throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + serviceName - + " on process "+ processId); - - return wsdl; - } - + public long calculateSizeofService( org.apache.ode.bpel.iapi.EndpointReference arg0) { // TODO Auto-generated method stub return 0; } - - public boolean isUDDILookup() { - return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_LOOKUP, "false")); - } - - public boolean isWebserviceSecure() { - return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_SECURE, "false")); - } } 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-06-02 13:31:07 UTC (rev 691) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-06-02 16:28:23 UTC (rev 692) @@ -35,6 +35,7 @@ import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; import org.jboss.kernel.Kernel; import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory; import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; @@ -302,13 +303,13 @@ } public WebServiceClient createClient( - EndpointMetaData metaData,Definition wsdlDefinition, URL wsdlUrl, ProcessConf pconf) + EndpointMetaData metaData, BPELEngineImpl server, ProcessConf pconf) throws EndpointManagementException { try { WebServiceClient client = - new WebServiceClient(metaData, wsdlDefinition, wsdlUrl, executionEnvironment, pconf); + new WebServiceClient(metaData, executionEnvironment, server, pconf); return client; Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java (rev 0) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-06-02 16:28:23 UTC (rev 692) @@ -0,0 +1,75 @@ +package org.jboss.soa.bpel.runtime.ws; + +import java.io.File; +import java.net.URL; +import java.util.List; + +import javax.wsdl.Definition; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.ode.bpel.iapi.ContextException; +import org.apache.ode.bpel.iapi.ProcessConf; +import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; + +public class WSDLHelper { + + protected final Log log = LogFactory.getLog(getClass()); + + + public WSDLReference createWSDLReference(BPELEngineImpl engine, QName processId, QName serviceName, String portName) + { + File targetWSDLFile = findWSDLFile(engine, processId, serviceName, portName); + Definition wsdlDefinition = getWSDLDefinition(engine, processId, serviceName); + return new WSDLReference(wsdlDefinition, targetWSDLFile.toURI()); + } + + private File findWSDLFile(BPELEngineImpl engine, QName processId, QName serviceName, String portName) + { + ProcessConf pconf = engine._store.getProcessConfiguration(processId); + List<File> files = pconf.getFiles(); + File targetWsdlFile = null; + for(File f : files) + { + if(f.getName().endsWith(".wsdl")) + { + try + { + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition def = wsdlReader.readWSDL(f.toURL().toExternalForm()); + URL url = new WSDLParser(def).getServiceLocationURL(serviceName, portName); + if(url!=null) + { + targetWsdlFile = f; + log.debug("Matching "+processId + " to WSDL file "+targetWsdlFile); + break; + } + + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + } + + if(null==targetWsdlFile) + throw new ContextException("Unable to find target WSDL file for "+ serviceName); + + return targetWsdlFile; + } + + private Definition getWSDLDefinition(BPELEngineImpl engine, QName processId, QName serviceName) + { + ProcessConf pconf = engine._store.getProcessConfiguration(processId); + Definition wsdl = pconf.getDefinitionForService(serviceName); + if (wsdl == null) + throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + serviceName + + " on process "+ processId); + + return wsdl; + } +} Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-02 13:31:07 UTC (rev 691) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-02 16:28:23 UTC (rev 692) @@ -47,7 +47,11 @@ import org.apache.ode.utils.DOMUtils; import org.jboss.soa.bpel.runtime.engine.EndpointReference; import org.jboss.soa.bpel.runtime.engine.PartnerChannel; +import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; +import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory; +import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration; +import org.jboss.soa.bpel.runtime.integration.ServerConfigFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -59,17 +63,23 @@ */ public class WebServiceClient implements PartnerChannel { - private static final String JAXWS_CLIENT_INITIALIZER = "jaxws.client.initializer.impl"; + private static final String JAXWS_CLIENT_INITIALIZER = "jaxws.client.initializer.impl"; +//we should consider having our own OdeConfigProperties class if we need more properties + public final static String BPEL_UDDI_LOOKUP = "uddi.lookup"; + public final static String BPEL_WEBSERVICE_SECURE = "webservice.secure"; + public final static String BPEL_WEBSERVICE_BASEURL = "webservice.baseurl"; protected final Log log = LogFactory.getLog(getClass()); - + private boolean isInitialized=false; + private BPELEngineImpl engine; + private UDDIRegistration uddiRegistration = null; private URL wsdlUrl; private String id; private Dispatch<SOAPMessage> dispatcher = null; private EndpointMetaData metaData = null; - private Definition wsdlDefintion; + private Definition wsdlDefinition; private final QName serviceName; private final QName port; @@ -79,24 +89,59 @@ private ExecutionEnvironment executionEnvironment; private java.net.URI baseURI; - public WebServiceClient(EndpointMetaData metaData, Definition wsdlDefintion, URL wsdlUrl , ExecutionEnvironment env, - ProcessConf pconf) + public WebServiceClient(EndpointMetaData metaData, ExecutionEnvironment env, + BPELEngineImpl engine, ProcessConf pconf) { + this.engine = engine; this.executionEnvironment = env; this.metaData = metaData; - this.wsdlDefintion = wsdlDefintion; - this.wsdlUrl = wsdlUrl; this.id = metaData.getEndpointId(); this.serviceName = metaData.getServiceName(); this.port = new QName(serviceName.getNamespaceURI(), metaData.getPortName()); - - this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefintion, serviceName, port.getLocalPart()); this.baseURI = pconf.getBaseURI(); log.debug("Web Service Client: Base URI="+pconf.getBaseURI()); - } + } + + private synchronized void initialize() { + if (isUDDILookup()) { + try { + String webServiceHost = ServerConfigFactory.getServerConfig().getWebServiceHost(); + int webServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + URL url = new URL("http://" + webServiceHost + ":" + webServicePort); + if (isWebserviceSecure()) { + int secureWebServicePort = ServerConfigFactory.getServerConfig().getWebServicePort(); + url = new URL("https://" + webServiceHost + ":" + secureWebServicePort); + } + //give the user the option to override + if (engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_BASEURL)==null) { + engine.getOdeConfig().getProperties().setProperty(BPEL_WEBSERVICE_BASEURL, url.toExternalForm()); + } + uddiRegistration = UDDIClientFactory.newInstance(engine.getOdeConfig().getProperties()); + } catch (Exception e) { + log.error(e.getMessage()); + log.error("Continuing without UDDI integration."); + } + } + if (isUDDILookup()) { + WSDLReference wsdlReference = uddiRegistration.lookupWSDL( + metaData.getServiceName(), + metaData.getPortName()); + if (wsdlReference!=null) { + wsdlDefinition = wsdlReference.getDefinition(); + wsdlUrl = wsdlReference.getWsdlURL(); + } + } + if (isUDDILookup()==false || wsdlUrl==null) { + WSDLReference wsdlReference = new WSDLHelper().createWSDLReference(engine, + metaData.getProcessId(), metaData.getServiceName(), metaData.getPortName()); + wsdlDefinition = wsdlReference.getDefinition(); + wsdlUrl = wsdlReference.getWsdlURL(); + } + isInitialized=true; + } public EndpointReference getEndpointReference() { @@ -106,8 +151,10 @@ public void invoke(final PartnerRoleMessageExchange mex) { - log.debug("Invoking dispatcher "+this.id); - + if (!isInitialized) initialize(); + log.debug("Invoking dispatcher "+this.id); + + boolean isTwoWay = mex.getMessageExchangePattern() == org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE; @@ -284,7 +331,7 @@ + "\n" + DOMWriter.printNode(odeMsgEl, true)); QName faultType = fault.getMessage().getQName(); - QName faultName = new QName(wsdlDefintion.getTargetNamespace(), fault.getName()); + QName faultName = new QName(wsdlDefinition.getTargetNamespace(), fault.getName()); Message response = mex.createMessage(faultType); response.setMessage(odeMsgEl); @@ -312,12 +359,13 @@ throw new RuntimeException("Not implemented. Should be removed form interface"); } - private Dispatch getDispatcher(QName portName) + private synchronized Dispatch getDispatcher(QName portName) { - if(null==dispatcher) - { + + if(null==dispatcher) { + log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName); - + this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); initializeStack(portName); Service service = Service.create(this.wsdlUrl, serviceName); @@ -358,5 +406,16 @@ { return "WebServiceClient {service="+serviceName+",port="+port+"}"; } + + public boolean isUDDILookup() { + return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_UDDI_LOOKUP, "false")); + } + + public boolean isWebserviceSecure() { + return Boolean.valueOf(engine.getOdeConfig().getProperty(BPEL_WEBSERVICE_SECURE, "false")); + } + + + } 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-06-02 13:31:07 UTC (rev 691) +++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-06-02 16:28:23 UTC (rev 692) @@ -21,10 +21,6 @@ */ package org.jboss.soa.bpel.uddi; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.URL; import java.rmi.RemoteException; import java.util.List; @@ -47,9 +43,9 @@ import org.apache.juddi.v3.client.config.UDDIClerkManager; import org.apache.juddi.v3.client.config.UDDIClientContainer; 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.WSDLReference; +import org.jboss.soa.bpel.runtime.ws.WebServiceClient; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BindingTemplates; @@ -486,6 +482,6 @@ * @return */ private String getWebserviceBaseUrl() { - return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080")); + return (properties.getProperty(WebServiceClient.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-06-02 13:31:07 UTC (rev 691) +++ trunk/runtime/uddi300/src/main/java/org/jboss/soa/bpel/uddi300/UDDI300RegistrationImpl.java 2010-06-02 16:28:23 UTC (rev 692) @@ -21,10 +21,6 @@ */ package org.jboss.soa.bpel.uddi300; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.URL; import java.rmi.RemoteException; import java.util.List; @@ -46,9 +42,9 @@ import org.apache.juddi.v3.client.config.UDDIClerk; import org.apache.juddi.v3.client.config.UDDIClerkManager; 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.WSDLReference; +import org.jboss.soa.bpel.runtime.ws.WebServiceClient; import org.uddi.api_v3.AccessPoint; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BindingTemplates; @@ -66,10 +62,13 @@ import org.uddi.v3_service.DispositionReportFaultMessage; /** + * This implementation is to support jUDDI-client-3.0.0 which ships with + * JBESB-4.7, which will no longer be supported in the next release. * * * @author Kurt T Stam <kurt.stam(a)jboss.com&gt; * */ +@Deprecated() public class UDDI300RegistrationImpl extends AnnotationProcessor implements UDDIRegistration { protected static final Log log = LogFactory.getLog(UDDI300RegistrationImpl.class); @@ -442,6 +441,6 @@ * @return */ private String getWebserviceBaseUrl() { - return (properties.getProperty(JAXWSBindingContext.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080")); + return (properties.getProperty(WebServiceClient.BPEL_WEBSERVICE_BASEURL, "http://localhost:8080")); } }