svn commit: r493283 - in /incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd: CapturingXMLEntityResolver.java SchemaModelImpl.java

[mszefler]

Author: mszefler
Date: Fri Jan  5 19:18:46 2007
New Revision: 493283

URL: http://svn.apache.org/viewvc?view=rev&rev=493283
Log:
Use internal resolver in the schema model.

Modified:
    
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
    
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java

Modified: 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java?view=diff&rev=493283&r1=493282&r2=493283
==============================================================================
--- 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
 (original)
+++ 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
 Fri Jan  5 19:18:46 2007
@@ -86,12 +86,12 @@
 
     try {
       URI systemId = new URI(
-          FileUtils.encodePath(resourceIdentifier.getExpandedSystemId() == 
null ? resourceIdentifier
-              .getNamespace() : resourceIdentifier.getExpandedSystemId()));
+          FileUtils.encodePath(resourceIdentifier.getLiteralSystemId() == null 
? resourceIdentifier
+              .getNamespace() : resourceIdentifier.getLiteralSystemId()));
 
       _capture.put(systemId, data);
     } catch (URISyntaxException use) {
-      __log.error("Invalid URI: " + resourceIdentifier.getExpandedSystemId());
+      __log.error("Invalid URI: " + resourceIdentifier.getLiteralSystemId());
       throw new XNIException(use);
     }
     

Modified: 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java?view=diff&rev=493283&r1=493282&r2=493283
==============================================================================
--- 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
 (original)
+++ 
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
 Fri Jan  5 19:18:46 2007
@@ -60,7 +60,8 @@
     public static final SchemaModel newModel(Map<URI, byte[]> schemas) {
         XMLSchemaLoader schemaLoader = new XMLSchemaLoader();
         InternalSchemaResolver resolver = new InternalSchemaResolver();
-//        schemaLoader.setEntityResolver(resolver);
+        schemaLoader.setEntityResolver(resolver);
+
 
         final String[] uris = new String[schemas.size()];
         final byte[][] content = new byte[schemas.size()][];
@@ -166,13 +167,14 @@
         public void put(URI uri, byte[] bytes) {
             _schemas.put(uri.toASCIIString(), bytes);
         }
+        
         public XMLInputSource resolveEntity(XMLResourceIdentifier 
resourceIdentifier) throws XNIException, IOException {
             XMLInputSource src = new XMLInputSource(resourceIdentifier);
             String location = "";
             if (resourceIdentifier.getNamespace() != null && 
_schemas.get(resourceIdentifier.getNamespace()) != null)
                 location = resourceIdentifier.getNamespace();
-            else if (resourceIdentifier.getBaseSystemId() != null && 
_schemas.get(resourceIdentifier.getBaseSystemId()) != null)
-                location = resourceIdentifier.getBaseSystemId();
+            else if (resourceIdentifier.getLiteralSystemId() != null && 
_schemas.get(resourceIdentifier.getLiteralSystemId()) != null)
+                location = resourceIdentifier.getLiteralSystemId();
 
             src.setByteStream(new 
ByteArrayInputStream(_schemas.get(location)));
             return src;