cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r909425 - in /websites/production/cxf/content/schemas: blueprint/jaxrs-client.xsd blueprint/jaxrs-common.xsd blueprint/jaxrs.xsd jaxrs-client.xsd jaxrs-common.xsd jaxrs.xsd
Date Tue, 20 May 2014 16:15:46 GMT
Author: sergeyb
Date: Tue May 20 16:15:46 2014
New Revision: 909425

Log:
Updating JAXRS schemas for 3.0

Added:
    websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd   (with props)
    websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd   (with props)
    websites/production/cxf/content/schemas/jaxrs-client.xsd   (with props)
    websites/production/cxf/content/schemas/jaxrs-common.xsd   (with props)
Modified:
    websites/production/cxf/content/schemas/blueprint/jaxrs.xsd
    websites/production/cxf/content/schemas/jaxrs.xsd

Added: websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd
==============================================================================
--- websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd (added)
+++ websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd Tue May 20 16:15:46
2014
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<xsd:schema xmlns="http://cxf.apache.org/blueprint/jaxrs-client"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  targetNamespace="http://cxf.apache.org/blueprint/jaxrs-client"
+  xmlns:tns="http://cxf.apache.org/blueprint/jaxrs-client" 
+  xmlns:jaxrs-common="http://cxf.apache.org/blueprint/jaxrs"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified"  >
+
+  <xsd:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0" schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/blueprint/jaxrs" schemaLocation="http://cxf.apache.org/schemas/jaxrs-common.xsd"/>
+  <xsd:element name="client">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:Tcomponent">
+          <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="dataBinding" 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="outInterceptors" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
+            <xsd:element name="properties" type="beans:Tmap" 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="jaxrs-common:model" minOccurs="0"/>
+            <xsd:element name="headers" type="xsd:anyType" minOccurs="0"/> 
+            <xsd:element name="schemaLocations" type="jaxrs-common:schemasType" minOccurs="0"/>
+          </xsd:all>
+          <!-- xsd:attributeGroup ref="cxf-beans:beanAttributes"/-->
+          <xsd:attribute name="address" type="xsd:string" />
+          <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:attribute name="serviceName" type="xsd:QName"/>
+          <xsd:attribute name="threadSafe" type="xsd:boolean"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd
==============================================================================
--- websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd (added)
+++ websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd Tue May 20 16:15:46
2014
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<xsd:schema xmlns="http://cxf.apache.org/blueprint/jaxrs"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  targetNamespace="http://cxf.apache.org/blueprint/jaxrs"
+  xmlns:tns="http://cxf.apache.org/blueprint/jaxrs" 
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  <xsd:complexType name="schemasType">
+    <xsd:sequence>
+      <xsd:element name="schemaLocation" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name="model" type="tns:model"/>
+  
+  <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">
+                                 <xsd:simpleType>
+                                   <xsd:restriction base="xsd:string">
+                                     <xsd:enumeration value="PATH"/>
+                                     <xsd:enumeration value="QUERY"/>
+                                     <xsd:enumeration value="MATRIX"/>
+                                     <xsd:enumeration value="HEADER"/>
+                                     <xsd:enumeration value="COOKIE"/>
+                                     <xsd:enumeration value="FORM"/>
+                                     <xsd:enumeration value="CONTEXT"/>
+                                     <xsd:enumeration value="REQUEST_BODY"/>
+                                   </xsd:restriction>
+                                 </xsd:simpleType>
+                              </xsd:attribute>
+                              <xsd:attribute name="defaultValue" type="xsd:string"/>
+                              <xsd:attribute name="encoded" type="xsd:boolean"/>
+                           </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:attribute name="oneway" type="xsd:boolean"/>
+                    </xsd:complexType>
+                 </xsd:element>
+             </xsd:sequence>
+             <xsd:attribute name="name" type="xsd:string"/>
+             <xsd:attribute name="path" 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="id" type="xsd:string"/>
+  </xsd:complexType>
+  
+</xsd:schema>

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: websites/production/cxf/content/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: websites/production/cxf/content/schemas/blueprint/jaxrs.xsd
==============================================================================
--- websites/production/cxf/content/schemas/blueprint/jaxrs.xsd (original)
+++ websites/production/cxf/content/schemas/blueprint/jaxrs.xsd Tue May 20 16:15:46 2014
@@ -29,6 +29,7 @@
 
   <xsd:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0" schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
   <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+  <xsd:include schemaLocation="jaxrs-common.xsd"/>
   
   <xsd:element name="server">
     <xsd:complexType>
@@ -47,12 +48,13 @@
             <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
             <xsd:element name="properties" type="beans:Tmap" minOccurs="0"/>
             <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>   
        
+            <xsd:element name="resourceClasses" 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="model" type="tns: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"/>
-            <xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/>
+            <xsd:element name="schemaLocations" type="tns:schemasType" minOccurs="0"/>
             <xsd:element name="resourceComparator" type="xsd:anyType" minOccurs="0"/>

           </xsd:all>
           <!-- xsd:attributeGroup ref="cxf-beans:beanAttributes"/-->
@@ -72,98 +74,5 @@
     </xsd:complexType>
   </xsd:element>
   
-  <xsd:element name="client">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="beans:Tcomponent">
-          <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="dataBinding" 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="outInterceptors" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
-            <xsd:element name="properties" type="beans:Tmap" 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>
-          <!-- xsd:attributeGroup ref="cxf-beans:beanAttributes"/-->
-          <xsd:attribute name="address" type="xsd:string" />
-          <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:attribute name="serviceName" type="xsd:QName"/>
-          <xsd:attribute name="threadSafe" type="xsd:boolean"/>
-        </xsd:extension>
-      </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:element name="model" type="tns:model"/>
-  
-  <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">
-                                 <xsd:simpleType>
-                                   <xsd:restriction base="xsd:string">
-                                     <xsd:enumeration value="PATH"/>
-                                     <xsd:enumeration value="QUERY"/>
-                                     <xsd:enumeration value="MATRIX"/>
-                                     <xsd:enumeration value="HEADER"/>
-                                     <xsd:enumeration value="COOKIE"/>
-                                     <xsd:enumeration value="FORM"/>
-                                     <xsd:enumeration value="CONTEXT"/>
-                                     <xsd:enumeration value="REQUEST_BODY"/>
-                                   </xsd:restriction>
-                                 </xsd:simpleType>
-                              </xsd:attribute>
-                              <xsd:attribute name="defaultValue" type="xsd:string"/>
-                              <xsd:attribute name="encoded" type="xsd:boolean"/>
-                           </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:attribute name="oneway" type="xsd:boolean"/>
-                    </xsd:complexType>
-                 </xsd:element>
-             </xsd:sequence>
-             <xsd:attribute name="name" type="xsd:string"/>
-             <xsd:attribute name="path" 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="id" type="xsd:string"/>
-  </xsd:complexType>
   
 </xsd:schema>

Added: websites/production/cxf/content/schemas/jaxrs-client.xsd
==============================================================================
--- websites/production/cxf/content/schemas/jaxrs-client.xsd (added)
+++ websites/production/cxf/content/schemas/jaxrs-client.xsd Tue May 20 16:15:46 2014
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<xsd:schema xmlns="http://cxf.apache.org/jaxrs-client"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  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"
+  xmlns:jaxrs-common="http://cxf.apache.org/jaxrs"
+  targetNamespace="http://cxf.apache.org/jaxrs-client"
+  xmlns:tns="http://cxf.apache.org/jaxrs-client" 
+  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:import namespace="http://cxf.apache.org/jaxrs" schemaLocation="http://cxf.apache.org/schemas/jaxrs-common.xsd"/>
+  
+  <xsd:element name="client">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:identifiedType">
+          <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="dataBinding" 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="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="jaxrs-common:model" minOccurs="0"/>
+            <xsd:element name="headers" type="xsd:anyType" minOccurs="0"/> 
+            <xsd:element name="schemaLocations" type="jaxrs-common:schemasType" minOccurs="0"/>
+          </xsd:all>
+          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
+          <xsd:attribute name="address" type="xsd:string" />
+          <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:attribute name="serviceName" type="xsd:QName"/>
+          <xsd:attribute name="threadSafe" type="xsd:boolean"/>
+          <xsd:attribute name="basePackages" type="xsd:string"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  
+</xsd:schema>

Propchange: websites/production/cxf/content/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: websites/production/cxf/content/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: websites/production/cxf/content/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: websites/production/cxf/content/schemas/jaxrs-common.xsd
==============================================================================
--- websites/production/cxf/content/schemas/jaxrs-common.xsd (added)
+++ websites/production/cxf/content/schemas/jaxrs-common.xsd Tue May 20 16:15:46 2014
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<xsd:schema xmlns="http://cxf.apache.org/jaxrs"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  targetNamespace="http://cxf.apache.org/jaxrs"
+  xmlns:tns="http://cxf.apache.org/jaxrs" 
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  <xsd:complexType name="schemasType">
+    <xsd:sequence>
+      <xsd:element name="schemaLocation" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name="model" type="tns:model"/>
+  
+  <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">
+                                 <xsd:simpleType>
+                                   <xsd:restriction base="xsd:string">
+                                     <xsd:enumeration value="PATH"/>
+                                     <xsd:enumeration value="QUERY"/>
+                                     <xsd:enumeration value="MATRIX"/>
+                                     <xsd:enumeration value="HEADER"/>
+                                     <xsd:enumeration value="COOKIE"/>
+                                     <xsd:enumeration value="FORM"/>
+                                     <xsd:enumeration value="CONTEXT"/>
+                                     <xsd:enumeration value="REQUEST_BODY"/>
+                                   </xsd:restriction>
+                                 </xsd:simpleType>
+                              </xsd:attribute>
+                              <xsd:attribute name="defaultValue" type="xsd:string"/>
+                              <xsd:attribute name="encoded" type="xsd:boolean"/>
+                           </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:attribute name="oneway" type="xsd:boolean"/>
+                    </xsd:complexType>
+                 </xsd:element>
+             </xsd:sequence>
+             <xsd:attribute name="name" type="xsd:string"/>
+             <xsd:attribute name="path" 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="id" type="xsd:string"/>
+  </xsd:complexType>
+  
+</xsd:schema>

Propchange: websites/production/cxf/content/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: websites/production/cxf/content/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: websites/production/cxf/content/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: websites/production/cxf/content/schemas/jaxrs.xsd
==============================================================================
--- websites/production/cxf/content/schemas/jaxrs.xsd (original)
+++ websites/production/cxf/content/schemas/jaxrs.xsd Tue May 20 16:15:46 2014
@@ -29,6 +29,7 @@
 
   <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:include schemaLocation="http://cxf.apache.org/schemas/jaxrs-common.xsd"/>
   
   <xsd:element name="server">
     <xsd:complexType>
@@ -67,103 +68,9 @@
           <xsd:attribute name="serviceName" type="xsd:QName"/>
           <xsd:attribute name="docLocation" type="xsd:string"/>
           <xsd:attribute name="publishedEndpointUrl" type="xsd:string"/>
+          <xsd:attribute name="basePackages" type="xsd:string"/>
         </xsd:extension>
       </xsd:complexContent>
     </xsd:complexType>
   </xsd:element>
-  
-  <xsd:element name="client">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="beans:identifiedType">
-          <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="dataBinding" 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="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>
-          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
-          <xsd:attribute name="address" type="xsd:string" />
-          <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:attribute name="serviceName" type="xsd:QName"/>
-          <xsd:attribute name="threadSafe" type="xsd:boolean"/>
-        </xsd:extension>
-      </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:element name="model" type="tns:model"/>
-  
-  <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">
-                                 <xsd:simpleType>
-                                   <xsd:restriction base="xsd:string">
-                                     <xsd:enumeration value="PATH"/>
-                                     <xsd:enumeration value="QUERY"/>
-                                     <xsd:enumeration value="MATRIX"/>
-                                     <xsd:enumeration value="HEADER"/>
-                                     <xsd:enumeration value="COOKIE"/>
-                                     <xsd:enumeration value="FORM"/>
-                                     <xsd:enumeration value="CONTEXT"/>
-                                     <xsd:enumeration value="REQUEST_BODY"/>
-                                   </xsd:restriction>
-                                 </xsd:simpleType>
-                              </xsd:attribute>
-                              <xsd:attribute name="defaultValue" type="xsd:string"/>
-                              <xsd:attribute name="encoded" type="xsd:boolean"/>
-                           </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:attribute name="oneway" type="xsd:boolean"/>
-                    </xsd:complexType>
-                 </xsd:element>
-             </xsd:sequence>
-             <xsd:attribute name="name" type="xsd:string"/>
-             <xsd:attribute name="path" 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="id" type="xsd:string"/>
-  </xsd:complexType>
-  
 </xsd:schema>



Mime
View raw message