[jboss-svn-commits] JBL Code SVN: r29963 - in labs/jbossesb/trunk/product: samples/quickstarts/webservice_proxy_basic and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 4 13:19:00 EST 2009
Author: dward
Date: 2009-11-04 13:18:59 -0500 (Wed, 04 Nov 2009)
New Revision: 29963
Modified:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierControllerMBean.java
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/wsbarrier-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/wsbarrier-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/wsbarrier-service.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/deployment.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/wsbarrier-service.xml
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java
Log:
Fix for JBESB-2947
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierController.java 2009-11-04 18:18:59 UTC (rev 29963)
@@ -39,15 +39,19 @@
private ObjectName wsObjectName;
private WSDeploymentBarrier wsDeploymentBarrier;
+ public ObjectName getWsObjectName() {
+ return this.wsObjectName;
+ }
+
public void setWsObjectName(ObjectName wsObjectName) {
this.wsObjectName = wsObjectName;
}
protected void createService() throws Exception {
List<SubscriptionInfo> subscriptions = new ArrayList<SubscriptionInfo>();
- ObjectName wsObjectName = new ObjectName("jboss.web:service=WebServer");
+ ObjectName subObjectName = new ObjectName("jboss.web:service=WebServer");
- subscriptions.add(new SubscriptionInfo(wsObjectName, "WebServer", null));
+ subscriptions.add(new SubscriptionInfo(subObjectName, "WebServer", null));
subscribe(subscriptions, true, getServiceName());
// The WS may already be deployed. If it is, need to add barrier bean for it...
@@ -121,7 +125,7 @@
private void registerExistingDeployment() {
try {
- Set existingDeployments = getServer().queryMBeans(wsObjectName, null);
+ Set<?> existingDeployments = getServer().queryMBeans(wsObjectName, null);
if(existingDeployments != null && !existingDeployments.isEmpty()) {
// It's already deployed. Add the Barrier...
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierControllerMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierControllerMBean.java 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/WSDeploymentBarrierControllerMBean.java 2009-11-04 18:18:59 UTC (rev 29963)
@@ -29,6 +29,6 @@
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
public interface WSDeploymentBarrierControllerMBean extends ListenerServiceMBean {
-
+ ObjectName getWsObjectName();
void setWsObjectName(ObjectName wsObjectName);
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/build.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -19,6 +19,7 @@
<target name="quickstart-specific-predeploys">
<copy todir="${org.jboss.esb.server.deploy.dir}"
file="build/predeploy/${ant.project.name}_ws.war"/>
+ <!-- sleep seconds="3"/ -->
</target>
<target name="quickstart-specific-undeploys">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/deployment.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/deployment.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,5 +1,4 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=soap.esb</depends>
<depends>jboss.ws:context=Quickstart_webservice_proxy_basic_ws,endpoint=HelloWorldWS.Barrier</depends>
</jbossesb-deployment>
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 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/jboss-esb.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -15,7 +15,8 @@
</action>
<action name="proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_basic_ws/HelloWorldWS?wsdl"/>
+ <!-- property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_basic_ws/HelloWorldWS?wsdl"/ -->
+ <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_basic/wsbarrier-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/wsbarrier-service.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_basic/wsbarrier-service.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=HelloWorldWSBarrierController">
- <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_basic_ws,endpoint=HelloWorldWS</attribute>
- </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=ProxyBasicHelloWorldWSBarrierController">
+ <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_basic_ws,endpoint=HelloWorldWS</attribute>
+ </mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/build.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/build.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -18,12 +18,12 @@
<target name="quickstart-specific-predeploys">
<copy todir="${org.jboss.esb.server.deploy.dir}"
- file="build/predeploy/${ant.project.name}-ws.war"/>
- <sleep seconds="3"/>
+ file="build/predeploy/${ant.project.name}_ws.war"/>
+ <!-- sleep seconds="3"/ -->
</target>
<target name="quickstart-specific-undeploys">
- <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-ws.war"/>
+ <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}_ws.war"/>
</target>
<target name="makewar" description="make war">
@@ -38,7 +38,7 @@
<!-- War... -->
<mkdir dir="build/predeploy"/>
- <war warfile="build/predeploy/${ant.project.name}-ws.war"
+ <war warfile="build/predeploy/${ant.project.name}_ws.war"
webxml="${basedir}/war/resources/WEB-INF/web.xml">
<webinf dir="${basedir}/war/resources/WEB-INF">
<include name="jboss-web.xml"/>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/deployment.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,5 +1,4 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=soap.esb</depends>
<depends>jboss.esb:deployment=jbrules.esb</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_cbr_esb</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_cbr_esb_reply</depends>
@@ -7,7 +6,7 @@
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_hello_esb_reply</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_goodbye_esb</depends>
<depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_proxy_routed_goodbye_esb_reply</depends>
- <depends>jboss.ws:context=Quickstart_webservice_proxy_routed-ws,endpoint=HelloWS.Barrier</depends>
- <depends>jboss.ws:context=Quickstart_webservice_proxy_routed-ws,endpoint=GoodbyeWS.Barrier</depends>
+ <depends>jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=HelloWS.Barrier</depends>
+ <depends>jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=GoodbyeWS.Barrier</depends>
</jbossesb-deployment>
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 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/jboss-esb.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -75,7 +75,8 @@
</action>
<action name="proxy_hello_proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_routed-ws/HelloWS?wsdl"/>
+ <!-- property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_routed_ws/HelloWS?wsdl"/ -->
+ <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 +100,8 @@
</action>
<action name="proxy_goodbye_proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_routed-ws/GoodbyeWS?wsdl"/>
+ <!-- property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_routed_ws/GoodbyeWS?wsdl"/ -->
+ <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_routed/wsbarrier-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/wsbarrier-service.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_routed/wsbarrier-service.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=HelloWSBarrierController">
- <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_routed-ws,endpoint=HelloWS</attribute>
- </mbean>
- <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=GoodbyeWSBarrierController">
- <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_routed-ws,endpoint=GoodbyeWS</attribute>
- </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=ProxyRoutedHelloWSBarrierController">
+ <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=HelloWS</attribute>
+ </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=ProxyRoutedGoodbyeWSBarrierController">
+ <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_routed_ws,endpoint=GoodbyeWS</attribute>
+ </mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/build.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -19,7 +19,7 @@
<target name="quickstart-specific-predeploys">
<copy todir="${org.jboss.esb.server.deploy.dir}"
file="build/predeploy/webservice_proxy_security.war"/>
- <sleep seconds="3"/>
+ <!-- sleep seconds="3"/ -->
</target>
<target name="quickstart-specific-undeploys">
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/deployment.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/deployment.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,5 +1,4 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=soap.esb</depends>
<depends>jboss.ws:context=webservice_proxy_security,endpoint=HelloWorldWS.Barrier</depends>
</jbossesb-deployment>
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 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/jboss-esb-template.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -30,7 +30,8 @@
</action>
<action name="proxy"
class="org.jboss.soa.esb.actions.soap.proxy.SOAPProxy">
- <property name="wsdl" value="https://localhost:8443/webservice_proxy_security/HelloWorldWS?wsdl"/>
+ <!-- property name="wsdl" value="https://localhost:8443/webservice_proxy_security/HelloWorldWS?wsdl"/ -->
+ <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_security/wsbarrier-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/wsbarrier-service.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_security/wsbarrier-service.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=HelloWorldWSBarrierController">
- <attribute name="WsObjectName">jboss.ws:context=webservice_proxy_security,endpoint=HelloWorldWS</attribute>
- </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=ProxySecurityHelloWorldWSBarrierController">
+ <attribute name="WsObjectName">jboss.ws:context=webservice_proxy_security,endpoint=HelloWorldWS</attribute>
+ </mbean>
</server>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/build.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/build.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -18,12 +18,12 @@
<target name="quickstart-specific-predeploys">
<copy todir="${org.jboss.esb.server.deploy.dir}"
- file="build/predeploy/${ant.project.name}-ws.war"/>
- <sleep seconds="3"/>
+ file="build/predeploy/${ant.project.name}_ws.war"/>
+ <!-- sleep seconds="3"/ -->
</target>
<target name="quickstart-specific-undeploys">
- <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-ws.war"/>
+ <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}_ws.war"/>
</target>
<target name="makewar" description="make war">
@@ -38,7 +38,7 @@
<!-- War... -->
<mkdir dir="build/predeploy"/>
- <war warfile="build/predeploy/${ant.project.name}-ws.war"
+ <war warfile="build/predeploy/${ant.project.name}_ws.war"
webxml="${basedir}/war/resources/WEB-INF/web.xml">
<webinf dir="${basedir}/war/resources/WEB-INF">
<include name="jboss-web.xml"/>
@@ -71,7 +71,7 @@
<target name="runws">
<echo>Calling JBossWS webservice directly.</echo>
- <property name="runtest.arg.url" value="http://localhost:8080/Quickstart_webservice_proxy_versioning-ws/InvoicingWS"/>
+ <property name="runtest.arg.url" value="http://localhost:8080/Quickstart_webservice_proxy_versioning_ws/InvoicingWS"/>
<property name="runtest.arg.ver" value="new"/>
<antcall target="runinternal"/>
</target>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/deployment.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/deployment.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,5 +1,4 @@
<jbossesb-deployment>
- <depends>jboss.esb:deployment=soap.esb</depends>
- <depends>jboss.ws:context=Quickstart_webservice_proxy_versioning-ws,endpoint=InvoicingWS.Barrier</depends>
+ <depends>jboss.ws:context=Quickstart_webservice_proxy_versioning_ws,endpoint=InvoicingWS.Barrier</depends>
</jbossesb-deployment>
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 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/jboss-esb.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -28,7 +28,8 @@
<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="http://localhost:8080/Quickstart_webservice_proxy_versioning-ws/InvoicingWS?wsdl"/>
+ <!-- property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_versioning_ws/InvoicingWS?wsdl"/ -->
+ <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"
@@ -53,7 +54,8 @@
<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="http://localhost:8080/Quickstart_webservice_proxy_versioning-ws/InvoicingWS?wsdl"/>
+ <!-- property name="wsdl" value="http://localhost:8080/Quickstart_webservice_proxy_versioning_ws/InvoicingWS?wsdl"/ -->
+ <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/samples/quickstarts/webservice_proxy_versioning/wsbarrier-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/wsbarrier-service.xml 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_proxy_versioning/wsbarrier-service.xml 2009-11-04 18:18:59 UTC (rev 29963)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=InvoicingWSBarrierController">
- <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_versioning-ws,endpoint=InvoicingWS</attribute>
- </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.WSDeploymentBarrierController" name="jboss.esb:service=ProxyVersioningInvoicingWSBarrierController">
+ <attribute name="WsObjectName">jboss.ws:context=Quickstart_webservice_proxy_versioning_ws,endpoint=InvoicingWS</attribute>
+ </mbean>
</server>
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 2009-11-04 17:49:20 UTC (rev 29962)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java 2009-11-04 18:18:59 UTC (rev 29963)
@@ -38,6 +38,7 @@
import org.jboss.soa.esb.actions.soap.AuthBASICWsdlContractPublisher;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.util.ClassUtil;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
import org.jboss.wsf.spi.SPIProvider;
@@ -235,7 +236,7 @@
private static class InternalSOAPProxyWsdlLoader extends SOAPProxyWsdlLoader
{
- private File wsdl_temp_file;
+ private URL wsdl_url;
public InternalSOAPProxyWsdlLoader(String end_name) throws IOException
{
@@ -254,18 +255,12 @@
}
if (end != null)
{
- BufferedOutputStream bos = null;
- try
+ ServerEndpointMetaData end_meta = end.getAttachment(ServerEndpointMetaData.class);
+ if (end_meta == null)
{
- wsdl_temp_file = createTempFile();
- bos = new BufferedOutputStream( new FileOutputStream(wsdl_temp_file) );
- end.getRequestHandler().handleWSDLRequest(end, bos, null);
- bos.flush();
+ throw new IOException("cannot obtain metadata for internal endpoint: " + end_name);
}
- finally
- {
- try { if (bos != null) bos.close(); } catch (Throwable t) {}
- }
+ wsdl_url = end_meta.getServiceMetaData().getWsdlLocation();
}
else
{
@@ -275,15 +270,9 @@
public URL getURL() throws MalformedURLException
{
- return wsdl_temp_file.toURL();
+ return wsdl_url;
}
- @Override
- public void cleanup()
- {
- wsdl_temp_file.delete();
- }
-
}
}
More information about the jboss-svn-commits
mailing list