Author: coheigea Date: Mon Mar 4 11:51:42 2013 New Revision: 1452268 URL: http://svn.apache.org/r1452268 Log: Merged revisions 1452266 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1452266 | coheigea | 2013-03-04 11:49:49 +0000 (Mon, 04 Mar 2013) | 18 lines Merged revisions 1452264 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1452264 | coheigea | 2013-03-04 11:48:33 +0000 (Mon, 04 Mar 2013) | 10 lines Merged revisions 1452263 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1452263 | coheigea | 2013-03-04 11:45:58 +0000 (Mon, 04 Mar 2013) | 2 lines Use standard port type impl for client-caching cases ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml?rev=1452268&r1=1452267&r2=1452268&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml Mon Mar 4 11:51:42 2013 @@ -40,7 +40,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint id="doubleittransportsaml1" - implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" + implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" @@ -59,7 +59,7 @@ </jaxws:endpoint> <jaxws:endpoint id="doubleittransportsaml12" - implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" + implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port2" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings"
