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

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

Author: tcunning
Date: 2013-05-28 16:34:53 -0400 (Tue, 28 May 2013)
New Revision: 38335

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/test/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyUnitTest.java
Log:
JBESB-3924
Fix fixRelative method for URLs containing a single char component.


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	2013-05-24 19:51:14 UTC (rev 38334)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyWsdlLoader.java	2013-05-28 20:34:53 UTC (rev 38335)
@@ -330,7 +330,7 @@
 	
 	String fixRelative(String base_url, String location)
 	{
-		location = location.replaceAll("/./", "/");
+                location = location.replaceAll("/\\./", "/");
 		if ( !location.startsWith("http://") && !location.startsWith("https://") )
 		{
 			while ( location.startsWith("./") )

Modified: labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyUnitTest.java	2013-05-24 19:51:14 UTC (rev 38334)
+++ labs/jbossesb/trunk/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxyUnitTest.java	2013-05-28 20:34:53 UTC (rev 38335)
@@ -60,6 +60,7 @@
 				new String[] {"http://foo.com/services/old/MyService.wsdl", ".././test/MySchema.xsd", "http://foo.com/services/test/MySchema.xsd"},
 				new String[] {"http://foo.com/services/old/MyService.wsdl", ".././../test/MySchema.xsd", "http://foo.com/test/MySchema.xsd"},
 				new String[] {"http://foo.com/services/old/MyService.wsdl", ".././../test/./MySchema.xsd", "http://foo.com/test/MySchema.xsd"},
+ 				new String[] {"http://foo.com/services/MyService.wsdl", "/7/MySchema.xsd", "http://foo.com/7/MySchema.xsd"},
 		};
 		SOAPProxyWsdlLoader loader = new DefaultSOAPProxyWsdlLoader(new ConfigTree("config"), null, true);
 		for (String[] r : relativeHttpResources)