camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [1/2] git commit: CAMEL-6572 Fixed the Validator component schema loading issue
Date Fri, 26 Jul 2013 09:00:05 GMT
Updated Branches:
  refs/heads/camel-2.11.x 0497a7489 -> fde2c7a17


CAMEL-6572 Fixed the Validator component schema loading issue


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ebc41e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ebc41e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ebc41e2

Branch: refs/heads/camel-2.11.x
Commit: 4ebc41e2b53ff2e058781c522a3b1a053dd2fafc
Parents: 0497a74
Author: Willem Jiang <ningjiang@apache.org>
Authored: Fri Jul 26 15:57:02 2013 +0800
Committer: Willem Jiang <ningjiang@apache.org>
Committed: Fri Jul 26 16:58:19 2013 +0800

----------------------------------------------------------------------
 .../camel/component/validator/DefaultLSResourceResolver.java      | 3 ++-
 .../org/apache/camel/component/validator/xsds/person.xsd          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4ebc41e2/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
index a8048a5..86db2e8 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
@@ -77,8 +77,9 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
                 relatedURI = FileUtil.onlyPath(relatedURI) + "/" + systemId;
                 resourceURI = relatedURI;
                 relatedURIMap.put(baseURI, relatedPath);
-            } else { 
+            } else {
                 resourceURI = relatedPath + "/" + systemId;
+                relatedURI = resourceURI;
             }
         }
         return new DefaultLSInput(publicId, systemId, baseURI, resourceURI);

http://git-wip-us.apache.org/repos/asf/camel/blob/4ebc41e2/camel-core/src/test/resources/org/apache/camel/component/validator/xsds/person.xsd
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/validator/xsds/person.xsd
b/camel-core/src/test/resources/org/apache/camel/component/validator/xsds/person.xsd
index 99455c7..3eb767a 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/validator/xsds/person.xsd
+++ b/camel-core/src/test/resources/org/apache/camel/component/validator/xsds/person.xsd
@@ -22,6 +22,8 @@
            targetNamespace="org.person"
            xmlns:h="org.health.check.person">
     <xs:import schemaLocation="health/health.xsd" namespace="org.health.check.person"/>
+    <xs:import schemaLocation="health/common/common.xsd" namespace="org.health.check.common"/>
+    <xs:import schemaLocation="health/type1.xsd" namespace="org.health.check.type1" />
     <xs:element name="person" type="p:personType">
 </xs:element>
 <xs:complexType name="personType">


Mime
View raw message