[jboss-svn-commits] JBL Code SVN: r32719 - in labs/jbossesb/trunk/product/services/soap/src: test/java/org/jboss/soa/esb/actions/soap/request and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mageshbk at jboss.com
Date: 2010-05-04 04:24:36 -0400 (Tue, 04 May 2010)
New Revision: 32719

Modified:
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
   labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
Log:
[JBESB-3102] - Fix for webservice_consumer1 QuickStart failure.

Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java	2010-05-04 01:05:53 UTC (rev 32718)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/MBeanSoapUIInvoker.java	2010-05-04 08:24:36 UTC (rev 32719)
@@ -165,7 +165,7 @@
      */
     public String getContentType(String wsdl, Properties httpClientProps) throws IOException {
         try {
-            return (String) mbeanServer.invoke(serviceName, "getSOAPVersion", new Object[] {wsdl, httpClientProps}, getEndpointSig);
+            return (String) mbeanServer.invoke(serviceName, "getContentType", new Object[] {wsdl, httpClientProps}, getEndpointSig);
         } catch (InstanceNotFoundException e) {
             throw new UnsupportedOperationException("SOAP UI Client Service not found under name '" + serviceName.getCanonicalName() + "'.  This service must be deployed before this action can be used.", e);
         } catch (MBeanException e) {

Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2010-05-04 01:05:53 UTC (rev 32718)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/SOAPClient.java	2010-05-04 08:24:36 UTC (rev 32719)
@@ -295,6 +295,7 @@
     private String endpoint;
     private String endpointUrl;
     private String contentType;
+    private boolean endpointInitialized = false;
     private MessagePayloadProxy payloadProxy;
     private boolean httpResponseStatusEnabled;
 
@@ -359,23 +360,8 @@
         super.initialise();
         // Create the SoapUIInvoker instance for this SOAPClient...
         soapUIInvoker = new MBeanSoapUIInvoker();
-        createEndpoint();
     }
 
-    public void createEndpoint() throws ActionLifecycleException {
-        try {
-            if(endpointUrl != null) {
-                endpoint = endpointUrl;
-            } else {
-                endpoint = soapUIInvoker.getEndpoint(wsdl, httpClientProps);
-            }
-            contentType = soapUIInvoker.getContentType(wsdl, httpClientProps) + ";charset=UTF-8";
-
-        } catch (IOException e) {
-            throw new ActionLifecycleException("soapUI Client Service invocation failed.", e);
-        }
-    }
-
     public SoapUIInvoker getSoapUIInvoker() {
         return soapUIInvoker;
     }
@@ -499,6 +485,20 @@
     }
 
     private Response invokeEndpoint(String request) throws ActionProcessingException {
+        if (!endpointInitialized) {
+            try {
+                if(endpointUrl != null) {
+                    endpoint = endpointUrl;
+                } else {
+                    endpoint = soapUIInvoker.getEndpoint(wsdl, httpClientProps);
+                }
+                contentType = soapUIInvoker.getContentType(wsdl, httpClientProps) + ";charset=UTF-8";
+
+            } catch (IOException e) {
+                throw new ActionProcessingException("soapUI Client Service invocation failed.", e);
+            }
+            endpointInitialized = true;
+        }
         PostMethod post = new PostMethod(endpoint);
 
         post.setRequestHeader("Content-Type", contentType);

Modified: labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java	2010-05-04 01:05:53 UTC (rev 32718)
+++ labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/request/MockSOAPClient.java	2010-05-04 08:24:36 UTC (rev 32719)
@@ -69,7 +69,6 @@
             };
             
             setSoapUIInvoker(soapUIInvoker);
-            createEndpoint();
         } catch (ConfigurationException e) {
             throw new ActionLifecycleException("Failed to initialize SoapUIInvoker.", e);
         }