You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by jl...@apache.org on 2007/10/28 13:36:18 UTC
svn commit: r589342 - in /incubator/cxf/trunk: ./
api/src/main/java/org/apache/cxf/service/model/ distribution/
distribution/bundle/ distribution/manifest/
distribution/src/main/release/samples/
distribution/src/main/release/samples/restful_jaxrs/ dist...
Author: jliu
Date: Sun Oct 28 05:36:13 2007
New Revision: 589342
URL: http://svn.apache.org/viewvc?rev=589342&view=rev
Log:
Initial implementation of JSR-311, merged from branch to trunk.
Added:
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/README.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/build.xml
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/Client.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/Client.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/add_customer.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/add_customer.txt
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/update_customer.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/client/update_customer.txt
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/
- copied from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/Customer.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/Customer.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/CustomerService.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/CustomerService.java
incubator/cxf/trunk/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/Server.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/distribution/src/main/release/samples/restful_jaxrs/src/demo/jaxrs/server/Server.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
incubator/cxf/trunk/rt/frontend/jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/
incubator/cxf/trunk/rt/frontend/jaxrs/pom.xml
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/pom.xml
incubator/cxf/trunk/rt/frontend/jaxrs/src/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java
- copied, changed from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BuilderImpl.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BuilderImpl.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactoryImpl.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactoryImpl.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ResponseImpl.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ResponseImpl.java
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/bus-extensions.xml
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/bus-extensions.xml
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.xml
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/cxf.extension
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/cxf.extension
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/services/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/services/
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.ProviderFactory
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.ProviderFactory
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/
- copied from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/
incubator/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (with props)
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/
- copied from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/CD.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/CD.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/CDs.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/CDs.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/
- copied from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt
- copied unchanged from r588469, incubator/cxf/branches/jliu/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
incubator/cxf/trunk/distribution/bundle/pom.xml
incubator/cxf/trunk/distribution/manifest/pom.xml
incubator/cxf/trunk/distribution/pom.xml
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
incubator/cxf/trunk/rt/pom.xml
incubator/cxf/trunk/systests/pom.xml
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java Sun Oct 28 05:36:13 2007
@@ -38,15 +38,19 @@
transportId = ns;
service = serv;
}
+
public String getTransportId() {
return transportId;
}
+
public void setTransportId(String tid) {
transportId = tid;
}
+
public InterfaceInfo getInterface() {
return service.getInterface();
}
+
public ServiceInfo getService() {
return service;
}
@@ -54,6 +58,7 @@
public QName getName() {
return name;
}
+
public void setName(QName n) {
name = n;
}
@@ -61,6 +66,7 @@
public BindingInfo getBinding() {
return binding;
}
+
public void setBinding(BindingInfo b) {
binding = b;
}
@@ -76,6 +82,7 @@
EndpointReferenceUtils.setAddress(address, addr);
}
}
+
public void setAddress(EndpointReferenceType endpointReference) {
address = endpointReference;
}
Modified: incubator/cxf/trunk/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/bundle/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/bundle/pom.xml (original)
+++ incubator/cxf/trunk/distribution/bundle/pom.xml Sun Oct 28 05:36:13 2007
@@ -213,7 +213,12 @@
<version>${pom.version}</version>
<optional>true</optional>
</dependency>
-
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
Modified: incubator/cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/manifest/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/manifest/pom.xml (original)
+++ incubator/cxf/trunk/distribution/manifest/pom.xml Sun Oct 28 05:36:13 2007
@@ -212,6 +212,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Sun Oct 28 05:36:13 2007
@@ -221,6 +221,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.0-RC2</version>
@@ -234,6 +239,16 @@
<artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1-rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>0.3</version>
+ </dependency>
</dependencies>
<build>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Sun Oct 28 05:36:13 2007
@@ -115,8 +115,8 @@
</javac>
<copy todir="${build.classes.dir}">
- <fileset dir="${basedir}/src" includes="**/*.xml" />
- <fileset dir="${build.src.dir}" includes="**/*.xml" />
+ <fileset dir="${basedir}/src" includes="**/*.xml, **/*.txt" />
+ <fileset dir="${build.src.dir}" includes="**/*.xml, **/*.txt" />
</copy>
</target>
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Sun Oct 28 05:36:13 2007
@@ -141,7 +141,18 @@
<module>maven-plugins/eclipse-plugin-generator</module>
</modules>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository/</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
+
<profiles>
<profile>
<!-- default profile enables checkstyle and Xlint stuff -->
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java Sun Oct 28 05:36:13 2007
@@ -86,7 +86,7 @@
buffer.append(ManagementConstants.TYPE_PROP + "=" + "Bus.Service.Endpoint,");
- String serviceName = ObjectName.quote(endpoint.getEndpointInfo().getService().getName().toString());
+ String serviceName = ObjectName.quote(endpoint.getService().getName().toString());
buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ",");
String endpointName = ObjectName.quote(endpoint.getEndpointInfo().getName().toString());
buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + endpointName);
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Sun Oct 28 05:36:13 2007
@@ -35,6 +35,7 @@
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.model.EndpointInfo;
public class ChainInitiationObserver implements MessageObserver {
@@ -86,7 +87,7 @@
if (exchange.getDestination() == null) {
exchange.setDestination(m.getDestination());
}
- if (endpoint != null) {
+ if (endpoint != null && (endpoint.getService() instanceof ServiceImpl)) {
EndpointInfo endpointInfo = endpoint.getEndpointInfo();
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Sun Oct 28 05:36:13 2007
@@ -43,7 +43,7 @@
import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.frontend.AbstractEndpointFactory;
+import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.test.AbstractCXFTest;
@@ -152,10 +152,10 @@
setupAegis(sf, binding);
return sf;
}
- protected void setupAegis(AbstractEndpointFactory sf) {
+ protected void setupAegis(AbstractWSDLBasedEndpointFactory sf) {
setupAegis(sf, null);
}
- protected void setupAegis(AbstractEndpointFactory sf, AegisDatabinding binding) {
+ protected void setupAegis(AbstractWSDLBasedEndpointFactory sf, AegisDatabinding binding) {
if (binding == null) {
binding = new AegisDatabinding();
}
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java Sun Oct 28 05:36:13 2007
@@ -40,56 +40,20 @@
binding.getInInterceptors().add(new JAXRSDispatchInterceptor());
binding.getOutInterceptors().add(new JAXRSOutInterceptor());
-
-/*
- binding.getInFaultInterceptors().add(new XMLFaultInInterceptor());
-
- binding.getOutFaultInterceptors().add(new ContentTypeOutInterceptor());
- binding.getOutFaultInterceptors().add(new StaxOutInterceptor());
- binding.getOutFaultInterceptors().add(new XMLFaultOutInterceptor());*/
+
+ //TODO: Add fault interceptors
return binding;
}
-
+ /*
+ * The concept of Binding is not used in this JAX-RS impl. Here we use
+ * Binding merely to make this JAX-RS impl compatible with CXF framework
+ */
public BindingInfo createBindingInfo(Service service, String namespace, Object obj) {
- BindingInfo info = new BindingInfo(null,
- JAXRSBindingFactory.JAXRS_BINDING_ID);
+ BindingInfo info = new BindingInfo(null, JAXRSBindingFactory.JAXRS_BINDING_ID);
return info;
-
-/* ServiceInfo si = service.getServiceInfos().get(0);
- BindingInfo info = new BindingInfo(si,
- RESTBindingFactory.REST_BINDING_ID);
- info.setName(new QName(si.getName().getNamespaceURI(),
- si.getName().getLocalPart() + "HttpBinding"));
-
- //service.put(URIMapper.class.getName(), mapper);
- MethodDispatcher md = (MethodDispatcher) service.get(MethodDispatcher.class.getName());
-
- for (OperationInfo o : si.getInterface().getOperations()) {
- BindingOperationInfo bop = info.buildOperation(o.getName(), o.getInputName(), o.getOutputName());
-
- info.addOperation(bop);
-
- Method m = md.getMethod(bop);
-
- try {
- Class c = (Class) service.get(ReflectionServiceFactoryBean.ENDPOINT_CLASS);
- if (c != null) {
- m = c.getMethod(m.getName(), m.getParameterTypes());
- }
- } catch (SecurityException e) {
- throw new ServiceConstructionException(e);
- } catch (NoSuchMethodException e) {
- throw new ServiceConstructionException(e);
- }
-
- }
-
- return info;*/
-
- //return null;
}
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java Sun Oct 28 05:36:13 2007
@@ -58,8 +58,9 @@
}
- //REVISIT: Not sure how to deal with Resource class lift cycle yet. The spec suggests
- //that the root Resource class needs to be created by JSR-311 runtime for every request.
+ // REVISIT: Not sure how to deal with Resource class life cycle. The current
+ // spec suggests two models, per-request and singleton, and it is the
+ // reponsibility of JSR-311 runtime to create resource instances.
public Object getServiceObject(Exchange exchange) {
Object serviceObject = null;
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Sun Oct 28 05:36:13 2007
@@ -47,8 +47,9 @@
* Bean to help easily create Server endpoints for JAX-RS. Example:
* <pre>
* JAXRSServerFactoryBean sf = JAXRSServerFactoryBean();
- * sf.setServiceClass(Book.class);
- * sf.setAddress("http://acme.com/myService");
+ * sf.setResourceClasses(Book.class);
+ * sf.setBindingId(JAXRSBindingFactory.JAXRS_BINDING_ID);
+ * sf.setAddress("http://localhost:9080/");
* sf.create();
* </pre>
* This will start a server for you and register it with the ServerManager.
@@ -114,7 +115,6 @@
} else {
return new JAXRSInvoker(serviceBeans);
}
-
}
protected Endpoint createEndpoint() throws BusException, EndpointException {
@@ -147,8 +147,11 @@
}
/*
- * WSDL based EndpointInfo contains WSDL's physical part info, for JAX-RS
- * based EndpointInfo, we set everything manually.
+ * EndpointInfo contains information form WSDL's physical part such as
+ * endpoint address, binding, transport etc. For JAX-RS based EndpointInfo,
+ * as there is no WSDL, these information are set manually, eg, default
+ * transport is http, binding is JAX-RS binding, endpoint address is from
+ * server mainline.
*/
protected EndpointInfo createEndpointInfo() throws BusException {
String transportId = getTransportId();
@@ -164,8 +167,6 @@
}
}
- BindingInfo bindingInfo = createBindingInfo();
-
//default to http transport
if (transportId == null) {
transportId = "http://schemas.xmlsoap.org/wsdl/soap/http";
@@ -176,7 +177,9 @@
EndpointInfo ei = new EndpointInfo();
ei.setTransportId(transportId);
ei.setName(serviceFactory.getService().getName());
- ei.setAddress(getAddress());
+ ei.setAddress(getAddress());
+
+ BindingInfo bindingInfo = createBindingInfo();
ei.setBinding(bindingInfo);
return ei;
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java Sun Oct 28 05:36:13 2007
@@ -66,21 +66,16 @@
}
public List<ServiceInfo> getServiceInfos() {
- //NOT IMPLEMENTED
+ //NOT APPLICABLE
return null;
}
- public EndpointInfo getEndpointInfo(QName endpoint) {
-/* for (ServiceInfo inf : serviceInfos) {
- EndpointInfo ef = inf.getEndpoint(endpoint);
- if (ef != null) {
- return ef;
- }
- }
- return null;*/
+ public EndpointInfo getEndpointInfo(QName endpoint) {
+ // For WSDL-based services, this is to construct an EndpointInfo
+ // (transport, binding, address etc) from WSDL's physical part.
+ // not applicable to JAX-RS services.
return null;
- }
-
+ }
public Executor getExecutor() {
return executor;
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java Sun Oct 28 05:36:13 2007
@@ -186,7 +186,8 @@
return result;
}
- private Object readFromEntityBody(Class<?> targetTypeClass, InputStream is) {
+ @SuppressWarnings("unchecked")
+ private Object readFromEntityBody(Class targetTypeClass, InputStream is) {
Object result = null;
EntityProvider provider = ProviderFactory.getInstance().createEntityProvider(targetTypeClass);
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java Sun Oct 28 05:36:13 2007
@@ -40,6 +40,7 @@
super(Phase.MARSHAL);
}
+ @SuppressWarnings("unchecked")
public void handleMessage(Message message) {
Exchange exchange = message.getExchange();
OperationResourceInfo operation = (OperationResourceInfo)exchange.get(OperationResourceInfo.class
Copied: incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java (from r588469, incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java?p2=incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java&p1=incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java&r1=588469&r2=589342&rev=589342&view=diff
==============================================================================
--- incubator/cxf/branches/jliu/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java Sun Oct 28 05:36:13 2007
@@ -26,30 +26,30 @@
public class MethodDispatcher {
- private Map<OperationResourceInfo, Method> opToMethod =
+ private Map<OperationResourceInfo, Method> oriToMethod =
new ConcurrentHashMap<OperationResourceInfo, Method>();
- private Map<Method, OperationResourceInfo> methodToOp =
+ private Map<Method, OperationResourceInfo> methodToOri =
new ConcurrentHashMap<Method, OperationResourceInfo>();
public void bind(OperationResourceInfo o, Method... methods) {
Method primary = methods[0];
for (Method m : methods) {
- methodToOp.put(m, o);
+ methodToOri.put(m, o);
}
- opToMethod.put(o, primary);
+ oriToMethod.put(o, primary);
}
public OperationResourceInfo getOperationResourceInfo(Method method) {
- return methodToOp.get(method);
+ return methodToOri.get(method);
}
public Set<OperationResourceInfo> getOperationResourceInfos() {
- return opToMethod.keySet();
+ return oriToMethod.keySet();
}
public Method getMethod(OperationResourceInfo op) {
- return opToMethod.get(op);
+ return oriToMethod.get(op);
}
}
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java Sun Oct 28 05:36:13 2007
@@ -23,7 +23,8 @@
import org.apache.cxf.service.ServiceBuilder;
import org.apache.cxf.service.model.ServiceInfo;
-public abstract class AbstractServiceFactory extends AbstractEndpointFactory implements ServiceBuilder {
+public abstract class AbstractServiceFactory extends AbstractWSDLBasedEndpointFactory implements
+ ServiceBuilder {
public ServiceInfo createService() {
try {
return createEndpoint().getEndpointInfo().getService();
Added: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=589342&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (added)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Sun Oct 28 05:36:13 2007
@@ -0,0 +1,304 @@
+/**
+ * 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.frontend;
+
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.BusException;
+import org.apache.cxf.binding.BindingFactoryManager;
+import org.apache.cxf.binding.soap.SoapBindingConfiguration;
+import org.apache.cxf.binding.soap.model.SoapBindingInfo;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.endpoint.AbstractEndpointFactory;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.endpoint.EndpointException;
+import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.interceptor.AnnotationInterceptors;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl11.WSDLEndpointFactory;
+
+public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointFactory {
+ private static final Logger LOG = LogUtils.getL7dLogger(AbstractWSDLBasedEndpointFactory.class);
+
+ private Class serviceClass;
+ private ReflectionServiceFactoryBean serviceFactory;
+
+ protected Endpoint createEndpoint() throws BusException, EndpointException {
+ Service service = serviceFactory.getService();
+
+ if (service == null) {
+ initializeServiceFactory();
+ service = serviceFactory.create();
+ }
+
+ if (endpointName == null) {
+ endpointName = serviceFactory.getEndpointName();
+ }
+ EndpointInfo ei = service.getEndpointInfo(endpointName);
+ if (ei != null) {
+ if (transportId != null
+ && !ei.getTransportId().equals(transportId)) {
+ ei = null;
+ } else {
+ BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
+ bindingFactory = bfm.getBindingFactory(ei.getBinding().getBindingId());
+ }
+ }
+
+ if (ei == null) {
+ if (getAddress() == null) {
+ ei = ServiceModelUtil.findBestEndpointInfo(serviceFactory.getInterfaceName(), service
+ .getServiceInfos());
+ }
+ if (ei == null) {
+ ei = createEndpointInfo();
+ }
+ } else if (getAddress() != null) {
+ ei.setAddress(getAddress());
+ }
+
+ if (endpointReference != null) {
+ ei.setAddress(endpointReference);
+ }
+ Endpoint ep = service.getEndpoints().get(ei.getName());
+
+ if (ep == null) {
+ ep = serviceFactory.createEndpoint(ei);
+ ((EndpointImpl)ep).initializeActiveFeatures(getFeatures());
+ } else {
+ serviceFactory.setEndpointName(ei.getName());
+ if (ep.getActiveFeatures() == null) {
+ ((EndpointImpl)ep).initializeActiveFeatures(getFeatures());
+ }
+ }
+
+ if (properties != null) {
+ ep.putAll(properties);
+ }
+
+ service.getEndpoints().put(ep.getEndpointInfo().getName(), ep);
+
+ if (getInInterceptors() != null) {
+ ep.getInInterceptors().addAll(getInInterceptors());
+ }
+ if (getOutInterceptors() != null) {
+ ep.getOutInterceptors().addAll(getOutInterceptors());
+ }
+ if (getInFaultInterceptors() != null) {
+ ep.getInFaultInterceptors().addAll(getInFaultInterceptors());
+ }
+ if (getOutFaultInterceptors() != null) {
+ ep.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
+ }
+ return ep;
+ }
+
+ protected void initializeServiceFactory() {
+ Class cls = getServiceClass();
+
+ serviceFactory.setServiceClass(cls);
+ serviceFactory.setBus(getBus());
+ if (dataBinding != null) {
+ serviceFactory.setDataBinding(dataBinding);
+ }
+ }
+
+ protected EndpointInfo createEndpointInfo() throws BusException {
+ if (transportId == null
+ && getAddress() != null) {
+ DestinationFactory df = getDestinationFactory();
+ if (df == null) {
+ DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
+ df = dfm.getDestinationFactoryForUri(getAddress());
+ }
+
+ if (df != null) {
+ transportId = df.getTransportIds().get(0);
+ }
+ }
+
+ // Get the Service from the ServiceFactory if specified
+ Service service = serviceFactory.getService();
+ // SOAP nonsense
+ BindingInfo bindingInfo = createBindingInfo();
+ if (bindingInfo instanceof SoapBindingInfo
+ && (((SoapBindingInfo) bindingInfo).getTransportURI() == null
+ || LocalTransportFactory.TRANSPORT_ID.equals(transportId))) {
+ ((SoapBindingInfo) bindingInfo).setTransportURI(transportId);
+ transportId = "http://schemas.xmlsoap.org/wsdl/soap/";
+ }
+
+
+ if (transportId == null) {
+ if (bindingInfo instanceof SoapBindingInfo) {
+ // TODO: we shouldn't have to do this, but the DF is null because the
+ // LocalTransport doesn't return for the http:// uris
+ // People also seem to be supplying a null JMS getAddress(), which is worrying
+ transportId = "http://schemas.xmlsoap.org/wsdl/soap/";
+ } else {
+ transportId = "http://schemas.xmlsoap.org/wsdl/http/";
+ }
+ }
+
+ service.getServiceInfos().get(0).addBinding(bindingInfo);
+
+ setTransportId(transportId);
+
+ if (destinationFactory == null) {
+ DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
+ destinationFactory = dfm.getDestinationFactory(transportId);
+ }
+
+ EndpointInfo ei;
+ if (destinationFactory instanceof WSDLEndpointFactory) {
+ ei = ((WSDLEndpointFactory)destinationFactory)
+ .createEndpointInfo(service.getServiceInfos().get(0), bindingInfo, null);
+ ei.setTransportId(transportId);
+ } else {
+ ei = new EndpointInfo(service.getServiceInfos().get(0), transportId);
+ }
+ int count = 1;
+ while (service.getEndpointInfo(endpointName) != null) {
+ endpointName = new QName(endpointName.getNamespaceURI(),
+ endpointName.getLocalPart() + count);
+ count++;
+ }
+ ei.setName(endpointName);
+ ei.setAddress(getAddress());
+ ei.setBinding(bindingInfo);
+
+ if (destinationFactory instanceof WSDLEndpointFactory) {
+ WSDLEndpointFactory we = (WSDLEndpointFactory) destinationFactory;
+
+ we.createPortExtensors(ei, service);
+ } else {
+ // ?
+ }
+ service.getServiceInfos().get(0).addEndpoint(ei);
+ return ei;
+ }
+
+ /**
+ * Add annotationed Interceptors and Features to the Endpoint
+ * @param ep
+ */
+ protected void initializeAnnotationInterceptors(Endpoint ep, Class<?> cls) {
+ AnnotationInterceptors provider = new AnnotationInterceptors(cls);
+ if (initializeAnnotationInterceptors(provider, ep)) {
+ LOG.fine("Added annotation based interceptors and features");
+ }
+ }
+
+ protected boolean initializeAnnotationInterceptors(AnnotationInterceptors provider, Endpoint ep) {
+ boolean hasAnnotation = false;
+ if (provider.getInFaultInterceptors() != null) {
+ ep.getInFaultInterceptors().addAll(provider.getInFaultInterceptors());
+ hasAnnotation = true;
+ }
+ if (provider.getInInterceptors() != null) {
+ ep.getInInterceptors().addAll(provider.getInInterceptors());
+ hasAnnotation = true;
+ }
+ if (provider.getOutFaultInterceptors() != null) {
+ ep.getOutFaultInterceptors().addAll(provider.getOutFaultInterceptors());
+ hasAnnotation = true;
+ }
+ if (provider.getOutInterceptors() != null) {
+ ep.getOutInterceptors().addAll(provider.getOutInterceptors());
+ hasAnnotation = true;
+ }
+ if (provider.getFeatures() != null) {
+ getFeatures().addAll(provider.getFeatures());
+ hasAnnotation = true;
+ }
+
+ return hasAnnotation;
+ }
+
+ protected BindingInfo createBindingInfo() {
+ BindingFactoryManager mgr = bus.getExtension(BindingFactoryManager.class);
+ String binding = bindingId;
+
+ if (binding == null && bindingConfig != null) {
+ binding = bindingConfig.getBindingId();
+ }
+
+ if (binding == null) {
+ // default to soap binding
+ binding = "http://schemas.xmlsoap.org/soap/";
+ }
+
+ try {
+ if ("http://schemas.xmlsoap.org/soap/".equals(binding)) {
+ if (bindingConfig == null) {
+ bindingConfig = new SoapBindingConfiguration();
+ }
+ if (bindingConfig instanceof SoapBindingConfiguration) {
+ ((SoapBindingConfiguration)bindingConfig).setStyle(serviceFactory.getStyle());
+ }
+ }
+
+ bindingFactory = mgr.getBindingFactory(binding);
+
+ return bindingFactory.createBindingInfo(serviceFactory.getService(),
+ binding, bindingConfig);
+ } catch (BusException ex) {
+ throw new ServiceConstructionException(
+ new Message("COULD.NOT.RESOLVE.BINDING", LOG, bindingId), ex);
+ }
+ }
+
+ public Class getServiceClass() {
+ return serviceClass;
+ }
+
+ public void setServiceClass(Class serviceClass) {
+ this.serviceClass = serviceClass;
+ }
+
+ public ReflectionServiceFactoryBean getServiceFactory() {
+ return serviceFactory;
+ }
+
+
+ public void setServiceFactory(ReflectionServiceFactoryBean serviceFactory) {
+ this.serviceFactory = serviceFactory;
+ }
+
+ public String getWsdlURL() {
+ return getServiceFactory().getWsdlURL();
+ }
+
+ public void setWsdlURL(String wsdlURL) {
+ getServiceFactory().setWsdlURL(wsdlURL);
+ }
+
+
+}
Propchange: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Sun Oct 28 05:36:13 2007
@@ -31,7 +31,7 @@
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
-public class ClientFactoryBean extends AbstractEndpointFactory {
+public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory {
private Client client;
public ClientFactoryBean() {
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Sun Oct 28 05:36:13 2007
@@ -78,7 +78,7 @@
* sf.create();
* </pre>
*/
-public class ServerFactoryBean extends AbstractEndpointFactory {
+public class ServerFactoryBean extends AbstractWSDLBasedEndpointFactory {
private static final Logger LOG = LogUtils.getL7dLogger(ServerFactoryBean.class);
private Server server;
Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Sun Oct 28 05:36:13 2007
@@ -40,6 +40,7 @@
<module>bindings</module>
<module>frontend/simple</module>
<module>frontend/jaxws</module>
+ <module>frontend/jaxrs</module>
<module>frontend/js</module>
<module>transports/http</module>
<module>transports/http-jetty</module>
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=589342&r1=589341&r2=589342&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Sun Oct 28 05:36:13 2007
@@ -302,6 +302,11 @@
<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.apache.cxf</groupId>
<artifactId>cxf-integration-jca</artifactId>
<version>${project.version}</version>