cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1070560 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
Date Mon, 14 Feb 2011 16:31:51 GMT
Author: sergeyb
Date: Mon Feb 14 16:31:51 2011
New Revision: 1070560

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

........
  r1070558 | sergeyb | 2011-02-14 16:28:49 +0000 (Mon, 14 Feb 2011) | 1 line
  
  Fixing a broken system jaxrs test
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 14 16:31:51 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558

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

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1070560&r1=1070559&r2=1070560&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Mon Feb 14 16:31:51 2011
@@ -338,7 +338,7 @@ public class JAXRSClientServerSpringBook
     @Test
     public void testReaderWriterFromJaxrsFilters() throws Exception {
         String endpointAddress =
-            "http://localhost:" + PORT + "/the/thebooks5/bookstore/books/convert2/123";
+            "http://localhost:" + PORT + "/the/thebooksWithStax/bookstore/books/convert2/123";
         WebClient wc = WebClient.create(endpointAddress);
         wc.type("application/xml").accept("application/xml");
         Book2 b = new Book2();
@@ -353,7 +353,7 @@ public class JAXRSClientServerSpringBook
     @Test
     public void testReaderWriterFromInterceptors() throws Exception {
         String endpointAddress =
-            "http://localhost:" + PORT + "/the/thebooks5/bookstore/books/convert";
+            "http://localhost:" + PORT + "/the/thebooksWithStax/bookstore/books/convert";
         WebClient wc = WebClient.create(endpointAddress);
         wc.type("application/xml").accept("application/xml");
         Book2 b = new Book2();

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=1070560&r1=1070559&r2=1070560&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml Mon
Feb 14 16:31:51 2011
@@ -102,6 +102,17 @@ http://cxf.apache.org/schemas/core.xsd">
 
     <jaxrs:providers>
        <ref bean="xsltProvider"/>
+    </jaxrs:providers> 
+    
+  </jaxrs:server>
+  
+  <jaxrs:server id="bookserviceWithStax"
+		        address="/thebooksWithStax/bookstore">
+    <jaxrs:serviceBeans>
+      <ref bean="serviceBean" />
+    </jaxrs:serviceBeans>		  
+
+    <jaxrs:providers>
        <bean class="org.apache.cxf.systest.jaxrs.XmlStreamReaderProvider"/>
        <bean class="org.apache.cxf.systest.jaxrs.XmlStreamWriterProvider"/>
     </jaxrs:providers> 



Mime
View raw message