Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 431d06733 -> aca025602
refs/heads/camel-2.14.x 03d040a2b -> aed8459db
CAMEL-8096 CxfEndpoint schema should support to publishEndpointUrl from the
element attribute
Conflicts:
components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aca02560
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aca02560
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aca02560
Branch: refs/heads/camel-2.13.x
Commit: aca025602143c183d29e984bf8583c6d60df805a
Parents: 431d067
Author: Willem Jiang <willem.ji...@gmail.com>
Authored: Mon Dec 1 10:25:05 2014 +0800
Committer: Willem Jiang <willem.ji...@gmail.com>
Committed: Thu Dec 4 09:51:17 2014 +0800
----------------------------------------------------------------------
.../resources/schema/blueprint/camel-cxf.xsd | 3 +-
.../src/main/resources/schema/cxfEndpoint.xsd | 29 ++++++++++----------
2 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aca02560/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
----------------------------------------------------------------------
diff --git
a/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
b/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
index 76ad5d9..f7d6042 100644
--- a/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
+++ b/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
@@ -59,6 +59,7 @@
<xsd:attribute name="serviceName" type="xsd:QName"/>
<xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean"/>
<xsd:attribute name="loggingSizeLimit" type="xsd:integer" />
+ <xsd:attribute name="publishedEndpointUrl" type="xsd:string" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -173,4 +174,4 @@
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/camel/blob/aca02560/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
b/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
index ddd1657..e641537 100644
--- a/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
+++ b/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
@@ -22,23 +22,23 @@
xmlns:beans="http://www.springframework.org/schema/beans";
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- targetNamespace="http://camel.apache.org/schema/cxf";
+ targetNamespace="http://camel.apache.org/schema/cxf";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans";
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
<xsd:import namespace="http://cxf.apache.org/configuration/beans";
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
-
+
<xsd:element name="cxfEndpoint">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:all>
<xsd:element name="binding" type="xsd:anyType" minOccurs="0"/>
- <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="dataBinding" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="features" 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="handlers" type="xsd:anyType" minOccurs="0"/>
@@ -58,11 +58,12 @@
<xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean"/>
<xsd:attribute name="loggingSizeLimit" type="xsd:integer" />
<xsd:attribute name="skipFaultLogging" type="xsd:boolean" />
+ <xsd:attribute name="publishedEndpointUrl" type="xsd:string" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="rsServer">
<xsd:complexType>
<xsd:complexContent>
@@ -70,7 +71,7 @@
<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="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"/>
@@ -88,10 +89,10 @@
<xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="address" type="xsd:string" />
<xsd:attribute name="bus" type="xsd:string" />
- <xsd:attribute name="serviceClass" 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="bindingId" type="xsd:string" />
<xsd:attribute name="staticSubresourceResolution" type="xsd:boolean"
/>
<xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean"/>
<xsd:attribute name="loggingSizeLimit" type="xsd:integer" />
@@ -100,7 +101,7 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="rsClient">
<xsd:complexType>
<xsd:complexContent>
@@ -117,7 +118,7 @@
<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="headers" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="schemaLocations" type="schemasType"
minOccurs="0"/>
</xsd:all>
<xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
@@ -137,13 +138,13 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
-
+
<xsd:complexType name="schemasType">
<xsd:sequence>
<xsd:element name="schemaLocation" type="xsd:string" minOccurs="0"
maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
-
+
<xsd:complexType name="model">
<xsd:sequence>
<xsd:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -170,8 +171,8 @@
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="path" type="xsd:string"/>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
+ </xsd:complexType>
</xsd:schema>
