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 2014/02/21 16:44:18 UTC
[1/2] git commit: Upgrade to karaf 2.3.4
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x d7b7e5990 -> 08e05a041
refs/heads/master db24a900a -> 560c40504
Upgrade to karaf 2.3.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08e05a04
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08e05a04
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08e05a04
Branch: refs/heads/camel-2.12.x
Commit: 08e05a041220f7286437eba58a7a8564fb7e8951
Parents: d7b7e59
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 21 16:45:40 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 21 16:45:40 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/08e05a04/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c93f64b..4468dec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -247,7 +247,7 @@
<junit-bundle-version>4.11_1</junit-bundle-version>
<junit-version>4.11</junit-version>
<jython-version>2.5.3</jython-version>
- <karaf-version>2.3.3</karaf-version>
+ <karaf-version>2.3.4</karaf-version>
<krati-version>0.4.9</krati-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[2/2] git commit: Fixed spelling
Posted by da...@apache.org.
Fixed spelling
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/560c4050
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/560c4050
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/560c4050
Branch: refs/heads/master
Commit: 560c40504fd9be3644efc59579c482b0754ad425
Parents: db24a90
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 21 08:31:07 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 21 16:46:02 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/560c4050/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index b382ca5..4580c41 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -942,7 +942,7 @@ public class XmlConverter {
}
featureString.append(feature);
}
- LOG.info("DocumenterBuilderFactory has been set with features {{}}.", featureString.toString());
+ LOG.info("DocumentBuilderFactory has been set with features {{}}.", featureString.toString());
}
}
@@ -953,7 +953,7 @@ public class XmlConverter {
factory.setIgnoringElementContentWhitespace(true);
factory.setIgnoringComments(true);
try {
- // Disable the external-general-entitites by default
+ // Disable the external-general-entities by default
factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
} catch (ParserConfigurationException e) {
LOG.warn("DocumentBuilderFactory doesn't support the feature {} with value {}, due to {}."