camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r780969 - in /camel/trunk/components/camel-cxf/src/main: java/org/apache/camel/component/cxf/spring/ resources/schema/
Date Tue, 02 Jun 2009 08:51:49 GMT
Author: ningjiang
Date: Tue Jun  2 08:51:48 2009
New Revision: 780969

URL: http://svn.apache.org/viewvc?rev=780969&view=rev
Log:
CAMEL-1658 updated the spring parser files and schema

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
    camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=780969&r1=780968&r2=780969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
Tue Jun  2 08:51:48 2009
@@ -40,11 +40,6 @@
         super();
         setBeanClass(SpringJAXRSClientFactoryBean.class);
     }
-        
-    @Override
-    protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String
val) {
-        mapToProperty(bean, name, val);
-    }
     
     @Override
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean)
{

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=780969&r1=780968&r2=780969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
Tue Jun  2 08:51:48 2009
@@ -59,17 +59,6 @@
         bean.addPropertyValue("beanId", resolveId(element, bean.getBeanDefinition(), ctx));
           
     }
     
-    
-    @Override
-    protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String
val) {
-        if ("endpointName".equals(name) || "serviceName".equals(name)) {
-            QName q = parseQName(e, val);
-            bean.addPropertyValue(name, q);
-        } else {
-            mapToProperty(bean, name, val);
-        }
-    }
-
     @Override
     protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element el,
String name) {
         if ("properties".equals(name) 

Modified: camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd?rev=780969&r1=780968&r2=780969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd Tue Jun  2
08:51:48 2009
@@ -75,9 +75,11 @@
             <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
-            <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>   
        
+            <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>
+            <!-- this is only supported in CXF 2.2.3             
             <xsd:element name="modelBeans" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="model" type="model" minOccurs="0"/>
+             -->
             <xsd:element name="providers" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="extensionMappings" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="languageMappings" type="xsd:anyType" minOccurs="0"/>
@@ -88,7 +90,9 @@
           <xsd:attribute name="bus" type="xsd:string" />
           <xsd:attribute name="serviceClass" type="xsd:string"/>                  
 
           <xsd:attribute name="transportId" type="xsd:string"/>
+          <!-- this is only supported in CXF 2.2.3 
           <xsd:attribute name="modelRef" type="xsd:string" />
+          -->
           <xsd:attribute name="bindingId" type="xsd:string" />          
           <xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" />
         </xsd:extension>
@@ -110,8 +114,10 @@
             <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
             <xsd:element name="providers" type="xsd:anyType" minOccurs="0"/>
+            <!-- this is only supported in CXF 2.2.3             
             <xsd:element name="modelBeans" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="model" type="model" minOccurs="0"/>
+             -->
             <xsd:element name="headers" type="xsd:anyType" minOccurs="0"/> 
             <xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/>
           </xsd:all>
@@ -122,7 +128,9 @@
           <xsd:attribute name="bus" type="xsd:string" />
           <xsd:attribute name="transportId" type="xsd:string"/>
           <xsd:attribute name="bindingId" type="xsd:string" />
+          <!-- this is only supported in CXF 2.2.3 
           <xsd:attribute name="modelRef" type="xsd:string" />
+          -->
           <xsd:attribute name="username" type="xsd:string"/>
           <xsd:attribute name="password" type="xsd:string"/>
         </xsd:extension>
@@ -136,6 +144,7 @@
     </xsd:sequence>
   </xsd:complexType>
   
+  <!-- this is only supported in CXF 2.2.3 
   <xsd:complexType name="model">
     <xsd:sequence>
       <xsd:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -166,5 +175,5 @@
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:string"/>
   </xsd:complexType>
-  
+  -->
 </xsd:schema>



Mime
View raw message