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 2015/09/16 15:03:53 UTC

[3/5] camel git commit: CAMEL-9119: xslt should throw exception if error/fatal parsing xslt source. Fixed some invalid xsl files which is now reported as errors.

CAMEL-9119: xslt should throw exception if error/fatal parsing xslt source. Fixed some invalid xsl files which is now reported as errors.


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

Branch: refs/heads/master
Commit: c34d1aaf535123e6fc13b22ab9a2b0590558f22c
Parents: 6542c6d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Sep 16 13:32:35 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 16 13:32:35 2015 +0200

----------------------------------------------------------------------
 .../resources/org/apache/camel/component/xslt/staff_include.xsl    | 2 +-
 .../org/apache/camel/component/xslt/staff_include_classpath.xsl    | 2 +-
 .../org/apache/camel/component/xslt/staff_include_classpath2.xsl   | 2 +-
 .../org/apache/camel/component/xslt/staff_include_relative.xsl     | 2 +-
 .../apache/camel/component/xslt/staff_include_relative_other.xsl   | 2 +-
 camel-core/src/test/resources/xslt/staff/staff.xsl                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include.xsl
index 3991d81..2200329 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include.xsl
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include.xsl
@@ -19,7 +19,7 @@
 
     <xsl:include href="file:src/test/resources/org/apache/camel/component/xslt/staff_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="name"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath.xsl
index 87ebb55..5374d04 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath.xsl
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath.xsl
@@ -19,7 +19,7 @@
 
     <xsl:include href="classpath:org/apache/camel/component/xslt/staff_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="name"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath2.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath2.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath2.xsl
index 5098ece..082f54f 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath2.xsl
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_classpath2.xsl
@@ -20,7 +20,7 @@
     <!-- test with a directory from classpath that has dot in the name -->
     <xsl:include href="staff_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="name"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative.xsl
index afaf24d..2f19728 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative.xsl
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative.xsl
@@ -19,7 +19,7 @@
 
     <xsl:include href="staff_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="name"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative_other.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative_other.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative_other.xsl
index 312fa7b..8a4e1b1 100644
--- a/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative_other.xsl
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/staff_include_relative_other.xsl
@@ -19,7 +19,7 @@
 
     <xsl:include href="../staff_other_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="age"/>

http://git-wip-us.apache.org/repos/asf/camel/blob/c34d1aaf/camel-core/src/test/resources/xslt/staff/staff.xsl
----------------------------------------------------------------------
diff --git a/camel-core/src/test/resources/xslt/staff/staff.xsl b/camel-core/src/test/resources/xslt/staff/staff.xsl
index 4316c3f..4bb9e8d 100644
--- a/camel-core/src/test/resources/xslt/staff/staff.xsl
+++ b/camel-core/src/test/resources/xslt/staff/staff.xsl
@@ -19,7 +19,7 @@
 
     <xsl:include href="../common/staff_template.xsl"/>
 
-    <xsl:template match="staff/programmer">
+    <xsl:template match="staff/programmer" priority="2">
         <html>
             <body>
                 <xsl:apply-templates select="name"/>