cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r889368 - in /cxf/branches/2.2.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/
Date Thu, 10 Dec 2009 18:57:13 GMT
Author: sergeyb
Date: Thu Dec 10 18:57:13 2009
New Revision: 889368

URL: http://svn.apache.org/viewvc?rev=889368&view=rev
Log:
Merged revisions 888400-888401 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r888400 | sergeyb | 2009-12-08 13:54:16 +0000 (Tue, 08 Dec 2009) | 1 line
  
  Testing custom atom provider
........
  r888401 | sergeyb | 2009-12-08 14:03:16 +0000 (Tue, 08 Dec 2009) | 1 line
  
  Fixing the port
........

Added:
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java
      - copied unchanged from r888401, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
    cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 10 18:57:13 2009
@@ -1 +1 @@
-/cxf/trunk:887317
+/cxf/trunk:887317,888400-888401

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

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java?rev=889368&r1=889367&r2=889368&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
Thu Dec 10 18:57:13 2009
@@ -149,6 +149,16 @@
                         "*/*");
     }
     
+    @Test
+    public void testGetBooksWithCustomProvider() throws Exception {
+        String endpointAddress =
+            "http://localhost:9080/bookstore/bookstore4/books/feed"; 
+        Feed feed = getFeed(endpointAddress, null);
+        assertEquals("http://localhost:9080/bookstore/bookstore4/books/feed", 
+                     feed.getBaseUri().toString());
+        assertEquals("Collection of Books", feed.getTitle());
+    }
+    
     private void getAndCompareJson(String address, 
                                    String resourcePath,
                                    String type) throws Exception {

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml?rev=889368&r1=889367&r2=889368&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml
Thu Dec 10 18:57:13 2009
@@ -85,6 +85,15 @@
     </jaxrs:properties>
   </jaxrs:server>
   
+  <jaxrs:server id="atomservice4" address="/bookstore4">
+    <jaxrs:serviceBeans>
+      <ref bean="atomstore"/>
+    </jaxrs:serviceBeans>
+    <jaxrs:providers>
+        <ref bean="feed2"/>
+    </jaxrs:providers>	
+  </jaxrs:server>
+  
   <bean id="atomstore" class="org.apache.cxf.systest.jaxrs.AtomBookStore"/>
   <bean id="atomstore2" class="org.apache.cxf.systest.jaxrs.AtomBookStore2"/>
   <bean id="atomstore3" class="org.apache.cxf.systest.jaxrs.AtomBookStore3"/>
@@ -92,6 +101,11 @@
   <bean id="feed" class="org.apache.cxf.jaxrs.provider.AtomFeedProvider">
       <property name="formattedOutput" value="true"/>
   </bean>
+  <bean id="feed2" class="org.apache.cxf.systest.jaxrs.CustomAtomFeedProvider">
+  <!--
+      <property name="formattedOutput" value="true"/>
+  -->    
+  </bean>
   <bean id="entry" class="org.apache.cxf.jaxrs.provider.AtomEntryProvider"/>
   
 </beans>



Mime
View raw message