You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/10/02 16:03:06 UTC
svn commit: r821023 [2/2] - in /cxf/branches/2.2.x-fixes: ./
common/common/src/main/java/org/apache/cxf/common/util/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/
rt/frontend/jaxrs/sr...
Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml?rev=821023&r1=821022&r2=821023&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml Fri Oct 2 14:03:05 2009
@@ -39,7 +39,14 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.BookStore"/>
+ <bean id="bookstoreInterface" class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface"/>
+ <bean id="exceptionMapper" class="org.apache.cxf.systest.jaxrs.BookExceptionMapper">
+ <property name="toHandle" value="true"/>
+ </bean>
+
<jaxrs:server id="bookservice"
address="/">
<jaxrs:serviceBeans>
@@ -50,11 +57,7 @@
<ref bean="exceptionMapper"/>
</jaxrs:providers>
</jaxrs:server>
- <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.BookStore"/>
- <bean id="bookstoreInterface" class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface"/>
- <bean id="exceptionMapper" class="org.apache.cxf.systest.jaxrs.BookExceptionMapper">
- <property name="toHandle" value="true"/>
- </bean>
+
<jaxrs:server id="bookservice2" address="/2"
modelRef="classpath:/org/apache/cxf/systest/jaxrs/resources/resources.xml">
<jaxrs:serviceBeans>
@@ -70,8 +73,44 @@
<ref bean="bookstore3"/>
</jaxrs:serviceBeans>
</jaxrs:server>
- <bean id="bookstore3" class="org.apache.cxf.systest.jaxrs.BookStoreNoAnnotationsImpl"/>
+
+ <jaxrs:server id="bookservice4" address="/4">
+ <jaxrs:serviceFactories>
+ <ref bean="sfactory1"/>
+ <ref bean="sfactory2"/>
+ </jaxrs:serviceFactories>
+ </jaxrs:server>
+
+ <jaxrs:server id="bookservice5" address="/5"
+ beanNames="bookstorePrototype bookstoreInterfacePrototype"/>
+ <jaxrs:server id="bookservice6" address="/6">
+ <jaxrs:serviceFactories>
+ <ref bean="sfactory5"/>
+ </jaxrs:serviceFactories>
+ <jaxrs:properties>
+ <entry key="org.apache.cxf.service.scope" value="request"/>
+ </jaxrs:properties>
+
+ </jaxrs:server>
+
+
+ <bean id="sfactory1" class="org.apache.cxf.jaxrs.spring.SpringResourceFactory">
+ <property name="beanId" value="bookstore"/>
+ </bean>
+
+ <bean id="sfactory2" class="org.apache.cxf.jaxrs.spring.SpringResourceFactory">
+ <property name="beanId" value="bookstoreInterface"/>
+ </bean>
+
+ <bean id="sfactory5" class="org.apache.cxf.jaxrs.spring.SpringResourceFactory">
+ <property name="beanId" value="bookstoreInterface2Prototype"/>
+ </bean>
+ <bean id="bookstorePrototype" class="org.apache.cxf.systest.jaxrs.BookStore" scope="prototype"/>
+ <bean id="bookstoreInterface2Prototype" class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface2" scope="prototype"/>
+ <bean id="bookstore3" class="org.apache.cxf.systest.jaxrs.BookStoreNoAnnotationsImpl"/>
+
+ <bean id="bookstoreInterfacePrototype" class="org.apache.cxf.systest.jaxrs.BookStoreWithInterface" scope="prototype"/>
<aop:config>
<aop:aspect id="loggingAspect" ref="simpleLogger">
<aop:before