aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1338246 - in /aries/branches/blueprint-0.3.2-fixes: ./ blueprint-core/src/main/java/org/apache/aries/ blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
Date Mon, 14 May 2012 15:13:19 GMT
Author: dkulp
Date: Mon May 14 15:13:19 2012
New Revision: 1338246

URL: http://svn.apache.org/viewvc?rev=1338246&view=rev
Log:
[ARIES-626] Part 1 - Set the systemId of the StreamSource so that schemas with relative includes
can resolve the relative includes. Solves the "simple" issue, the external includes still
needs a LOT more work.

Modified:
    aries/branches/blueprint-0.3.2-fixes/   (props changed)
    aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/  
(props changed)
    aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java

Propchange: aries/branches/blueprint-0.3.2-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /aries/trunk/blueprint:1200572

Propchange: aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Modified: aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
URL: http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java?rev=1338246&r1=1338245&r2=1338246&view=diff
==============================================================================
--- aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
(original)
+++ aries/branches/blueprint-0.3.2-fixes/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
Mon May 14 15:13:19 2012
@@ -237,7 +237,7 @@ public class NamespaceHandlerRegistryImp
                     if (url == null) {
                         LOGGER.warn("No URL is defined for schema " + ns + ". This schema
will not be validated");
                     } else {
-                        schemaSources.add(new StreamSource(url.openStream()));
+                        schemaSources.add(new StreamSource(url.openStream(), url.toExternalForm()));
                     }
                 }
                 schema = getSchemaFactory().newSchema(schemaSources.toArray(new Source[schemaSources.size()]));



Mime
View raw message