You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/07/30 14:58:08 UTC
[1/2] git commit: CAMEL-6572 fixed loading the schema from bundle
issue
Updated Branches:
refs/heads/camel-2.11.x 3b8544550 -> 14a73886d
refs/heads/master d6aa78289 -> 7b995ad9a
CAMEL-6572 fixed loading the schema from bundle issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b995ad9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b995ad9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b995ad9
Branch: refs/heads/master
Commit: 7b995ad9a57530fdf1a29f49a7a13b8e0dd38e22
Parents: d6aa782
Author: Willem Jiang <ni...@apache.org>
Authored: Tue Jul 30 20:48:49 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Tue Jul 30 20:50:54 2013 +0800
----------------------------------------------------------------------
.../camel/component/validator/DefaultLSResourceResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b995ad9/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 86db2e8..622e257 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
@@ -65,7 +65,7 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
String resourceURI = null;
// Build up the relative path for using relatedURI and baseURI
if (baseURI == null) {
- relatedURI = getUri(systemId);
+ relatedURI = FileUtil.compactPath(getUri(systemId), '/');
resourceURI = relatedURI;
} else {
String relatedPath = relatedURIMap.get(baseURI);
@@ -74,11 +74,11 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
if (relatedPath == null) {
relatedPath = "";
}
- relatedURI = FileUtil.onlyPath(relatedURI) + "/" + systemId;
+ relatedURI = FileUtil.compactPath(FileUtil.onlyPath(relatedURI) + "/" + systemId, '/');
resourceURI = relatedURI;
relatedURIMap.put(baseURI, relatedPath);
} else {
- resourceURI = relatedPath + "/" + systemId;
+ resourceURI = FileUtil.compactPath(relatedPath + "/" + systemId, '/');
relatedURI = resourceURI;
}
}
[2/2] git commit: CAMEL-6572 fixed loading the schema from bundle
issue
Posted by ni...@apache.org.
CAMEL-6572 fixed loading the schema from bundle issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14a73886
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14a73886
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14a73886
Branch: refs/heads/camel-2.11.x
Commit: 14a73886dbd1bed4c9b79982ae9dea26ae7d2738
Parents: 3b85445
Author: Willem Jiang <ni...@apache.org>
Authored: Tue Jul 30 20:48:49 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Tue Jul 30 20:57:13 2013 +0800
----------------------------------------------------------------------
.../camel/component/validator/DefaultLSResourceResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/14a73886/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 86db2e8..622e257 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
@@ -65,7 +65,7 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
String resourceURI = null;
// Build up the relative path for using relatedURI and baseURI
if (baseURI == null) {
- relatedURI = getUri(systemId);
+ relatedURI = FileUtil.compactPath(getUri(systemId), '/');
resourceURI = relatedURI;
} else {
String relatedPath = relatedURIMap.get(baseURI);
@@ -74,11 +74,11 @@ public class DefaultLSResourceResolver implements LSResourceResolver {
if (relatedPath == null) {
relatedPath = "";
}
- relatedURI = FileUtil.onlyPath(relatedURI) + "/" + systemId;
+ relatedURI = FileUtil.compactPath(FileUtil.onlyPath(relatedURI) + "/" + systemId, '/');
resourceURI = relatedURI;
relatedURIMap.put(baseURI, relatedPath);
} else {
- resourceURI = relatedPath + "/" + systemId;
+ resourceURI = FileUtil.compactPath(relatedPath + "/" + systemId, '/');
relatedURI = resourceURI;
}
}