svn commit: r1432820 - in /camel/trunk: components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/ components/camel-cxf-transport/src/main/resources/schema/blueprint/ tests/camel-blueprint-cxf-test/src/test/resourc...

[ni...@apache.org]

Author: ningjiang
Date: Mon Jan 14 07:46:12 2013
New Revision: 1432820

URL: http://svn.apache.org/viewvc?rev=1432820&view=rev
Log:
CAMEL-5933 changed the camelContext attribute to camelContextId

Modified:
    camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/AbstractBeanDefinitionParser.java
    camel/trunk/components/camel-cxf-transport/src/main/resources/schema/blueprint/camel.xsd
    camel/trunk/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfTransportBeans.xml

Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/AbstractBeanDefinitionParser.java?rev=1432820&r1=1432819&r2=1432820&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/AbstractBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/AbstractBeanDefinitionParser.java Mon Jan 14 07:46:12 2013
@@ -72,7 +72,7 @@ public class AbstractBeanDefinitionParse
             String val = node.getValue();
             //String pre = node.getPrefix();
             String name = node.getLocalName();
-            if ("camelContext".equals(name)) {
+            if ("camelContextId".equals(name)) {
                 camelContextId = val;
             }
         }

Modified: camel/trunk/components/camel-cxf-transport/src/main/resources/schema/blueprint/camel.xsd
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/resources/schema/blueprint/camel.xsd?rev=1432820&r1=1432819&r2=1432820&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/resources/schema/blueprint/camel.xsd (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/resources/schema/blueprint/camel.xsd Mon Jan 14 07:46:12 2013
@@ -35,7 +35,7 @@
             <xsd:complexContent>
                 <xsd:extension base="beans:Tcomponent"/>
                 <!-- here we need to specify the CamelContext reference --> 
-                <xsd:attribute name="camelContext" type="xsd:string" />
+                <xsd:attribute name="camelContextId" type="xsd:string" />
             </xsd:complexContent>
         </xsd:complexType>
     </xsd:element>
@@ -45,7 +45,7 @@
             <xsd:complexContent>
                 <xsd:extension base="beans:Tcomponent"/>
                 <!-- here we need to specify the CamelContext reference --> 
-                <xsd:attribute name="camelContext" type="xsd:string" />    
+                <xsd:attribute name="camelContextId" type="xsd:string" />    
             </xsd:complexContent>
         </xsd:complexType>
     </xsd:element>

Modified: camel/trunk/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfTransportBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfTransportBeans.xml?rev=1432820&r1=1432819&r2=1432820&view=diff
==============================================================================
--- camel/trunk/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfTransportBeans.xml (original)
+++ camel/trunk/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfTransportBeans.xml Mon Jan 14 07:46:12 2013
@@ -27,12 +27,13 @@
              http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd
              http://cxf.apache.org/blueprint/simple http://cxf.apache.org/schemas/blueprint/simple.xsd
              http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
+             http://cxf.apache.org/transports/camel/blueprint http://cxf.apache.org/schmemas/blueprint/camel.xsd
              http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
              http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
              http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
   
   <!-- make sure the destination is injected with the right camel context -->
-  <transport:destination id="*.camel-destination" camelContext="camel1" />
+  <transport:destination id="*.camel-destination" camelContextId="camel1" />
   
   <simple:server serviceClass="org.apache.camel.component.cxf.HelloService" address="camel://direct:server">
     <simple:serviceBean>