[jboss-svn-commits] JBL Code SVN: r34474 - in labs/jbossesb/trunk/product: samples/quickstarts/webservice_proxy_routed and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 3 06:08:01 EDT 2010
Author: mageshbk at jboss.com
Date: 2010-08-03 06:08:00 -0400 (Tue, 03 Aug 2010)
New Revision: 34474
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebServiceUtils.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java
Log:
[JBESB-3418] - Reverted internal://endpoint-name format to internal://deployment-name.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml 2010-08-03 10:08:00 UTC (rev 34474)
@@ -15,7 +15,7 @@
</action>
<action name="proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="internal://HelloWorldWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=Quickstart_webservice_proxy_basic_ws,endpoint=HelloWorldWS"/>
</action>
<action name="echo-response"
class="org.jboss.soa.esb.actions.SystemPrintln">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml 2010-08-03 10:08:00 UTC (rev 34474)
@@ -75,7 +75,7 @@
</action>
<action name="proxy_hello_proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="internal://HelloWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=HelloWS"/>
</action>
<action name="proxy_hello_echo_response"
class="org.jboss.soa.esb.actions.SystemPrintln">
@@ -99,7 +99,7 @@
</action>
<action name="proxy_goodbye_proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="internal://GoodbyeWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=GoodbyeWS"/>
</action>
<action name="proxy_goodbye_echo_response"
class="org.jboss.soa.esb.actions.SystemPrintln">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml 2010-08-03 10:08:00 UTC (rev 34474)
@@ -30,7 +30,7 @@
</action>
<action name="proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="internal://HelloWorldWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=webservice_proxy_security,endpoint=HelloWorldWS"/>
<property name="endpointUrl" value="https://localhost:8443/webservice_proxy_security/HelloWorldWS"/>
<property name="file" value="/META-INF/httpclient-8443.properties"/>
</action>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml 2010-08-03 10:08:00 UTC (rev 34474)
@@ -26,7 +26,7 @@
<action name="proxy-invoke-new-version"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
<!-- this is the NEW endpoint, because we transformed the OLD request to fit it -->
- <property name="wsdl" value="internal://InvoicingWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=Quickstart_webservice_proxy_versioning_ws,endpoint=InvoicingWS"/>
<property name="wsdlTransform" value="/Proxy_Versioning_WsdlTransform.xml"/>
</action>
<action name="echo-response"
@@ -51,7 +51,7 @@
<action name="proxy-invoke-new-version"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
<!-- this is the NEW endpoint, of course -->
- <property name="wsdl" value="internal://InvoicingWS"/>
+ <property name="wsdl" value="internal://jboss.ws:context=Quickstart_webservice_proxy_versioning_ws,endpoint=InvoicingWS"/>
</action>
<action name="echo-response"
class="org.jboss.soa.esb.actions.SystemPrintln">
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebServiceUtils.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebServiceUtils.java 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebServiceUtils.java 2010-08-03 10:08:00 UTC (rev 34474)
@@ -61,7 +61,7 @@
public static final String JBOSSWS_ENDPOINT = "jbossws-endpoint";
/**
- * Get the Service Endpoint based on the endpoint name's short name.
+ * Get the Service Endpoint based on the endpoint's short name.
*
* @param endpointName Service Endpoint name.
* @return The service endpoint, or null if the endpoint is not found.
@@ -83,6 +83,26 @@
}
/**
+ * Get the Service Endpoint based on the endpoint's deployment name.
+ *
+ * @param endpointName The deployment name.
+ * @return The service endpoint, or null if the endpoint is not found.
+ */
+ public static Endpoint getDeploymentEndpoint(String endpointName) {
+ SPIProvider spiProv = SPIProviderResolver.getInstance().getProvider();
+ EndpointRegistryFactory factory = spiProv.getSPI(EndpointRegistryFactory.class);
+ EndpointRegistry registry = factory.getEndpointRegistry();
+ Set<ObjectName> objectNames = registry.getEndpoints();
+
+ for (ObjectName objectName : objectNames) {
+ if (objectName.toString().equals(endpointName)) {
+ return registry.getEndpoint(objectName);
+ }
+ }
+ return null;
+ }
+
+ /**
* Get the internal File system location of the WSDL for a given endpoint.
*
* @param endpoint Service Endpoint.
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java 2010-08-03 09:25:32 UTC (rev 34473)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java 2010-08-03 10:08:00 UTC (rev 34474)
@@ -359,7 +359,7 @@
{
String end_addr = super.getAddress();
String end_name = end_addr.substring( 11, end_addr.length() );
- Endpoint end = WebServiceUtils.getServiceEndpoint(end_name);
+ Endpoint end = WebServiceUtils.getDeploymentEndpoint(end_name);
if (end != null)
{
return WebServiceUtils.getWsdlLocation(end);
More information about the jboss-svn-commits
mailing list