[jboss-svn-commits] JBL Code SVN: r28579 - labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy.

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

Author: dward
Date: 2009-07-29 15:34:20 -0400 (Wed, 29 Jul 2009)
New Revision: 28579

Modified:
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
   labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlContractPublisher.java
Log:
Fix for JBESB-2765


Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java	2009-07-29 17:09:42 UTC (rev 28578)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java	2009-07-29 19:34:20 UTC (rev 28579)
@@ -20,8 +20,10 @@
 package org.jboss.soa.esb.actions.soap.proxy;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -96,8 +98,20 @@
 	{
 		payloadProxy = new MessagePayloadProxy(config);
 		WSDLDefinitionsFactory wsdl_def_fact = WSDLDefinitionsFactory.newInstance();
-		URL wsdl_url = SOAPProxyWsdlContractPublisher.createLocalWsdlURL(config);
-		WSDLDefinitions wsdl_def = wsdl_def_fact.parse(wsdl_url);
+		File wsdl_file = SOAPProxyWsdlContractPublisher.createLocalWsdlFile(config);
+		WSDLDefinitions wsdl_def;
+		try
+		{
+			wsdl_def = wsdl_def_fact.parse( wsdl_file.toURL() );
+		}
+		catch (MalformedURLException mue)
+		{
+			throw new ConfigurationException(mue);
+		}
+		finally
+		{
+			wsdl_file.delete();
+		}
 		for ( WSDLBinding wsdl_bind : wsdl_def.getBindings() )
 		{
 			for ( WSDLBindingOperation wsdl_bind_oper : wsdl_bind.getOperations() )

Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlContractPublisher.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlContractPublisher.java	2009-07-29 17:09:42 UTC (rev 28578)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlContractPublisher.java	2009-07-29 19:34:20 UTC (rev 28579)
@@ -24,10 +24,8 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.net.URL;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.soap.wise.WiseWsdlContractPublisher;
 import org.jboss.soa.esb.helpers.ConfigTree;
@@ -40,26 +38,19 @@
 public class SOAPProxyWsdlContractPublisher extends WiseWsdlContractPublisher
 {
 	
-	private static Logger logger = Logger.getLogger(SOAPProxyWsdlContractPublisher.class);
-	
-	static URL createLocalWsdlURL(ConfigTree config) throws ConfigurationException
+	static File createLocalWsdlFile(ConfigTree config) throws ConfigurationException
 	{
+		File wsdl_file;
 		Writer writer = null;
 		try
 		{
 			WsdlLoader loader = new WsdlLoader(config);
-			String wsdl = loader.getWsdl( config.getRequiredAttribute("wsdl") );
-			File file = File.createTempFile(SOAPProxyWsdlContractPublisher.class.getName() + "-", ".wsdl");
-			file.deleteOnExit();
-			writer = new BufferedWriter( new FileWriter(file) );
-			writer.write(wsdl);
+			String wsdl_attr = config.getRequiredAttribute("wsdl");
+			String wsdl_data = loader.getWsdl(wsdl_attr);
+			wsdl_file = File.createTempFile(SOAPProxyWsdlContractPublisher.class.getName() + "-", ".wsdl");
+			writer = new BufferedWriter( new FileWriter(wsdl_file) );
+			writer.write(wsdl_data);
 			writer.flush();
-			URL url = file.toURL();
-			if ( logger.isDebugEnabled() )
-			{
-				logger.debug("created local wsdl url: " + url);
-			}
-			return url;
 		}
 		catch (IOException ioe)
 		{
@@ -69,6 +60,7 @@
 		{
 			try { if (writer != null) writer.close(); } catch (Throwable t) {}
 		}
+		return wsdl_file;
 	}
 	
 	private static class WsdlLoader extends SOAPProxyWsdlContractPublisher