Author: dkulp
Date: Thu Jul 7 18:54:31 2011
New Revision: 1143972
URL: http://svn.apache.org/viewvc?rev=1143972&view=rev
Log:
Merged revisions 1138285 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1138285 | ningjiang | 2011-06-21 22:41:00 -0400 (Tue, 21 Jun 2011) | 1 line
CAMEL-4133 Fix the issue of camel-blueprint doesn't handle elements with a namespace prefix
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/branches/camel-2.7.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-13.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 18:54:31 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1139163,1143925
+/camel/trunk:1083696,1084150,1085905,1086231,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094156,1095405,1095469,1095471,1095475-1095476,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1138285,1139163,1143925
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.7.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1143972&r1=1143971&r2=1143972&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/branches/camel-2.7.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Thu Jul 7 18:54:31 2011
@@ -107,7 +107,7 @@ public class CamelNamespaceHandler imple
if (node.getNodeType() == Node.ELEMENT_NODE) {
Document doc = node.getOwnerDocument();
if (((Element) node).getNamespaceURI().equals(BLUEPRINT_NS)) {
- doc.renameNode(node, SPRING_NS, node.getNodeName());
+ doc.renameNode(node, SPRING_NS, node.getLocalName());
}
}
NodeList list = node.getChildNodes();
@@ -127,7 +127,7 @@ public class CamelNamespaceHandler imple
public Metadata parse(Element element, ParserContext context) {
renameNamespaceRecursive(element);
- if (element.getNodeName().equals(CAMEL_CONTEXT)) {
+ if (element.getLocalName().equals(CAMEL_CONTEXT)) {
// Find the id, generate one if needed
String contextId = element.getAttribute("id");
boolean implicitId = false;
@@ -212,7 +212,7 @@ public class CamelNamespaceHandler imple
return ctx;
}
- if (element.getNodeName().equals(ROUTE_CONTEXT)) {
+ if (element.getLocalName().equals(ROUTE_CONTEXT)) {
// now lets parse the routes with JAXB
Binder<Node> binder;
try {
Modified: camel/branches/camel-2.7.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-13.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-13.xml?rev=1143972&r1=1143971&r2=1143972&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-13.xml (original)
+++ camel/branches/camel-2.7.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/blueprint/blueprint-13.xml Thu Jul 7 18:54:31 2011
@@ -15,13 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:camel="http://camel.apache.org/schema/blueprint">
- <camelContext xmlns="http://camel.apache.org/schema/blueprint">
- <route>
- <from uri="file:target/foo"/>
- <to uri="mock:result"/>
- </route>
- </camelContext>
+ <camel:camelContext>
+ <camel:route>
+ <camel:from uri="file:target/foo"/>
+ <camel:to uri="mock:result"/>
+ </camel:route>
+ </camel:camelContext>
</blueprint>