You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/01 16:51:47 UTC
svn commit: r780668 - in
/camel/trunk/components/camel-cxf/src/main/resources:
META-INF/spring.handlers schema/cxfEndpoint.xsd
Author: ningjiang
Date: Mon Jun 1 14:51:47 2009
New Revision: 780668
URL: http://svn.apache.org/viewvc?rev=780668&view=rev
Log:
CAMEL-1658 updated the CXF schema file
Modified:
camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers
camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
Modified: camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers?rev=780668&r1=780667&r2=780668&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/META-INF/spring.handlers Mon Jun 1 14:51:47 2009
@@ -19,5 +19,4 @@
#
#
http\://camel.apache.org/schema/cxf=org.apache.camel.component.cxf.spring.NamespaceHandler
-http\://camel.apache.org/schema/cxfrs=org.apache.camel.component.cxf.rs.spring.NamespaceHandler
http\://cxf.apache.org/transports/camel=org.apache.camel.component.cxf.transport.spring.NamespaceHandler
\ No newline at end of file
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=780668&r1=780667&r2=780668&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 Mon Jun 1 14:51:47 2009
@@ -66,17 +66,18 @@
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:all>
- <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="executor" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="features" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="binding" type="xsd:anyType" minOccurs="0" />
<xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/>
<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="serviceFactory" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>
+ <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"/>
@@ -84,11 +85,11 @@
</xsd:all>
<xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="address" type="xsd:string" />
- <xsd:attribute name="bindingId" type="xsd:string" />
<xsd:attribute name="bus" type="xsd:string" />
- <xsd:attribute name="serviceClass" type="xsd:string"/>
- <xsd:attribute name="serviceBeans" type="xsd:string"/>
- <xsd:attribute name="transportId" type="xsd:string"/>
+ <xsd:attribute name="serviceClass" type="xsd:string"/>
+ <xsd:attribute name="transportId" type="xsd:string"/>
+ <xsd:attribute name="modelRef" type="xsd:string" />
+ <xsd:attribute name="bindingId" type="xsd:string" />
<xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" />
</xsd:extension>
</xsd:complexContent>
@@ -102,12 +103,15 @@
<xsd:all>
<xsd:element name="executor" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="features" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="binding" type="xsd:anyType" minOccurs="0" />
<xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
<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="providers" type="xsd:anyType" minOccurs="0"/>
+ <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>
@@ -116,6 +120,9 @@
<xsd:attribute name="serviceClass" type="xsd:string"/>
<xsd:attribute name="inheritHeaders" type="xsd:boolean"/>
<xsd:attribute name="bus" type="xsd:string" />
+ <xsd:attribute name="transportId" type="xsd:string"/>
+ <xsd:attribute name="bindingId" type="xsd:string" />
+ <xsd:attribute name="modelRef" type="xsd:string" />
<xsd:attribute name="username" type="xsd:string"/>
<xsd:attribute name="password" type="xsd:string"/>
</xsd:extension>
@@ -129,4 +136,35 @@
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="model">
+ <xsd:sequence>
+ <xsd:element name="resource" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="operation" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="param" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="type" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="path" type="xsd:string"/>
+ <xsd:attribute name="verb" type="xsd:string"/>
+ <xsd:attribute name="consumes" type="xsd:string"/>
+ <xsd:attribute name="produces" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="path" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:string"/>
+ </xsd:complexType>
+
</xsd:schema>