cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1080367 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/
Date Thu, 10 Mar 2011 21:51:52 GMT
Author: sergeyb
Date: Thu Mar 10 21:51:51 2011
New Revision: 1080367

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

........
  r1080364 | sergeyb | 2011-03-10 21:45:18 +0000 (Thu, 10 Mar 2011) | 1 line
  
  Changing 8080 port in JAX-RS unit tests, todo: dynamic port allocation
........
  r1080366 | sergeyb | 2011-03-10 21:48:13 +0000 (Thu, 10 Mar 2011) | 1 line
  
  Changing 8080 port in JAX-RS unit tests and fixing the test
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 21:51:51 2011
@@ -1 +1 @@
-/cxf/trunk:1079780,1080225,1080267
+/cxf/trunk:1079780,1080225,1080267,1080364-1080366

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java?rev=1080367&r1=1080366&r2=1080367&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java
Thu Mar 10 21:51:51 2011
@@ -54,7 +54,7 @@ public class JAXRSServerFactoryBeanTest 
             new ClassPathXmlApplicationContext(new String[] {"/org/apache/cxf/jaxrs/spring/servers.xml"});
         
         JAXRSServerFactoryBean sfb = (JAXRSServerFactoryBean)ctx.getBean("simple");
-        assertEquals("Get a wrong address", "http://localhost:8080/rs", sfb.getAddress());
+        assertEquals("Get a wrong address", "http://localhost:9090/rs", sfb.getAddress());
         assertNotNull("The resource classes should not be null", sfb.getResourceClasses());
         assertEquals("Get a wrong resource class", BookStore.class, sfb.getResourceClasses().get(0));
         assertEquals(new QName("http://books.com", "BookService"), 

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml?rev=1080367&r1=1080366&r2=1080367&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml
Thu Mar 10 21:51:51 2011
@@ -40,9 +40,10 @@ http://cxf.apache.org/jaxrs http://cxf.a
   <jaxrs:server xmlns:s="http://books.com" serviceName="s:BookService" 
         id="simple" 
         serviceClass="org.apache.cxf.jaxrs.resources.BookStore"         
-        address="http://localhost:8080/rs"/>
+        address="http://localhost:9090/rs"/>
   
-  <jaxrs:server id="inlineServiceBeans" address="http://localhost:8080/simpleWithAddress10">
+  <jaxrs:server id="inlineServiceBeans" 
+                address="http://localhost:9090/simpleWithAddress10">
     <jaxrs:serviceBeans>
       <bean class="org.apache.cxf.jaxrs.resources.BookStore"/>
       <bean class="org.apache.cxf.jaxrs.resources.BookStoreSubresourcesOnly"/>    
 
@@ -51,7 +52,7 @@ http://cxf.apache.org/jaxrs http://cxf.a
   
   <jaxrs:server id="inlineProvider"
     serviceClass="org.apache.cxf.jaxrs.resources.BookStore"
-    address="http://localhost:8080/simpleWithAddress"
+    address="http://localhost:9090/simpleWithAddress"
     bus="cxf" staticSubresourceResolution="false">
     <jaxrs:providers>
         <ref bean="feed"/>
@@ -76,7 +77,7 @@ http://cxf.apache.org/jaxrs http://cxf.a
   
   <jaxrs:server id="moduleServer"
     modelRef="classpath:/org/apache/cxf/jaxrs/spring/resources.xml"
-    address="http://localhost:8080/simpleWithAddress"
+    address="http://localhost:9090/simpleWithAddress"
     bus="cxf"/>
   
 </beans>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml?rev=1080367&r1=1080366&r2=1080367&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers2.xml
Thu Mar 10 21:51:51 2011
@@ -36,7 +36,8 @@ http://cxf.apache.org/jaxrs http://cxf.a
       </property>
   </bean>
   
-  <jaxrs:server id="server1" address="http://localhost:8080/simpleWithAddress10"
+  <jaxrs:server id="server1" 
+     address="http://localhost:9090/simpleWithAddress10"
      beanNames="bookstore3 bookstore4">
     <jaxrs:serviceFactories>
        <ref bean="sfactory1"/>



Mime
View raw message