svn commit: r689551 - in /ode/branches/rtver: bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java

[mriou]

Author: mriou
Date: Wed Aug 27 11:33:58 2008
New Revision: 689551

URL: http://svn.apache.org/viewvc?rev=689551&view=rev
Log:
Fix for WSDLs with internal schema references.

Modified:
    
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
    
ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java

Modified: 
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
URL: 
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java?rev=689551&r1=689550&r2=689551&view=diff
==============================================================================
--- 
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
 (original)
+++ 
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
 Wed Aug 27 11:33:58 2008
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -84,6 +85,14 @@
         if (resourceIdentifier.getLiteralSystemId() == null) {
             // import without schemaLocation
             if (__log.isDebugEnabled()) __log.debug("resolveEntity: no schema 
location for "+resourceIdentifier.getNamespace());
+            try {
+                if (_internalSchemas.get(new 
URI(resourceIdentifier.getNamespace())) != null) {
+                    src.setByteStream(new 
ByteArrayInputStream(_internalSchemas.get(new 
URI(resourceIdentifier.getNamespace())).getBytes()));
+                    return src;
+                }
+            } catch (URISyntaxException e) {
+                __log.debug("resolveEntity: no schema location an no known 
namespace for: " + resourceIdentifier.getNamespace());
+            }
             return null;
         } else if (resourceIdentifier.getExpandedSystemId() != null) { 
             // schema imported by other schema

Modified: 
ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: 
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=689551&r1=689550&r2=689551&view=diff
==============================================================================
--- 
ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
 (original)
+++ 
ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
 Wed Aug 27 11:33:58 2008
@@ -359,7 +359,7 @@
 
         for (Thread testThread : testThreads) {
             testThread.start();
-            if (testThreads.size() > 0) Thread.sleep(3000);
+            if (testThreads.size() > 0) Thread.sleep(2000);
         }
 
         for (Thread testThread : testThreads)