Author: ningjiang Date: Thu Feb 26 07:18:53 2015 New Revision: 941507 Log: Updated the schema version
Removed: websites/production/camel/content/schema/blueprint/cxf/ Modified: websites/production/camel/content/schema/blueprint/camel-blueprint.xsd websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd websites/production/camel/content/schema/cxf/camel-cxf-spring.xsd websites/production/camel/content/schema/spring/camel-spring.xsd Modified: websites/production/camel/content/schema/blueprint/camel-blueprint.xsd ============================================================================== --- websites/production/camel/content/schema/blueprint/camel-blueprint.xsd (original) +++ websites/production/camel/content/schema/blueprint/camel-blueprint.xsd Thu Feb 26 07:18:53 2015 @@ -7,6 +7,8 @@ <xs:element name="avro" type="tns:avroDataFormat"/> + <xs:element name="barcode" type="tns:barcodeDataFormat"/> + <xs:element name="base64" type="tns:base64DataFormat"/> <xs:element name="batchResequencerConfig" type="tns:batchResequencerConfig"/> @@ -23,6 +25,8 @@ <xs:element name="choice" type="tns:choiceDefinition"/> + <xs:element name="circuitBreaker" type="tns:circuitBreakerLoadBalancerDefinition"/> + <xs:element name="constant" type="tns:constantExpression"/> <xs:element name="consumerTemplate" type="tns:camelConsumerTemplateFactoryBean"/> @@ -43,6 +47,8 @@ <xs:element name="delay" type="tns:delayDefinition"/> + <xs:element name="delete" type="tns:deleteVerbDefinition"/> + <xs:element name="description" type="tns:descriptionDefinition"/> <xs:element name="doCatch" type="tns:catchDefinition"/> @@ -75,10 +81,14 @@ <xs:element name="from" type="tns:fromDefinition"/> + <xs:element name="get" type="tns:getVerbDefinition"/> + <xs:element name="groovy" type="tns:groovyExpression"/> <xs:element name="gzip" type="tns:gzipDataFormat"/> + <xs:element name="head" type="tns:headVerbDefinition"/> + <xs:element name="header" type="tns:headerExpression"/> <xs:element name="hl7" type="tns:hl7DataFormat"/> @@ -149,10 +159,14 @@ <xs:element name="pollEnrich" type="tns:pollEnrichDefinition"/> + <xs:element name="post" type="tns:postVerbDefinition"/> + <xs:element name="process" type="tns:processDefinition"/> <xs:element name="properties" type="tns:propertiesDefinition"/> + <xs:element name="propertiesFunction" type="tns:camelPropertyPlaceholderFunctionDefinition"/> + <xs:element name="property" nillable="true" type="xs:anyType"/> <xs:element name="propertyPlaceholder" type="tns:camelPropertyPlaceholderDefinition"/> @@ -161,6 +175,8 @@ <xs:element name="proxy" nillable="true" type="xs:anyType"/> + <xs:element name="put" type="tns:putVerbDefinition"/> + <xs:element name="python" type="tns:pythonExpression"/> <xs:element name="random" type="tns:randomLoadBalancerDefinition"/> @@ -181,6 +197,20 @@ <xs:element name="resequence" type="tns:resequenceDefinition"/> + <xs:element name="rest" type="tns:restDefinition"/> + + <xs:element name="restBinding" type="tns:restBindingDefinition"/> + + <xs:element name="restConfiguration" type="tns:restConfigurationDefinition"/> + + <xs:element name="restContext" type="tns:camelRestContextFactoryBean"/> + + <xs:element name="restContextRef" type="tns:restContextRefDefinition"/> + + <xs:element name="restProperty" type="tns:restPropertyDefinition"/> + + <xs:element name="rests" type="tns:restsDefinition"/> + <xs:element name="rollback" type="tns:rollbackDefinition"/> <xs:element name="roundRobin" type="tns:roundRobinLoadBalancerDefinition"/> @@ -275,6 +305,8 @@ <xs:element name="validate" type="tns:validateDefinition"/> + <xs:element name="verb" type="tns:verbDefinition"/> + <xs:element name="vtdxml" type="tns:vtdXmlExpression"/> <xs:element name="weighted" type="tns:weightedLoadBalancerDefinition"/> @@ -295,6 +327,8 @@ <xs:element name="xstream" type="tns:xStreamDataFormat"/> + <xs:element name="xtokenize" type="tns:xmlTokenizerExpression"/> + <xs:element name="zip" type="tns:zipDataFormat"/> <xs:element name="zipFile" type="tns:zipFileDataFormat"/> @@ -350,6 +384,7 @@ </xs:choice> <xs:element ref="tns:routeBuilder" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:routeContextRef" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="tns:restContextRef" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:threadPoolProfile" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:threadPool" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:endpoint" minOccurs="0" maxOccurs="unbounded"/> @@ -360,6 +395,8 @@ <xs:element ref="tns:intercept" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:interceptFrom" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="interceptSendToEndpoint" type="tns:interceptSendToEndpointDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="tns:restConfiguration" minOccurs="0"/> + <xs:element ref="tns:rest" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:route" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="depends-on" type="xs:string"/> @@ -373,6 +410,7 @@ <xs:attribute name="useMDCLogging" type="xs:string"/> <xs:attribute name="useBreadcrumb" type="xs:string"/> <xs:attribute name="allowUseOriginalMessage" type="xs:string"/> + <xs:attribute name="runtimeEndpointRegistryEnabled" type="xs:string"/> <xs:attribute name="managementNamePattern" type="xs:string"/> <xs:attribute name="threadNamePattern" type="xs:string"/> <xs:attribute name="useBlueprintPropertyResolver" type="xs:boolean"/> @@ -407,7 +445,9 @@ <xs:complexType name="camelPropertyPlaceholderDefinition"> <xs:complexContent> <xs:extension base="tns:identifiedType"> - <xs:sequence/> + <xs:sequence> + <xs:element ref="tns:propertiesFunction" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> <xs:attribute name="location" type="xs:string" use="required"/> <xs:attribute name="cache" type="xs:boolean"/> <xs:attribute name="ignoreMissingLocation" type="xs:boolean"/> @@ -422,6 +462,15 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="camelPropertyPlaceholderFunctionDefinition"> + <xs:complexContent> + <xs:extension base="tns:identifiedType"> + <xs:sequence/> + <xs:attribute name="ref" type="xs:string" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="packageScanDefinition"> <xs:sequence> <xs:element name="package" type="xs:string" maxOccurs="unbounded"/> @@ -577,6 +626,11 @@ <xs:attribute name="ref" type="xs:string" use="required"/> </xs:complexType> + <xs:complexType name="restContextRefDefinition"> + <xs:sequence/> + <xs:attribute name="ref" type="xs:string" use="required"/> + </xs:complexType> + <xs:complexType name="threadPoolProfileDefinition"> <xs:complexContent> <xs:extension base="tns:optionalIdentifiedDefinition"> @@ -660,6 +714,7 @@ <xs:sequence> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="tns:avro"/> + <xs:element ref="tns:barcode"/> <xs:element ref="tns:base64"/> <xs:element ref="tns:beanio"/> <xs:element ref="tns:bindy"/> @@ -709,6 +764,18 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="barcodeDataFormat"> + <xs:complexContent> + <xs:extension base="tns:dataFormat"> + <xs:sequence/> + <xs:attribute name="width" type="xs:int"/> + <xs:attribute name="height" type="xs:int"/> + <xs:attribute name="imageType" type="xs:string"/> + <xs:attribute name="barcodeFormat" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="base64DataFormat"> <xs:complexContent> <xs:extension base="tns:dataFormat"> @@ -816,6 +883,14 @@ <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> + <xs:attribute name="parserFactoryRef" type="xs:string"/> + <xs:attribute name="definition" type="xs:string"/> + <xs:attribute name="fixed" type="xs:boolean"/> + <xs:attribute name="ignoreFirstRecord" type="xs:boolean"/> + <xs:attribute name="textQualifier" type="xs:string"/> + <xs:attribute name="delimiter" type="xs:string"/> + <xs:attribute name="allowShortLines" type="xs:boolean"/> + <xs:attribute name="ignoreExtraColumns" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -845,6 +920,7 @@ <xs:attribute name="schema" type="xs:string"/> <xs:attribute name="prettyPrint" type="xs:boolean"/> <xs:attribute name="ignoreJAXBElement" type="xs:boolean"/> + <xs:attribute name="mustBeJAXBElement" type="xs:boolean"/> <xs:attribute name="filterNonXmlChars" type="xs:boolean"/> <xs:attribute name="encoding" type="xs:string"/> <xs:attribute name="fragment" type="xs:boolean"/> @@ -852,6 +928,7 @@ <xs:attribute name="partNamespace" type="xs:string"/> <xs:attribute name="namespacePrefixRef" type="xs:string"/> <xs:attribute name="xmlStreamWriterWrapper" type="xs:string"/> + <xs:attribute name="schemaLocation" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -874,6 +951,10 @@ <xs:attribute name="library" type="tns:jsonLibrary"/> <xs:attribute name="unmarshalTypeName" type="xs:string"/> <xs:attribute name="jsonView" type="xs:string"/> + <xs:attribute name="include" type="xs:string"/> + <xs:attribute name="allowJmsType" type="xs:boolean"/> + <xs:attribute name="collectionTypeName" type="xs:string"/> + <xs:attribute name="useList" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -909,6 +990,7 @@ <xs:attribute name="keyPassword" type="xs:string"/> <xs:attribute name="digestAlgorithm" type="xs:string"/> <xs:attribute name="mgfAlgorithm" type="xs:string"/> + <xs:attribute name="addKeyValueForEncryptedKey" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -930,6 +1012,7 @@ <xs:attribute name="elementNameStrategyRef" type="xs:string"/> <xs:attribute name="version" type="xs:string"/> <xs:attribute name="namespacePrefixRef" type="xs:string"/> + <xs:attribute name="schema" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1014,6 +1097,7 @@ <xs:attribute name="encoding" type="xs:string"/> <xs:attribute name="driver" type="xs:string"/> <xs:attribute name="driverRef" type="xs:string"/> + <xs:attribute name="mode" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1151,6 +1235,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1196,13 +1281,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="redeliveryPolicyRef" type="xs:string"/> @@ -1259,6 +1344,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -1269,6 +1355,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1314,13 +1401,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -1361,6 +1448,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -1378,6 +1466,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1423,17 +1512,19 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> + <xs:attribute name="mode" type="tns:onCompletionMode"/> <xs:attribute name="onCompleteOnly" type="xs:boolean"/> <xs:attribute name="onFailureOnly" type="xs:boolean"/> + <xs:attribute name="parallelProcessing" type="xs:boolean"/> <xs:attribute name="executorServiceRef" type="xs:string"/> <xs:attribute name="useOriginalMessage" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -1461,6 +1552,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1506,13 +1598,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -1541,6 +1633,108 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="restConfigurationDefinition"> + <xs:sequence> + <xs:element name="componentProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="endpointProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="consumerProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="dataFormatProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="corsHeaders" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="component" type="xs:string"/> + <xs:attribute name="scheme" type="xs:string"/> + <xs:attribute name="host" type="xs:string"/> + <xs:attribute name="port" type="xs:string"/> + <xs:attribute name="contextPath" type="xs:string"/> + <xs:attribute name="hostNameResolver" type="tns:restHostNameResolver"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:attribute name="jsonDataFormat" type="xs:string"/> + <xs:attribute name="xmlDataFormat" type="xs:string"/> + </xs:complexType> + + <xs:complexType name="restPropertyDefinition"> + <xs:sequence/> + <xs:attribute name="key" type="xs:string" use="required"/> + <xs:attribute name="value" type="xs:string" use="required"/> + </xs:complexType> + + <xs:complexType name="restDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="tns:verb"/> + <xs:element ref="tns:delete"/> + <xs:element ref="tns:get"/> + <xs:element ref="tns:head"/> + <xs:element ref="tns:post"/> + <xs:element ref="tns:put"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="path" type="xs:string"/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="verbDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="tns:to"/> + <xs:element ref="tns:route"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="method" type="xs:string"/> + <xs:attribute name="uri" type="xs:string"/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:attribute name="type" type="xs:string"/> + <xs:attribute name="outType" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="toDefinition"> + <xs:complexContent> + <xs:extension base="tns:sendDefinition"> + <xs:sequence/> + <xs:attribute name="pattern" type="tns:exchangePattern"/> + <xs:anyAttribute namespace="##other" processContents="skip"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="sendDefinition" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:noOutputDefinition"> + <xs:sequence/> + <xs:attribute name="uri" type="xs:string"/> + <xs:attribute name="ref" type="xs:string"/> + <xs:anyAttribute namespace="##other" processContents="skip"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="noOutputDefinition" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:processorDefinition"> + <xs:sequence/> + <xs:anyAttribute namespace="##other" processContents="skip"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="routeDefinition"> <xs:complexContent> <xs:extension base="tns:processorDefinition"> @@ -1553,6 +1747,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1598,13 +1793,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="autoStartup" type="xs:string"/> @@ -1613,6 +1808,7 @@ <xs:attribute name="group" type="xs:string"/> <xs:attribute name="handleFault" type="xs:string"/> <xs:attribute name="messageHistory" type="xs:string"/> + <xs:attribute name="rest" type="xs:boolean"/> <xs:attribute name="routePolicyRef" type="xs:string"/> <xs:attribute name="shutdownRoute" type="tns:shutdownRoute"/> <xs:attribute name="shutdownRunningTask" type="tns:shutdownRunningTask"/> @@ -1634,6 +1830,16 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="camelRestContextFactoryBean"> + <xs:complexContent> + <xs:extension base="tns:identifiedType"> + <xs:sequence> + <xs:element ref="tns:rest" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="camelRouteContextFactoryBean"> <xs:complexContent> <xs:extension base="tns:identifiedType"> @@ -1758,6 +1964,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1803,13 +2010,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="parallelProcessing" type="xs:boolean"/> @@ -1852,15 +2059,7 @@ <xs:attribute name="method" type="xs:string"/> <xs:attribute name="beanType" type="xs:string"/> <xs:attribute name="cache" type="xs:boolean"/> - <xs:anyAttribute namespace="##other" processContents="skip"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="noOutputDefinition" abstract="true"> - <xs:complexContent> - <xs:extension base="tns:processorDefinition"> - <xs:sequence/> + <xs:attribute name="multiParameterArray" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -1880,6 +2079,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -1925,13 +2125,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -2016,6 +2216,7 @@ <xs:attribute name="strategyRef" type="xs:string"/> <xs:attribute name="strategyMethodName" type="xs:string"/> <xs:attribute name="strategyMethodAllowNull" type="xs:boolean"/> + <xs:attribute name="aggregateOnException" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2065,17 +2266,6 @@ </xs:complexContent> </xs:complexType> - <xs:complexType name="sendDefinition" abstract="true"> - <xs:complexContent> - <xs:extension base="tns:noOutputDefinition"> - <xs:sequence/> - <xs:attribute name="uri" type="xs:string"/> - <xs:attribute name="ref" type="xs:string"/> - <xs:anyAttribute namespace="##other" processContents="skip"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="inOutDefinition"> <xs:complexContent> <xs:extension base="tns:sendDefinition"> @@ -2097,6 +2287,7 @@ <xs:element ref="tns:sticky"/> <xs:element ref="tns:topic"/> <xs:element ref="tns:weighted"/> + <xs:element ref="tns:circuitBreaker"/> </xs:choice> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="tns:onException"/> @@ -2105,6 +2296,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -2150,13 +2342,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="ref" type="xs:string"/> @@ -2239,6 +2431,18 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="circuitBreakerLoadBalancerDefinition"> + <xs:complexContent> + <xs:extension base="tns:loadBalancer"> + <xs:sequence> + <xs:element name="exception" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="halfOpenAfter" type="xs:long"/> + <xs:attribute name="threshold" type="xs:int"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="logDefinition"> <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> @@ -2247,6 +2451,7 @@ <xs:attribute name="loggingLevel" type="tns:loggingLevel"/> <xs:attribute name="logName" type="xs:string"/> <xs:attribute name="marker" type="xs:string"/> + <xs:attribute name="loggerRef" type="xs:string"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2322,6 +2527,7 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2356,6 +2562,7 @@ <xs:attribute name="strategyRef" type="xs:string"/> <xs:attribute name="strategyMethodName" type="xs:string"/> <xs:attribute name="strategyMethodAllowNull" type="xs:boolean"/> + <xs:attribute name="aggregateOnException" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2391,6 +2598,8 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="cacheSize" type="xs:int"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2458,6 +2667,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -2468,6 +2678,7 @@ <xs:element ref="tns:intercept"/> <xs:element ref="tns:interceptFrom"/> <xs:element ref="tns:interceptToEndpoint"/> + <xs:element ref="tns:to"/> <xs:element ref="tns:route"/> <xs:element ref="tns:aop"/> <xs:element ref="tns:aggregate"/> @@ -2513,13 +2724,13 @@ <xs:element ref="tns:threads"/> <xs:element ref="tns:throttle"/> <xs:element ref="tns:throwException"/> - <xs:element ref="tns:to"/> <xs:element ref="tns:transacted"/> <xs:element ref="tns:transform"/> <xs:element ref="tns:doTry"/> <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -2557,6 +2768,10 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="restContextRefDefinitionHelper" final="extension restriction"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="rollbackDefinition"> <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> @@ -2593,6 +2808,7 @@ <xs:sequence/> <xs:attribute name="uriDelimiter" type="xs:string"/> <xs:attribute name="ignoreInvalidEndpoints" type="xs:boolean"/> + <xs:attribute name="cacheSize" type="xs:int"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2692,6 +2908,7 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2732,6 +2949,7 @@ <xs:attribute name="timePeriodMillis" type="xs:long"/> <xs:attribute name="asyncDelayed" type="xs:boolean"/> <xs:attribute name="callerRunsWhenRejected" type="xs:boolean"/> + <xs:attribute name="rejectExecution" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2747,16 +2965,6 @@ </xs:complexContent> </xs:complexType> - <xs:complexType name="toDefinition"> - <xs:complexContent> - <xs:extension base="tns:sendDefinition"> - <xs:sequence/> - <xs:attribute name="pattern" type="tns:exchangePattern"/> - <xs:anyAttribute namespace="##other" processContents="skip"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="transactedDefinition"> <xs:complexContent> <xs:extension base="tns:output"> @@ -3017,6 +3225,16 @@ </xs:simpleContent> </xs:complexType> + <xs:complexType name="xmlTokenizerExpression"> + <xs:simpleContent> + <xs:extension base="tns:namespaceAwareExpression"> + <xs:attribute name="headerName" type="xs:string"/> + <xs:attribute name="mode" type="xs:string"/> + <xs:attribute name="group" type="xs:int"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:complexType name="xPathExpression"> <xs:simpleContent> <xs:extension base="tns:namespaceAwareExpression"> @@ -3039,6 +3257,72 @@ </xs:simpleContent> </xs:complexType> + <xs:complexType name="deleteVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="getVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="headVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="postVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="putVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restBindingDefinition"> + <xs:complexContent> + <xs:extension base="tns:noOutputDefinition"> + <xs:sequence/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="type" type="xs:string"/> + <xs:attribute name="outType" type="xs:string"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:anyAttribute namespace="##other" processContents="skip"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restsDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:element ref="tns:rest" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="keyManagersParametersFactoryBean"> <xs:complexContent> <xs:extension base="tns:abstractKeyManagersParametersFactoryBean"> @@ -3126,38 +3410,6 @@ </xs:complexContent> </xs:complexType> - <xs:simpleType name="exchangePattern"> - <xs:restriction base="xs:string"> - <xs:enumeration value="InOnly"/> - <xs:enumeration value="RobustInOnly"/> - <xs:enumeration value="InOut"/> - <xs:enumeration value="InOptionalOut"/> - <xs:enumeration value="OutOnly"/> - <xs:enumeration value="RobustOutOnly"/> - <xs:enumeration value="OutIn"/> - <xs:enumeration value="OutOptionalIn"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="loggingLevel"> - <xs:restriction base="xs:string"> - <xs:enumeration value="DEBUG"/> - <xs:enumeration value="ERROR"/> - <xs:enumeration value="INFO"/> - <xs:enumeration value="TRACE"/> - <xs:enumeration value="WARN"/> - <xs:enumeration value="OFF"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="managementStatisticsLevel"> - <xs:restriction base="xs:string"> - <xs:enumeration value="All"/> - <xs:enumeration value="RoutesOnly"/> - <xs:enumeration value="Off"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="shutdownRoute"> <xs:restriction base="xs:string"> <xs:enumeration value="Default"/> @@ -3167,17 +3419,28 @@ <xs:simpleType name="shutdownRunningTask"> <xs:restriction base="xs:string"> - <xs:enumeration value="CompleteCurrentTaskOnly"/> <xs:enumeration value="CompleteAllTasks"/> + <xs:enumeration value="CompleteCurrentTaskOnly"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="errorHandlerType"> <xs:restriction base="xs:string"> - <xs:enumeration value="DefaultErrorHandler"/> <xs:enumeration value="DeadLetterChannel"/> - <xs:enumeration value="LoggingErrorHandler"/> <xs:enumeration value="NoErrorHandler"/> + <xs:enumeration value="LoggingErrorHandler"/> + <xs:enumeration value="DefaultErrorHandler"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="loggingLevel"> + <xs:restriction base="xs:string"> + <xs:enumeration value="WARN"/> + <xs:enumeration value="ERROR"/> + <xs:enumeration value="OFF"/> + <xs:enumeration value="TRACE"/> + <xs:enumeration value="DEBUG"/> + <xs:enumeration value="INFO"/> </xs:restriction> </xs:simpleType> @@ -3185,25 +3448,62 @@ <xs:restriction base="xs:string"> <xs:enumeration value="Abort"/> <xs:enumeration value="CallerRuns"/> - <xs:enumeration value="DiscardOldest"/> <xs:enumeration value="Discard"/> + <xs:enumeration value="DiscardOldest"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="exchangePattern"> + <xs:restriction base="xs:string"> + <xs:enumeration value="InOut"/> + <xs:enumeration value="RobustOutOnly"/> + <xs:enumeration value="OutOnly"/> + <xs:enumeration value="InOnly"/> + <xs:enumeration value="OutOptionalIn"/> + <xs:enumeration value="InOptionalOut"/> + <xs:enumeration value="OutIn"/> + <xs:enumeration value="RobustInOnly"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="bindyType"> <xs:restriction base="xs:string"> - <xs:enumeration value="Csv"/> <xs:enumeration value="Fixed"/> + <xs:enumeration value="Csv"/> <xs:enumeration value="KeyValue"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="jsonLibrary"> <xs:restriction base="xs:string"> - <xs:enumeration value="XStream"/> <xs:enumeration value="Jackson"/> + <xs:enumeration value="XStream"/> <xs:enumeration value="Gson"/> </xs:restriction> </xs:simpleType> + + <xs:simpleType name="onCompletionMode"> + <xs:restriction base="xs:string"> + <xs:enumeration value="AfterConsumer"/> + <xs:enumeration value="BeforeConsumer"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="restHostNameResolver"> + <xs:restriction base="xs:string"> + <xs:enumeration value="localIp"/> + <xs:enumeration value="localHostName"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="restBindingMode"> + <xs:restriction base="xs:string"> + <xs:enumeration value="json"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="json_xml"/> + <xs:enumeration value="xml"/> + <xs:enumeration value="off"/> + </xs:restriction> + </xs:simpleType> </xs:schema> Modified: websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd ============================================================================== --- websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd (original) +++ websites/production/camel/content/schema/cxf/camel-cxf-blueprint.xsd Thu Feb 26 07:18:53 2015 @@ -59,6 +59,8 @@ <xsd:attribute name="serviceName" type="xsd:QName"/> <xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean"/> <xsd:attribute name="loggingSizeLimit" type="xsd:integer" /> + <xsd:attribute name="continuationTimeout" type="xsd:long" /> + <xsd:attribute name="publishedEndpointUrl" type="xsd:string" /> </xsd:extension> </xsd:complexContent> </xsd:complexType> Modified: websites/production/camel/content/schema/cxf/camel-cxf-spring.xsd ============================================================================== --- websites/production/camel/content/schema/cxf/camel-cxf-spring.xsd (original) +++ websites/production/camel/content/schema/cxf/camel-cxf-spring.xsd Thu Feb 26 07:18:53 2015 @@ -58,6 +58,8 @@ <xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean"/> <xsd:attribute name="loggingSizeLimit" type="xsd:integer" /> <xsd:attribute name="skipFaultLogging" type="xsd:boolean" /> + <xsd:attribute name="continuationTimeout" type="xsd:long" /> + <xsd:attribute name="publishedEndpointUrl" type="xsd:string" /> </xsd:extension> </xsd:complexContent> </xsd:complexType> Modified: websites/production/camel/content/schema/spring/camel-spring.xsd ============================================================================== --- websites/production/camel/content/schema/spring/camel-spring.xsd (original) +++ websites/production/camel/content/schema/spring/camel-spring.xsd Thu Feb 26 07:18:53 2015 @@ -7,6 +7,8 @@ <xs:element name="avro" type="tns:avroDataFormat"/> + <xs:element name="barcode" type="tns:barcodeDataFormat"/> + <xs:element name="base64" type="tns:base64DataFormat"/> <xs:element name="batchResequencerConfig" type="tns:batchResequencerConfig"/> @@ -25,6 +27,8 @@ <xs:element name="choice" type="tns:choiceDefinition"/> + <xs:element name="circuitBreaker" type="tns:circuitBreakerLoadBalancerDefinition"/> + <xs:element name="constant" type="tns:constantExpression"/> <xs:element name="consumerTemplate" type="tns:camelConsumerTemplateFactoryBean"/> @@ -45,6 +49,8 @@ <xs:element name="delay" type="tns:delayDefinition"/> + <xs:element name="delete" type="tns:deleteVerbDefinition"/> + <xs:element name="description" type="tns:descriptionDefinition"/> <xs:element name="doCatch" type="tns:catchDefinition"/> @@ -77,10 +83,14 @@ <xs:element name="from" type="tns:fromDefinition"/> + <xs:element name="get" type="tns:getVerbDefinition"/> + <xs:element name="groovy" type="tns:groovyExpression"/> <xs:element name="gzip" type="tns:gzipDataFormat"/> + <xs:element name="head" type="tns:headVerbDefinition"/> + <xs:element name="header" type="tns:headerExpression"/> <xs:element name="hl7" type="tns:hl7DataFormat"/> @@ -151,10 +161,14 @@ <xs:element name="pollEnrich" type="tns:pollEnrichDefinition"/> + <xs:element name="post" type="tns:postVerbDefinition"/> + <xs:element name="process" type="tns:processDefinition"/> <xs:element name="properties" type="tns:propertiesDefinition"/> + <xs:element name="propertiesFunction" type="tns:camelPropertyPlaceholderFunctionDefinition"/> + <xs:element name="property" nillable="true" type="xs:anyType"/> <xs:element name="propertyPlaceholder" type="tns:camelPropertyPlaceholderDefinition"/> @@ -163,6 +177,8 @@ <xs:element name="proxy" type="tns:camelProxyFactoryDefinition"/> + <xs:element name="put" type="tns:putVerbDefinition"/> + <xs:element name="python" type="tns:pythonExpression"/> <xs:element name="random" type="tns:randomLoadBalancerDefinition"/> @@ -183,6 +199,20 @@ <xs:element name="resequence" type="tns:resequenceDefinition"/> + <xs:element name="rest" type="tns:restDefinition"/> + + <xs:element name="restBinding" type="tns:restBindingDefinition"/> + + <xs:element name="restConfiguration" type="tns:restConfigurationDefinition"/> + + <xs:element name="restContext" type="tns:camelRestContextFactoryBean"/> + + <xs:element name="restContextRef" type="tns:restContextRefDefinition"/> + + <xs:element name="restProperty" type="tns:restPropertyDefinition"/> + + <xs:element name="rests" type="tns:restsDefinition"/> + <xs:element name="rollback" type="tns:rollbackDefinition"/> <xs:element name="roundRobin" type="tns:roundRobinLoadBalancerDefinition"/> @@ -277,6 +307,8 @@ <xs:element name="validate" type="tns:validateDefinition"/> + <xs:element name="verb" type="tns:verbDefinition"/> + <xs:element name="vtdxml" type="tns:vtdXmlExpression"/> <xs:element name="weighted" type="tns:weightedLoadBalancerDefinition"/> @@ -297,6 +329,8 @@ <xs:element name="xstream" type="tns:xStreamDataFormat"/> + <xs:element name="xtokenize" type="tns:xmlTokenizerExpression"/> + <xs:element name="zip" type="tns:zipDataFormat"/> <xs:element name="zipFile" type="tns:zipFileDataFormat"/> @@ -422,7 +456,9 @@ <xs:complexType name="camelPropertyPlaceholderDefinition"> <xs:complexContent> <xs:extension base="tns:identifiedType"> - <xs:sequence/> + <xs:sequence> + <xs:element ref="tns:propertiesFunction" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> <xs:attribute name="location" type="xs:string" use="required"/> <xs:attribute name="cache" type="xs:boolean"/> <xs:attribute name="ignoreMissingLocation" type="xs:boolean"/> @@ -437,6 +473,15 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="camelPropertyPlaceholderFunctionDefinition"> + <xs:complexContent> + <xs:extension base="tns:identifiedType"> + <xs:sequence/> + <xs:attribute name="ref" type="xs:string" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="camelProxyFactoryDefinition"> <xs:complexContent> <xs:extension base="tns:identifiedType"> @@ -629,6 +674,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -734,6 +780,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="parallelProcessing" type="xs:boolean"/> @@ -783,6 +830,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -814,6 +862,7 @@ <xs:attribute name="method" type="xs:string"/> <xs:attribute name="beanType" type="xs:string"/> <xs:attribute name="cache" type="xs:boolean"/> + <xs:attribute name="multiParameterArray" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -894,6 +943,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -937,6 +987,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -999,6 +1050,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -1098,6 +1150,7 @@ <xs:attribute name="strategyRef" type="xs:string"/> <xs:attribute name="strategyMethodName" type="xs:string"/> <xs:attribute name="strategyMethodAllowNull" type="xs:boolean"/> + <xs:attribute name="aggregateOnException" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -1219,6 +1272,7 @@ <xs:element ref="tns:sticky"/> <xs:element ref="tns:topic"/> <xs:element ref="tns:weighted"/> + <xs:element ref="tns:circuitBreaker"/> </xs:choice> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="tns:aop"/> @@ -1279,6 +1333,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="ref" type="xs:string"/> @@ -1361,6 +1416,18 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="circuitBreakerLoadBalancerDefinition"> + <xs:complexContent> + <xs:extension base="tns:loadBalancer"> + <xs:sequence> + <xs:element name="exception" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="halfOpenAfter" type="xs:long"/> + <xs:attribute name="threshold" type="xs:int"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="logDefinition"> <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> @@ -1369,6 +1436,7 @@ <xs:attribute name="loggingLevel" type="tns:loggingLevel"/> <xs:attribute name="logName" type="xs:string"/> <xs:attribute name="marker" type="xs:string"/> + <xs:attribute name="loggerRef" type="xs:string"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -1542,6 +1610,14 @@ <xs:complexContent> <xs:extension base="tns:dataFormat"> <xs:sequence/> + <xs:attribute name="parserFactoryRef" type="xs:string"/> + <xs:attribute name="definition" type="xs:string"/> + <xs:attribute name="fixed" type="xs:boolean"/> + <xs:attribute name="ignoreFirstRecord" type="xs:boolean"/> + <xs:attribute name="textQualifier" type="xs:string"/> + <xs:attribute name="delimiter" type="xs:string"/> + <xs:attribute name="allowShortLines" type="xs:boolean"/> + <xs:attribute name="ignoreExtraColumns" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1571,6 +1647,7 @@ <xs:attribute name="schema" type="xs:string"/> <xs:attribute name="prettyPrint" type="xs:boolean"/> <xs:attribute name="ignoreJAXBElement" type="xs:boolean"/> + <xs:attribute name="mustBeJAXBElement" type="xs:boolean"/> <xs:attribute name="filterNonXmlChars" type="xs:boolean"/> <xs:attribute name="encoding" type="xs:string"/> <xs:attribute name="fragment" type="xs:boolean"/> @@ -1578,6 +1655,7 @@ <xs:attribute name="partNamespace" type="xs:string"/> <xs:attribute name="namespacePrefixRef" type="xs:string"/> <xs:attribute name="xmlStreamWriterWrapper" type="xs:string"/> + <xs:attribute name="schemaLocation" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1600,6 +1678,10 @@ <xs:attribute name="library" type="tns:jsonLibrary"/> <xs:attribute name="unmarshalTypeName" type="xs:string"/> <xs:attribute name="jsonView" type="xs:string"/> + <xs:attribute name="include" type="xs:string"/> + <xs:attribute name="allowJmsType" type="xs:boolean"/> + <xs:attribute name="collectionTypeName" type="xs:string"/> + <xs:attribute name="useList" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1635,6 +1717,7 @@ <xs:attribute name="keyPassword" type="xs:string"/> <xs:attribute name="digestAlgorithm" type="xs:string"/> <xs:attribute name="mgfAlgorithm" type="xs:string"/> + <xs:attribute name="addKeyValueForEncryptedKey" type="xs:boolean"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1656,6 +1739,7 @@ <xs:attribute name="elementNameStrategyRef" type="xs:string"/> <xs:attribute name="version" type="xs:string"/> <xs:attribute name="namespacePrefixRef" type="xs:string"/> + <xs:attribute name="schema" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1740,6 +1824,7 @@ <xs:attribute name="encoding" type="xs:string"/> <xs:attribute name="driver" type="xs:string"/> <xs:attribute name="driverRef" type="xs:string"/> + <xs:attribute name="mode" type="xs:string"/> </xs:extension> </xs:complexContent> </xs:complexType> @@ -1843,6 +1928,7 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -1912,10 +1998,13 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> + <xs:attribute name="mode" type="tns:onCompletionMode"/> <xs:attribute name="onCompleteOnly" type="xs:boolean"/> <xs:attribute name="onFailureOnly" type="xs:boolean"/> + <xs:attribute name="parallelProcessing" type="xs:boolean"/> <xs:attribute name="executorServiceRef" type="xs:string"/> <xs:attribute name="useOriginalMessage" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -1992,6 +2081,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="redeliveryPolicyRef" type="xs:string"/> @@ -2063,6 +2153,7 @@ <xs:attribute name="strategyRef" type="xs:string"/> <xs:attribute name="strategyMethodName" type="xs:string"/> <xs:attribute name="strategyMethodAllowNull" type="xs:boolean"/> + <xs:attribute name="aggregateOnException" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2098,6 +2189,8 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="cacheSize" type="xs:int"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2165,6 +2258,7 @@ <xs:element ref="tns:sql"/> <xs:element ref="tns:tokenize"/> <xs:element ref="tns:vtdxml"/> + <xs:element ref="tns:xtokenize"/> <xs:element ref="tns:xpath"/> <xs:element ref="tns:xquery"/> </xs:choice> @@ -2227,6 +2321,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="skip"/> @@ -2264,6 +2359,15 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="restContextRefDefinition"> + <xs:sequence/> + <xs:attribute name="ref" type="xs:string" use="required"/> + </xs:complexType> + + <xs:complexType name="restContextRefDefinitionHelper" final="extension restriction"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="rollbackDefinition"> <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> @@ -2358,6 +2462,7 @@ <xs:element ref="tns:unmarshal"/> <xs:element ref="tns:validate"/> <xs:element ref="tns:wireTap"/> + <xs:element ref="tns:restBinding"/> </xs:choice> </xs:sequence> <xs:attribute name="autoStartup" type="xs:string"/> @@ -2366,6 +2471,7 @@ <xs:attribute name="group" type="xs:string"/> <xs:attribute name="handleFault" type="xs:string"/> <xs:attribute name="messageHistory" type="xs:string"/> + <xs:attribute name="rest" type="xs:boolean"/> <xs:attribute name="routePolicyRef" type="xs:string"/> <xs:attribute name="shutdownRoute" type="tns:shutdownRoute"/> <xs:attribute name="shutdownRunningTask" type="tns:shutdownRunningTask"/> @@ -2397,6 +2503,7 @@ <xs:sequence/> <xs:attribute name="uriDelimiter" type="xs:string"/> <xs:attribute name="ignoreInvalidEndpoints" type="xs:boolean"/> + <xs:attribute name="cacheSize" type="xs:int"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2496,6 +2603,7 @@ <xs:attribute name="timeout" type="xs:long"/> <xs:attribute name="onPrepareRef" type="xs:string"/> <xs:attribute name="shareUnitOfWork" type="xs:boolean"/> + <xs:attribute name="parallelAggregate" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2552,6 +2660,7 @@ <xs:attribute name="timePeriodMillis" type="xs:long"/> <xs:attribute name="asyncDelayed" type="xs:boolean"/> <xs:attribute name="callerRunsWhenRejected" type="xs:boolean"/> + <xs:attribute name="rejectExecution" type="xs:boolean"/> <xs:anyAttribute namespace="##other" processContents="skip"/> </xs:extension> </xs:complexContent> @@ -2695,10 +2804,23 @@ <xs:attribute name="value" type="xs:string" use="required"/> </xs:complexType> + <xs:complexType name="barcodeDataFormat"> + <xs:complexContent> + <xs:extension base="tns:dataFormat"> + <xs:sequence/> + <xs:attribute name="width" type="xs:int"/> + <xs:attribute name="height" type="xs:int"/> + <xs:attribute name="imageType" type="xs:string"/> + <xs:attribute name="barcodeFormat" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="dataFormatsDefinition"> <xs:sequence> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="tns:avro"/> + <xs:element ref="tns:barcode"/> <xs:element ref="tns:base64"/> <xs:element ref="tns:beanio"/> <xs:element ref="tns:bindy"/> @@ -2885,6 +3007,16 @@ </xs:simpleContent> </xs:complexType> + <xs:complexType name="xmlTokenizerExpression"> + <xs:simpleContent> + <xs:extension base="tns:namespaceAwareExpression"> + <xs:attribute name="headerName" type="xs:string"/> + <xs:attribute name="mode" type="xs:string"/> + <xs:attribute name="group" type="xs:int"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:complexType name="xPathExpression"> <xs:simpleContent> <xs:extension base="tns:namespaceAwareExpression"> @@ -2907,6 +3039,144 @@ </xs:simpleContent> </xs:complexType> + <xs:complexType name="deleteVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="verbDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:choice minOccurs="0"> + <xs:element ref="tns:to"/> + <xs:element ref="tns:route"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="method" type="xs:string"/> + <xs:attribute name="uri" type="xs:string"/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:attribute name="type" type="xs:string"/> + <xs:attribute name="outType" type="xs:string"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="getVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="headVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="postVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="putVerbDefinition"> + <xs:complexContent> + <xs:extension base="tns:verbDefinition"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restBindingDefinition"> + <xs:complexContent> + <xs:extension base="tns:noOutputDefinition"> + <xs:sequence/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="type" type="xs:string"/> + <xs:attribute name="outType" type="xs:string"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:anyAttribute namespace="##other" processContents="skip"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restConfigurationDefinition"> + <xs:sequence> + <xs:element name="componentProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="endpointProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="consumerProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="dataFormatProperty" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="corsHeaders" type="tns:restPropertyDefinition" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="component" type="xs:string"/> + <xs:attribute name="scheme" type="xs:string"/> + <xs:attribute name="host" type="xs:string"/> + <xs:attribute name="port" type="xs:string"/> + <xs:attribute name="contextPath" type="xs:string"/> + <xs:attribute name="hostNameResolver" type="tns:restHostNameResolver"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + <xs:attribute name="jsonDataFormat" type="xs:string"/> + <xs:attribute name="xmlDataFormat" type="xs:string"/> + </xs:complexType> + + <xs:complexType name="restPropertyDefinition"> + <xs:sequence/> + <xs:attribute name="key" type="xs:string" use="required"/> + <xs:attribute name="value" type="xs:string" use="required"/> + </xs:complexType> + + <xs:complexType name="restDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="tns:verb"/> + <xs:element ref="tns:delete"/> + <xs:element ref="tns:get"/> + <xs:element ref="tns:head"/> + <xs:element ref="tns:post"/> + <xs:element ref="tns:put"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="path" type="xs:string"/> + <xs:attribute name="consumes" type="xs:string"/> + <xs:attribute name="produces" type="xs:string"/> + <xs:attribute name="bindingMode" type="tns:restBindingMode"/> + <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean"/> + <xs:attribute name="enableCORS" type="xs:boolean"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="restsDefinition"> + <xs:complexContent> + <xs:extension base="tns:optionalIdentifiedDefinition"> + <xs:sequence> + <xs:element ref="tns:rest" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="camelBeanPostProcessor"> <xs:sequence/> </xs:complexType> @@ -2939,6 +3209,7 @@ </xs:choice> <xs:element ref="tns:routeBuilder" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:routeContextRef" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="tns:restContextRef" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:threadPoolProfile" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:threadPool" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:endpoint" minOccurs="0" maxOccurs="unbounded"/> @@ -2949,6 +3220,8 @@ <xs:element ref="tns:intercept" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:interceptFrom" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="interceptSendToEndpoint" type="tns:interceptSendToEndpointDefinition" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="tns:restConfiguration" minOccurs="0"/> + <xs:element ref="tns:rest" minOccurs="0" maxOccurs="unbounded"/> <xs:element ref="tns:route" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="depends-on" type="xs:string"/> @@ -2963,6 +3236,7 @@ <xs:attribute name="useMDCLogging" type="xs:string"/> <xs:attribute name="useBreadcrumb" type="xs:string"/> <xs:attribute name="allowUseOriginalMessage" type="xs:string"/> + <xs:attribute name="runtimeEndpointRegistryEnabled" type="xs:string"/> <xs:attribute name="managementNamePattern" type="xs:string"/> <xs:attribute name="threadNamePattern" type="xs:string"/> <xs:attribute name="shutdownRoute" type="tns:shutdownRoute"/> @@ -3027,6 +3301,16 @@ </xs:complexContent> </xs:complexType> + <xs:complexType name="camelRestContextFactoryBean"> + <xs:complexContent> + <xs:extension base="tns:identifiedType"> + <xs:sequence> + <xs:element ref="tns:rest" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="camelRouteContextFactoryBean"> <xs:complexContent> <xs:extension base="tns:identifiedType"> @@ -3128,88 +3412,96 @@ <xs:restriction base="xs:string"> <xs:enumeration value="InOnly"/> <xs:enumeration value="RobustInOnly"/> - <xs:enumeration value="InOut"/> + <xs:enumeration value="OutOptionalIn"/> + <xs:enumeration value="OutIn"/> + <xs:enumeration value="RobustOutOnly"/> <xs:enumeration value="InOptionalOut"/> <xs:enumeration value="OutOnly"/> - <xs:enumeration value="RobustOutOnly"/> - <xs:enumeration value="OutIn"/> - <xs:enumeration value="OutOptionalIn"/> + <xs:enumeration value="InOut"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="loggingLevel"> <xs:restriction base="xs:string"> - <xs:enumeration value="DEBUG"/> - <xs:enumeration value="ERROR"/> <xs:enumeration value="INFO"/> <xs:enumeration value="TRACE"/> - <xs:enumeration value="WARN"/> + <xs:enumeration value="DEBUG"/> <xs:enumeration value="OFF"/> + <xs:enumeration value="ERROR"/> + <xs:enumeration value="WARN"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="managementStatisticsLevel"> + <xs:simpleType name="threadPoolRejectedPolicy"> <xs:restriction base="xs:string"> - <xs:enumeration value="All"/> - <xs:enumeration value="RoutesOnly"/> - <xs:enumeration value="Off"/> + <xs:enumeration value="DiscardOldest"/> + <xs:enumeration value="CallerRuns"/> + <xs:enumeration value="Abort"/> + <xs:enumeration value="Discard"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="shutdownRoute"> + <xs:simpleType name="bindyType"> <xs:restriction base="xs:string"> - <xs:enumeration value="Default"/> - <xs:enumeration value="Defer"/> + <xs:enumeration value="Csv"/> + <xs:enumeration value="KeyValue"/> + <xs:enumeration value="Fixed"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="shutdownRunningTask"> + <xs:simpleType name="jsonLibrary"> <xs:restriction base="xs:string"> - <xs:enumeration value="CompleteCurrentTaskOnly"/> - <xs:enumeration value="CompleteAllTasks"/> + <xs:enumeration value="XStream"/> + <xs:enumeration value="Jackson"/> + <xs:enumeration value="Gson"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="threadPoolRejectedPolicy"> + <xs:simpleType name="onCompletionMode"> <xs:restriction base="xs:string"> - <xs:enumeration value="Abort"/> - <xs:enumeration value="CallerRuns"/> - <xs:enumeration value="DiscardOldest"/> - <xs:enumeration value="Discard"/> + <xs:enumeration value="BeforeConsumer"/> + <xs:enumeration value="AfterConsumer"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="waitForTaskToComplete"> + <xs:simpleType name="shutdownRoute"> <xs:restriction base="xs:string"> - <xs:enumeration value="Never"/> - <xs:enumeration value="IfReplyExpected"/> - <xs:enumeration value="Always"/> + <xs:enumeration value="Defer"/> + <xs:enumeration value="Default"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="bindyType"> + <xs:simpleType name="shutdownRunningTask"> <xs:restriction base="xs:string"> - <xs:enumeration value="Csv"/> - <xs:enumeration value="Fixed"/> - <xs:enumeration value="KeyValue"/> + <xs:enumeration value="CompleteAllTasks"/> + <xs:enumeration value="CompleteCurrentTaskOnly"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="jsonLibrary"> + <xs:simpleType name="restBindingMode"> <xs:restriction base="xs:string"> - <xs:enumeration value="XStream"/> - <xs:enumeration value="Jackson"/> - <xs:enumeration value="Gson"/> + <xs:enumeration value="xml"/> + <xs:enumeration value="json_xml"/> + <xs:enumeration value="auto"/> + <xs:enumeration value="json"/> + <xs:enumeration value="off"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="restHostNameResolver"> + <xs:restriction base="xs:string"> + <xs:enumeration value="localHostName"/> + <xs:enumeration value="localIp"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="errorHandlerType"> <xs:restriction base="xs:string"> - <xs:enumeration value="DefaultErrorHandler"/> + <xs:enumeration value="TransactionErrorHandler"/> + <xs:enumeration value="NoErrorHandler"/> <xs:enumeration value="DeadLetterChannel"/> <xs:enumeration value="LoggingErrorHandler"/> - <xs:enumeration value="NoErrorHandler"/> - <xs:enumeration value="TransactionErrorHandler"/> + <xs:enumeration value="DefaultErrorHandler"/> </xs:restriction> </xs:simpleType> </xs:schema>