[riftsaw-commits] riftsaw SVN: r590 - in trunk/runtime: uddi/src/test/java/org/jboss/soa/bpel and 1 other directories.

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; }