cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1039138 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/ systes...
Date Thu, 25 Nov 2010 18:48:54 GMT
Author: sergeyb
Date: Thu Nov 25 18:48:53 2010
New Revision: 1039138

URL: http://svn.apache.org/viewvc?rev=1039138&view=rev
Log:
Temporarily reverting r1039049 from 2.2.x

Added:
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSoapService.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSoapService.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxrs.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxrs.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxrsJaxws.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxrsJaxws.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxws.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreJaxws.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl2.java
      - copied unchanged from r1039048, cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSoapRestImpl2.java
Removed:
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 18:48:53 2010
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1038378,1038416,1038727,1038747,1039046
-/cxf/trunk:1038374,1038386,1038722,1038746,1039039
+/cxf/branches/2.3.x-fixes:1038378,1038416,1038727,1038747
+/cxf/trunk:1038374,1038386,1038722,1038746

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java?rev=1039138&r1=1039137&r2=1039138&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
Thu Nov 25 18:48:53 2010
@@ -195,8 +195,7 @@ public class JAXRSOutInterceptor extends
         
         Method invoked = null;
         if (firstTry) {
-            invoked = ori == null ? null : ori.getAnnotatedMethod() == null
-                ? ori.getMethodToInvoke() : ori.getAnnotatedMethod();
+            invoked = ori == null ? null : ori.getMethodToInvoke();
         }
         Class<?> targetType = getRawResponseClass(responseObj);
         Type genericType = 

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java?rev=1039138&r1=1039137&r2=1039138&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
Thu Nov 25 18:48:53 2010
@@ -29,7 +29,7 @@ public class BookApplication extends App
     public Set<Class<?>> getClasses() {
         Set<Class<?>> classes = new HashSet<Class<?>>();
         classes.add(org.apache.cxf.systest.jaxrs.BookStorePerRequest.class);
-        classes.add(org.apache.cxf.systest.jaxrs.jaxws.BookStoreJaxrsJaxws.class);
+        classes.add(org.apache.cxf.systest.jaxrs.BookStoreJaxrsJaxws.class);
         return classes;
     }
 

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java?rev=1039138&r1=1039137&r2=1039138&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
Thu Nov 25 18:48:53 2010
@@ -37,8 +37,6 @@ import javax.ws.rs.core.Response;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.FileRequestEntity;
@@ -63,11 +61,6 @@ import org.apache.cxf.jaxrs.provider.JAX
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
-import org.apache.cxf.systest.jaxrs.jaxws.BookSoapService;
-import org.apache.cxf.systest.jaxrs.jaxws.BookStoreJaxrsJaxws;
-import org.apache.cxf.systest.jaxrs.jaxws.HelloWorld;
-import org.apache.cxf.systest.jaxrs.jaxws.User;
-import org.apache.cxf.systest.jaxrs.jaxws.UserImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.transport.http.HTTPConduit;
 
@@ -85,41 +78,6 @@ public class JAXRSSoapBookTest extends A
     }
     
     @Test
-    public void testHelloRest() throws Exception {
-        String address = "http://localhost:" + PORT + "/test/services/hello-rest";
-        
-        HelloWorld service = JAXRSClientFactory.create(address, HelloWorld.class);
-        useHelloService(service);
-    }
-    
-    @Test
-    public void testHelloSoap() throws Exception {
-        final QName serviceName = new QName("http://hello.com", "HelloWorld");
-        final QName portName = new QName("http://hello.com", "HelloWorldPort");
-        final String address = "http://localhost:" + PORT + "/test/services/hello-soap";
-        
-        Service service = Service.create(serviceName);
-        service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, address);
-    
-        HelloWorld hw = service.getPort(HelloWorld.class); 
-    
-        useHelloService(hw);
-    }
-    
-    private void useHelloService(HelloWorld service) {
-        assertEquals("Hello Barry", service.sayHi("Barry"));
-        assertEquals("Hello Fred", service.sayHiToUser(new UserImpl("Fred")));
-        
-        Map<Integer, User> users = service.getUsers();
-        assertEquals(1, users.size());
-        assertEquals("Fred", users.entrySet().iterator().next().getValue().getName());
-        
-        users = service.echoUsers(users);
-        assertEquals(1, users.size());
-        assertEquals("Fred", users.entrySet().iterator().next().getValue().getName());
-    }
-    
-    @Test
     public void testGetAll() throws Exception {
         
         InputStream in = getHttpInputStream("http://localhost:" + PORT 

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml?rev=1039138&r1=1039137&r2=1039138&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_soap_rest/WEB-INF/beans.xml
Thu Nov 25 18:48:53 2010
@@ -47,14 +47,14 @@ http://cxf.apache.org/schemas/jaxrs.xsd"
 
   <jaxrs:client id="restClient"
          address="http://localhost:${testutil.ports.BookServerRestSoap}/test/services/rest"
-         serviceClass="org.apache.cxf.systest.jaxrs.jaxws.BookStoreJaxrsJaxws"
+         serviceClass="org.apache.cxf.systest.jaxrs.BookStoreJaxrsJaxws"
          inheritHeaders="true">
          <jaxrs:headers>
              <entry key="Accept" value="text/xml"/>
          </jaxrs:headers>
   </jaxrs:client>       
          
-  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.jaxws.BookStoreSoapRestImpl"/>
+  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.BookStoreSoapRestImpl"/>
 
   <jaxws:endpoint xmlns:s="http://books.com"
       serviceName="s:BookService"
@@ -70,19 +70,6 @@ http://cxf.apache.org/schemas/jaxrs.xsd"
     </jaxrs:serviceBeans>		   
   </jaxrs:server>
 
-  <jaxrs:server id="hello_rest" address="/hello-rest">
-    <jaxrs:serviceBeans>
-      <bean class="org.apache.cxf.systest.jaxrs.jaxws.HelloWorldImpl"/>
-    </jaxrs:serviceBeans>		   
-  </jaxrs:server>
-
-  <jaxws:endpoint xmlns:s="http://hello.com"
-      serviceName="s:HelloWorld"
-      endpointName="s:HelloWorldPort"
-      id="hello_soap"
-      implementor="org.apache.cxf.systest.jaxrs.jaxws.HelloWorldImpl"
-      address="/hello-soap"/>
-
   <jaxws:endpoint xmlns:s="http://books.com"
       serviceName="s:BookService"
       endpointName="s:BookPort"
@@ -100,7 +87,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd"
       <ref bean="bookstore2"/>
     </jaxrs:serviceBeans>		   
   </jaxrs:server>
-  <bean id="bookstore2" class="org.apache.cxf.systest.jaxrs.jaxws.BookStoreSoapRestImpl2"/>
+  <bean id="bookstore2" class="org.apache.cxf.systest.jaxrs.BookStoreSoapRestImpl2"/>
 
   <util:list id="fastinfosetType">
     <value>application/fastinfoset</value>



Mime
View raw message