[jbossws-commits] JBossWS SVN: r18406 - in stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869: modules/core/src/main/java/org/jboss/ws/extensions/validation and 1 other directory.
Author: klape
Date: 2014-02-21 12:54:06 -0500 (Fri, 21 Feb 2014)
New Revision: 18406
Modified:
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/pom.xml
Log:
[JBPAPP-10869] Schema extractor should allow filenames with non-alphabetic characters
Modified:
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2014-02-21
16:03:51 UTC (rev 18405)
+++
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2014-02-21
17:54:06 UTC (rev 18406)
@@ -23,6 +23,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -77,9 +78,9 @@
{
Map<String, byte[]> streams = new HashMap<String, byte[]>();
//Get the path to the WSDL
- Pattern p = Pattern.compile("[a-zA-Z]+\\.[a-zA-Z]+$");
- Matcher m = p.matcher(wsdlURL.getFile());
- path = m.replaceFirst("");
+ String wsdlFile = wsdlURL.getFile();
+ int lastSlash = wsdlFile.lastIndexOf(File.separator);
+ path = wsdlFile.substring(0, lastSlash+1);
// parse the wsdl
Element root = DOMUtils.parse(wsdlURL.openStream());
Modified: stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/pom.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/pom.xml 2014-02-21
16:03:51 UTC (rev 18405)
+++
stack/native/branches/jbossws-native-3.1.2.SP15-patch-01_JBPAPP-10869/pom.xml 2014-02-21
17:54:06 UTC (rev 18406)
@@ -74,7 +74,7 @@
<woodstox.version>3.2.9</woodstox.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <xalan.version>2.7.1-patch-05</xalan.version>
+ <xalan.version>2.7.1-patch-04</xalan.version>
<xerces.version>2.9.1</xerces.version>
</properties>