You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/27 15:55:16 UTC

[1/3] camel git commit: CAMEL-11074: Unable to load Schematron XSLT templates on windows

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9ea2a2863 -> d999f21b6
  refs/heads/camel-2.18.x 2301422d0 -> b40f69f2a
  refs/heads/master 675dd7415 -> df8f7318c


CAMEL-11074: Unable to load Schematron XSLT templates on windows


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

Branch: refs/heads/master
Commit: df8f7318cb47c71dd9d05f738a7f9f65af853b7e
Parents: 675dd74
Author: James Netherton <ja...@gmail.com>
Authored: Mon Mar 27 16:19:07 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 27 17:54:22 2017 +0200

----------------------------------------------------------------------
 .../component/schematron/processor/ClassPathURIResolver.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/df8f7318/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
index 86c9bed..8be20e1 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.schematron.processor;
 
-import java.io.File;
 import java.io.InputStream;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -43,7 +42,7 @@ public class ClassPathURIResolver implements URIResolver {
     @Override
     public Source resolve(String href, String base) throws TransformerException {
         InputStream stream = ClassPathURIResolver.class.getClassLoader()
-                .getResourceAsStream(rulesDir.concat(File.separator).concat(href));
+                .getResourceAsStream(rulesDir.concat("/").concat(href));
         if (stream != null) {
             return new StreamSource(stream);
         } else {


[3/3] camel git commit: CAMEL-11074: Unable to load Schematron XSLT templates on windows

Posted by da...@apache.org.
CAMEL-11074: Unable to load Schematron XSLT templates on windows


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

Branch: refs/heads/camel-2.17.x
Commit: d999f21b641c3505b88cc7c4c66aee6054956611
Parents: 9ea2a28
Author: James Netherton <ja...@gmail.com>
Authored: Mon Mar 27 16:19:07 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 27 17:55:08 2017 +0200

----------------------------------------------------------------------
 .../component/schematron/processor/ClassPathURIResolver.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d999f21b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
index 86c9bed..8be20e1 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.schematron.processor;
 
-import java.io.File;
 import java.io.InputStream;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -43,7 +42,7 @@ public class ClassPathURIResolver implements URIResolver {
     @Override
     public Source resolve(String href, String base) throws TransformerException {
         InputStream stream = ClassPathURIResolver.class.getClassLoader()
-                .getResourceAsStream(rulesDir.concat(File.separator).concat(href));
+                .getResourceAsStream(rulesDir.concat("/").concat(href));
         if (stream != null) {
             return new StreamSource(stream);
         } else {


[2/3] camel git commit: CAMEL-11074: Unable to load Schematron XSLT templates on windows

Posted by da...@apache.org.
CAMEL-11074: Unable to load Schematron XSLT templates on windows


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

Branch: refs/heads/camel-2.18.x
Commit: b40f69f2a04fad62013edad240212d51d0abca74
Parents: 2301422
Author: James Netherton <ja...@gmail.com>
Authored: Mon Mar 27 16:19:07 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 27 17:54:47 2017 +0200

----------------------------------------------------------------------
 .../component/schematron/processor/ClassPathURIResolver.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b40f69f2/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
index 86c9bed..8be20e1 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.schematron.processor;
 
-import java.io.File;
 import java.io.InputStream;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -43,7 +42,7 @@ public class ClassPathURIResolver implements URIResolver {
     @Override
     public Source resolve(String href, String base) throws TransformerException {
         InputStream stream = ClassPathURIResolver.class.getClassLoader()
-                .getResourceAsStream(rulesDir.concat(File.separator).concat(href));
+                .getResourceAsStream(rulesDir.concat("/").concat(href));
         if (stream != null) {
             return new StreamSource(stream);
         } else {