You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/02/07 17:58:45 UTC
svn commit: r1443601 - in /cxf/trunk:
distribution/src/main/release/samples/jax_rs/basic_https/ osgi/bundle/all/
osgi/bundle/jaxrs/ osgi/bundle/minimal/
osgi/karaf/features/src/main/resources/ rt/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cl...
Author: sergeyb
Date: Thu Feb 7 16:58:44 2013
New Revision: 1443601
URL: http://svn.apache.org/viewvc?rev=1443601&view=rev
Log:
[CXF-4696] Moving JAXRS client code into its own module
Added:
cxf/trunk/rt/rs/client/
cxf/trunk/rt/rs/client/pom.xml (with props)
cxf/trunk/rt/rs/client/src/
cxf/trunk/rt/rs/client/src/main/
cxf/trunk/rt/rs/client/src/main/java/
cxf/trunk/rt/rs/client/src/main/java/org/
cxf/trunk/rt/rs/client/src/main/java/org/apache/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Client.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientMessageObserver.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientMessageObserver.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientState.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientState.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ResponseExceptionMapper.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ResponseExceptionMapper.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSBPNamespaceHandler.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/blueprint/JAXRSClientFactoryBeanDefinitionParser.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterInterceptor.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestFilterInterceptor.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseFilterInterceptor.java
- copied unchanged from r1442931, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseFilterInterceptor.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/spring/NamespaceHandler.java
cxf/trunk/rt/rs/client/src/main/resources/
cxf/trunk/rt/rs/client/src/main/resources/META-INF/
cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.handlers
cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.schemas
cxf/trunk/rt/rs/client/src/main/resources/OSGI-INF/
cxf/trunk/rt/rs/client/src/main/resources/OSGI-INF/blueprint/
cxf/trunk/rt/rs/client/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
cxf/trunk/rt/rs/client/src/main/resources/schemas/
cxf/trunk/rt/rs/client/src/main/resources/schemas/blueprint/
cxf/trunk/rt/rs/client/src/main/resources/schemas/blueprint/jaxrs-client.xsd
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
cxf/trunk/rt/rs/client/src/main/resources/schemas/jaxrs-client.xsd
- copied unchanged from r1443066, cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
cxf/trunk/rt/rs/client/src/test/
cxf/trunk/rt/rs/client/src/test/java/
cxf/trunk/rt/rs/client/src/test/java/org/
cxf/trunk/rt/rs/client/src/test/java/org/apache/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
- copied unchanged from r1443534, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
- copied, changed from r1443534, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/resources.xml
- copied unchanged from r1442914, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/resources.xml
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java (with props)
cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java (with props)
cxf/trunk/rt/rs/client/src/test/resources/
Removed:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/
cxf/trunk/rt/frontend/jaxrs/src/main/resources/OSGI-INF/blueprint/cxf-jaxrs-client.xml
cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/blueprint/jaxrs-client.xsd
cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs-client.xsd
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/
Modified:
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
cxf/trunk/osgi/bundle/all/pom.xml
cxf/trunk/osgi/bundle/jaxrs/pom.xml
cxf/trunk/osgi/bundle/minimal/pom.xml
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
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/management-web/pom.xml
cxf/trunk/rt/pom.xml
cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml
cxf/trunk/services/sts/systests/advanced/pom.xml
cxf/trunk/systests/jaxrs/pom.xml
cxf/trunk/systests/rs-security/pom.xml
cxf/trunk/systests/ws-security/pom.xml
Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Thu Feb 7 16:58:44 2013
@@ -102,6 +102,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Thu Feb 7 16:58:44 2013
@@ -261,6 +261,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/trunk/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/jaxrs/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/osgi/bundle/jaxrs/pom.xml Thu Feb 7 16:58:44 2013
@@ -69,6 +69,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/trunk/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/minimal/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/minimal/pom.xml (original)
+++ cxf/trunk/osgi/bundle/minimal/pom.xml Thu Feb 7 16:58:44 2013
@@ -137,6 +137,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Feb 7 16:58:44 2013
@@ -161,6 +161,7 @@
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
+ <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-client/${project.version}</bundle>
</feature>
<feature name="cxf-rs-security-xml" version="${project.version}" resolver='(obr)'>
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=1443601&r1=1443600&r2=1443601&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 Thu Feb 7 16:58:44 2013
@@ -19,4 +19,3 @@
#
#
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=1443601&r1=1443600&r2=1443601&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 Thu Feb 7 16:58:44 2013
@@ -20,4 +20,3 @@
#
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
Modified: cxf/trunk/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/pom.xml (original)
+++ cxf/trunk/rt/management-web/pom.xml Thu Feb 7 16:58:44 2013
@@ -122,6 +122,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${gwt.version}</version>
Modified: cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/rt/pom.xml (original)
+++ cxf/trunk/rt/pom.xml Thu Feb 7 16:58:44 2013
@@ -56,6 +56,7 @@
<module>ws/rm</module>
<module>ws/security</module>
<module>ws/mex</module>
+ <module>rs/client</module>
<module>rs/extensions/providers</module>
<module>rs/extensions/search</module>
<module>rs/security/xml</module>
Added: cxf/trunk/rt/rs/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/pom.xml?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/pom.xml (added)
+++ cxf/trunk/rt/rs/client/pom.xml Thu Feb 7 16:58:44 2013
@@ -0,0 +1,98 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <packaging>jar</packaging>
+ <version>2.8.0-SNAPSHOT</version>
+ <name>Apache CXF JAX-RS Client</name>
+ <description>Apache CXF JAX-RS Client</description>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.8.0-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/trunk/rt/rs/client/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/rt/rs/client/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.handlers?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.handlers (added)
+++ cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.handlers Thu Feb 7 16:58:44 2013
@@ -0,0 +1,21 @@
+#
+#
+# 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.
+#
+#
+http\://cxf.apache.org/jaxrs-client=org.apache.cxf.jaxrs.client.spring.NamespaceHandler
Added: cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.schemas?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.schemas (added)
+++ cxf/trunk/rt/rs/client/src/main/resources/META-INF/spring.schemas Thu Feb 7 16:58:44 2013
@@ -0,0 +1,22 @@
+#
+#
+# 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.
+#
+#
+http\://cxf.apache.org/schemas/jaxrs-common.xsd=schemas/jaxrs-common.xsd
+http\://cxf.apache.org/schemas/jaxrs-client.xsd=schemas/jaxrs-client.xsd
Copied: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml (from r1443534, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml?p2=cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml&r1=1443534&r2=1443601&rev=1443601&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml (original)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml Thu Feb 7 16:58:44 2013
@@ -59,7 +59,7 @@ http://cxf.apache.org/jaxrs-client http:
</jaxrs:client>
<jaxrs:client id="ModelClient"
- modelRef="classpath:/org/apache/cxf/jaxrs/spring/resources.xml"
+ modelRef="classpath:/org/apache/cxf/jaxrs/client/spring/resources.xml"
serviceClass="org.apache.cxf.jaxrs.resources.BookStoreNoAnnotations"
address="http://localhost:8080/simpleWithAddress"
username="username"
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,94 @@
+/**
+ * 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.resources;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlRootElement(name = "Book")
+public class Book implements Comparable<Book> {
+ private String name;
+ private long id;
+ private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>();
+
+ public Book() {
+ }
+
+ public Book(String name, long id) {
+ this.name = name;
+ this.id = id;
+ }
+
+ public void setName(String n) {
+ name = n;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setId(long i) {
+ id = i;
+ }
+ public long getId() {
+ return id;
+ }
+
+ @Path("chapters/{chapterid}/")
+ @GET
+ public Chapter getChapter(@PathParam("chapterid") int chapterid) {
+ return chapters.get(new Long(chapterid));
+ }
+
+ @GET
+ public String getState() {
+ return "";
+ }
+
+
+ public void setState(String s) {
+ }
+
+ public int hashCode() {
+ return name.hashCode() * 37 + new Long(id).hashCode();
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof Book)) {
+ return false;
+ }
+ Book other = (Book)o;
+
+ return other.name.equals(name) && other.id == id;
+
+ }
+
+ public int compareTo(Book b) {
+ Long i1 = new Long(getId());
+ Long i2 = new Long(b.getId());
+ return i1.compareTo(i2);
+ }
+}
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,38 @@
+/**
+ * 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.resources;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+public interface BookInterface {
+
+ @GET
+ @Path("/path2")
+ @Produces("text/bar2")
+ @Consumes("text/foo2")
+ String getAuthor();
+
+ @Path("/books/{bookId}")
+ Book getBook(@PathParam("bookId") String id);
+}
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookInterface.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,77 @@
+/**
+ * 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.resources;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+@Path("/bookstore/")
+public class BookStore extends BookSuperClass implements BookInterface {
+
+ public BookStore() {
+ }
+
+ public Book getBook(String id) {
+ return null;
+ }
+
+ @Override
+ public Book getNewBook(String id, Boolean isNew) {
+ return null;
+ }
+
+
+
+ @POST
+ @Path("/books")
+ public Response addBook(Book book) {
+ return null;
+ }
+
+ @PUT
+ @Path("/books/")
+ public Response updateBook(Book book) {
+ return null;
+ }
+
+ @DELETE
+ @Path("/books/{bookId}/")
+ public Response deleteBook(@PathParam("bookId") String id) {
+ return null;
+ }
+
+ @Override
+ public String getDescription() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getAuthor() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
+
+
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStore.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,41 @@
+/**
+ * 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.resources;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class BookStoreNoAnnotations {
+
+ private Map<Long, Book> books = new HashMap<Long, Book>();
+
+ public BookStoreNoAnnotations() {
+ Book b = new Book();
+ b.setId(123L);
+ b.setName("CXF in Action");
+ books.put(b.getId(), b);
+ }
+
+ public Book getBook(Long id) {
+ return books.get(id);
+ }
+
+}
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,54 @@
+/**
+ * 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.resources;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("/bookstore/{id}/{id2}/{id3}")
+public class BookStoreSubresourcesOnly {
+
+ @Path("/sub1")
+ public BookStoreSubresourcesOnly getItself() {
+ return this;
+ }
+
+ @Path("/sub2/{id4}")
+ public BookStoreSubresourcesOnly getItself2(@PathParam("id4") String id4,
+ @PathParam("id") String id1, @PathParam("id3") String id3) {
+ return this;
+ }
+
+ @Path("/{id4}/sub3")
+ public BookStoreSubresourcesOnly getItself3(@PathParam("id4") String id4) {
+ return this;
+ }
+
+ @Path("/sub2/{id4}")
+ public BookStoreSubresourcesOnly getItself4(@PathParam("id4") String id4,
+ @PathParam("id") String id1,
+ @PathParam("id2") String id2,
+ @PathParam("id3") String id3) {
+ return this;
+ }
+}
+
+
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreSubresourcesOnly.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,40 @@
+/**
+ * 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.resources;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+
+public abstract class BookSuperClass {
+
+ @GET
+ @Path("/path")
+ @Produces("text/bar")
+ @Consumes("text/foo")
+ public abstract String getDescription();
+
+ @Path("/books/{bookId}/{new}")
+ public abstract Book getNewBook(@PathParam("bookId") String id,
+ @PathParam("new") Boolean isNew);
+}
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookSuperClass.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java?rev=1443601&view=auto
==============================================================================
--- cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java (added)
+++ cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java Thu Feb 7 16:58:44 2013
@@ -0,0 +1,48 @@
+/**
+ * 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.resources;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlRootElement(name = "Chapter")
+public class Chapter {
+ private String title;
+ private long id;
+
+ public Chapter() {
+ }
+
+ public void setTitle(String n) {
+ title = n;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setId(long i) {
+ id = i;
+ }
+ public long getId() {
+ return id;
+ }
+
+}
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Chapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth/pom.xml Thu Feb 7 16:58:44 2013
@@ -46,7 +46,11 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/pom.xml Thu Feb 7 16:58:44 2013
@@ -41,7 +41,11 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
<artifactId>${cxf.servlet-api.artifact}</artifactId>
Modified: cxf/trunk/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/pom.xml (original)
+++ cxf/trunk/services/sts/systests/advanced/pom.xml Thu Feb 7 16:58:44 2013
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <artifactId>cxf-rt-rs-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Thu Feb 7 16:58:44 2013
@@ -166,6 +166,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: cxf/trunk/systests/rs-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/pom.xml (original)
+++ cxf/trunk/systests/rs-security/pom.xml Thu Feb 7 16:58:44 2013
@@ -103,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: cxf/trunk/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1443601&r1=1443600&r2=1443601&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/pom.xml (original)
+++ cxf/trunk/systests/ws-security/pom.xml Thu Feb 7 16:58:44 2013
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <artifactId>cxf-rt-rs-client</artifactId>
<version>${project.version}</version>
</dependency>