Return-Path: 
 <commits-return-10685-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 90749 invoked from network); 17 Dec 2009 22:20:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Dec 2009 22:20:03 -0000
Received: (qmail 32740 invoked by uid 500); 17 Dec 2009 22:20:03 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 32634 invoked by uid 500); 17 Dec 2009 22:20:03 -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 32625 invoked by uid 99); 17 Dec 2009 22:20:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 22:20:03 +0000
X-ASF-Spam-Status: No, hits=-2.7 required=5.0
	tests=AWL,BAYES_00
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; Thu, 17 Dec 2009 22:19:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5B2292388A6B; Thu, 17 Dec 2009 22:19:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r891953 - in /cxf/branches/2.2.x-fixes: ./ parent/pom.xml
 rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
 rt/transports/jms/pom.xml
Date: Thu, 17 Dec 2009 22:19:36 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091217221936.5B2292388A6B@eris.apache.org>

Author: dkulp
Date: Thu Dec 17 22:19:35 2009
New Revision: 891953

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

........
  r891945 | dkulp | 2009-12-17 17:11:59 -0500 (Thu, 17 Dec 2009) | 3 lines
  
  Add profile to test with Spring 3
  Fix a compile issue with Spring 3.   Lots of warnings with Spring 3
  mostly due to deprecation, but compile errors are gone.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
    cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 22:19:35 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945

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

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=891953&r1=891952&r2=891953&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Thu Dec 17 22:19:35 2009
@@ -1375,10 +1375,9 @@
             </build>
         </profile>
         <profile>
-            <id>spring2.0</id>
+            <id>spring3</id>
             <properties>
-                <spring.version>2.0.8</spring.version>
-                <spring.mock>spring-mock</spring.mock>
+                <spring.version>3.0.0.RELEASE</spring.version>
             </properties>
         </profile> 
         <profile>

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml?rev=891953&r1=891952&r2=891953&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml Thu Dec 17 22:19:35 2009
@@ -29,7 +29,7 @@
 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
 
 	<bean class="org.apache.cxf.jaxws.spring.ClientHolderBean" id="greeters"
-		autowire="autodetect">
+		autowire="default">
 		<property name="greet1">
 			<jaxws:client
 				serviceClass="org.apache.hello_world_soap_http.Greeter" serviceName="s:SOAPService"

Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml?rev=891953&r1=891952&r2=891953&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml Thu Dec 17 22:19:35 2009
@@ -102,6 +102,11 @@
         	<artifactId>spring-jms</artifactId>
         	<version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>