cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1443066 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/ rt/frontend...
Date Wed, 06 Feb 2013 16:55:20 GMT
Author: sergeyb
Date: Wed Feb  6 16:55:20 2013
New Revision: 1443066

URL: http://svn.apache.org/viewvc?rev=1443066&view=rev
Log:
[CXF-4696] Moving jaxrs:client schema element into its own schema

Added:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java
      - copied, changed from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSClientFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
      - copied, changed from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd   (with props)
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
      - copied, changed from r1442914, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java
Removed:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSClientFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java
Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/NamespaceHandler.java
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd
    cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java Wed Feb  6 16:55:20 2013
@@ -49,9 +49,7 @@ public class JAXRSBPNamespaceHandler imp
         String s = element.getLocalName();
         if ("server".equals(s)) {
             return new JAXRSServerFactoryBeanDefinitionParser().parse(element, context);
-        } else if ("client".equals(s)) {
-            return new JAXRSClientFactoryBeanDefinitionParser().parse(element, context);
-        }
+        } 
         return null;
     }
 

Added: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java Wed Feb  6 16:55:20 2013
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.jaxrs.client.blueprint;
+
+import java.net.URL;
+import java.util.Set;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.apache.aries.blueprint.NamespaceHandler;
+import org.apache.aries.blueprint.ParserContext;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.Metadata;
+
+/**
+ * 
+ */
+public class JAXRSBPNamespaceHandler implements NamespaceHandler {
+    private BlueprintContainer blueprintContainer;
+    
+    public JAXRSBPNamespaceHandler() {
+    }
+    
+    public URL getSchemaLocation(String namespace) {
+        return getClass().getClassLoader().getResource("/schemas/blueprint/jaxrs-client.xsd");
+    }
+
+
+    public Metadata parse(Element element, ParserContext context) {
+        String s = element.getLocalName();
+        if ("client".equals(s)) {
+            return new JAXRSClientFactoryBeanDefinitionParser().parse(element, context);
+        }
+        return null;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public Set<Class> getManagedClasses() {
+        return null;
+    }
+    public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
+        return null;
+    }
+    
+
+    public BlueprintContainer getBlueprintContainer() {
+        return blueprintContainer;
+    }
+
+    public void setBlueprintContainer(BlueprintContainer blueprintContainer) {
+        this.blueprintContainer = blueprintContainer;
+    }
+    
+}

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java (from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSClientFactoryBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java&p1=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSClientFactoryBeanDefinitionParser.java&r1=1442914&r2=1443066&rev=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSClientFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java Wed Feb  6 16:55:20 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.blueprint;
+package org.apache.cxf.jaxrs.client.blueprint;
 
 import java.util.List;
 

Copied: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java (from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java&p1=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java&r1=1442914&r2=1443066&rev=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java Wed Feb  6 16:55:20 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.spring;
+package org.apache.cxf.jaxrs.client.spring;
 
 import java.util.List;
 import java.util.Map;

Added: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java Wed Feb  6 16:55:20 2013
@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.jaxrs.client.spring;
+
+import org.apache.cxf.configuration.spring.StringBeanDefinitionParser;
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+public class NamespaceHandler extends NamespaceHandlerSupport {
+    public void init() {
+        registerBeanDefinitionParser("client", new JAXRSClientFactoryBeanDefinitionParser());
+        registerBeanDefinitionParser("schemaLocation", new StringBeanDefinitionParser());    
+    }
+}

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/NamespaceHandler.java?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/NamespaceHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/NamespaceHandler.java Wed Feb  6 16:55:20 2013
@@ -23,7 +23,6 @@ import org.springframework.beans.factory
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
     public void init() {
-        registerBeanDefinitionParser("client", new JAXRSClientFactoryBeanDefinitionParser());
         registerBeanDefinitionParser("server", new JAXRSServerFactoryBeanDefinitionParser());        
         registerBeanDefinitionParser("schemaLocation", new StringBeanDefinitionParser());    
     }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers Wed Feb  6 16:55:20 2013
@@ -18,4 +18,5 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
\ No newline at end of file
+http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
+http\://cxf.apache.org/jaxrs-client=org.apache.cxf.jaxrs.client.spring.NamespaceHandler
\ No newline at end of file

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas Wed Feb  6 16:55:20 2013
@@ -18,4 +18,6 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/schemas/jaxrs.xsd=schemas/jaxrs.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/jaxrs-common.xsd=schemas/jaxrs-common.xsd
+http\://cxf.apache.org/schemas/jaxrs.xsd=schemas/jaxrs.xsd
+http\://cxf.apache.org/schemas/jaxrs-client.xsd=schemas/jaxrs-client.xsd
\ No newline at end of file

Added: cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml Wed Feb  6 16:55:20 2013
@@ -0,0 +1,31 @@
+<!--
+  ~ /**
+  ~  * 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.
+  ~  */
+  -->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+  <service interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/jaxrs-client"/>
+    </service-properties>
+    <bean class="org.apache.cxf.jaxrs.client.blueprint.JAXRSBPNamespaceHandler"/>
+  </service>
+</blueprint>
\ No newline at end of file

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd Wed Feb  6 16:55:20 2013
@@ -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: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd Wed Feb  6 16:55:20 2013
@@ -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: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs.xsd Wed Feb  6 16:55:20 2013
@@ -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="http://cxf.apache.org/schemas/jaxrs-common.xsd"/>
   
   <xsd:element name="server">
     <xsd:complexType>
@@ -72,98 +73,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: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd Wed Feb  6 16:55:20 2013
@@ -0,0 +1,72 @@
+<?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:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  
+</xsd:schema>

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd?rev=1443066&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd (added)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd Wed Feb  6 16:55:20 2013
@@ -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: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-common.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Wed Feb  6 16:55:20 2013
@@ -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>
@@ -71,99 +72,4 @@
       </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>

Copied: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java (from r1442914, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java?p2=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java&r1=1442914&r2=1443066&rev=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java Wed Feb  6 16:55:20 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.jaxrs.spring;
+package org.apache.cxf.jaxrs.client.spring;
 
 import javax.xml.namespace.QName;
 

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml Wed Feb  6 16:55:20 2013
@@ -19,12 +19,12 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+      xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
       xmlns:soap="http://cxf.apache.org/bindings/soap"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
-http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd">
   <import resource="classpath:META-INF/cxf/cxf.xml"/>
      
   <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false">

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml Wed Feb  6 16:55:20 2013
@@ -20,14 +20,14 @@ under the License.
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
        xmlns:cxf="http://cxf.apache.org/core"
        xmlns:sec="http://cxf.apache.org/configuration/security"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd
         http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd
-        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+        http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml Wed Feb  6 16:55:20 2013
@@ -20,14 +20,14 @@ under the License.
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs-client"
        xmlns:cxf="http://cxf.apache.org/core"
        xmlns:sec="http://cxf.apache.org/configuration/security"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd
         http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd
-        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+        http://cxf.apache.org/jaxrs-client http://cxf.apache.org/schemas/jaxrs-client.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml?rev=1443066&r1=1443065&r2=1443066&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml Wed Feb  6 16:55:20 2013
@@ -21,6 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+  xmlns:jaxrs-client="http://cxf.apache.org/jaxrs-client"
   xmlns:jaxws="http://cxf.apache.org/jaxws"
   xmlns:util="http://www.springframework.org/schema/util"
   xsi:schemaLocation="http://www.springframework.org/schema/beans 
@@ -30,7 +31,9 @@ http://www.springframework.org/schema/ut
 http://cxf.apache.org/jaxws
 http://cxf.apache.org/schemas/jaxws.xsd
 http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
+http://cxf.apache.org/schemas/jaxrs.xsd
+http://cxf.apache.org/jaxrs-client
+http://cxf.apache.org/schemas/jaxrs-client.xsd">
 
   <import resource="classpath:META-INF/cxf/cxf.xml" />
   <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
@@ -42,14 +45,14 @@ http://cxf.apache.org/schemas/jaxrs.xsd"
       <property name="enabled" value="true"/>
    </bean>
 
-  <jaxrs:client id="restClient"
+  <jaxrs-client:client id="restClient"
          address="http://localhost:${testutil.ports.BookServerRestSoap}/test/services/rest"
          serviceClass="org.apache.cxf.systest.jaxrs.jaxws.BookStoreJaxrsJaxws"
          inheritHeaders="true">
-         <jaxrs:headers>
+         <jaxrs-client:headers>
              <entry key="Accept" value="text/xml"/>
-         </jaxrs:headers>
-  </jaxrs:client>       
+         </jaxrs-client:headers>
+  </jaxrs-client:client>       
          
   <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.jaxws.BookStoreSoapRestImpl"/>
   <bean id="bookstore-simple" class="org.apache.cxf.systest.jaxrs.jaxws.BookStoreSoapRestImpl">



Mime
View raw message