Return-Path: 
 <commits-return-9896-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 43582 invoked from network); 2 Oct 2009 14:03:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 2 Oct 2009 14:03:32 -0000
Received: (qmail 76110 invoked by uid 500); 2 Oct 2009 14:03:32 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 76020 invoked by uid 500); 2 Oct 2009 14:03:31 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 76011 invoked by uid 99); 2 Oct 2009 14:03:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Oct 2009 14:03:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Oct 2009 14:03:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 78EF323888D8; Fri,  2 Oct 2009 14:03:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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...
Date: Fri, 02 Oct 2009 14:03:06 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091002140307.78EF323888D8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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