cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1353478 - in /cxf/branches/2.5.x-fixes/services/sts/systests: advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
Date Mon, 25 Jun 2012 11:52:11 GMT
Author: coheigea
Date: Mon Jun 25 11:52:10 2012
New Revision: 1353478

URL: http://svn.apache.org/viewvc?rev=1353478&view=rev
Log:
Merged revisions 1353461 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1353461 | coheigea | 2012-06-25 12:16:59 +0100 (Mon, 25 Jun 2012) | 10 lines

  Merged revisions 1353459 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1353459 | coheigea | 2012-06-25 12:13:38 +0100 (Mon, 25 Jun 2012) | 2 lines

    Simplified test config for the STS systests

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
    cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/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/binarysecuritytoken/cxf-service.xml?rev=1353478&r1=1353477&r2=1353478&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
Mon Jun 25 11:52:10 2012
@@ -62,7 +62,6 @@
            <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-           <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
          
            <entry key="ws-security.sts.client">

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml?rev=1353478&r1=1353477&r2=1353478&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
Mon Jun 25 11:52:10 2012
@@ -52,7 +52,6 @@
          <entry key="ws-security.callback-handler" 
                 value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
          <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-         <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
       </jaxws:properties> 
    </jaxws:endpoint>
    
@@ -69,7 +68,6 @@
          <entry key="ws-security.callback-handler" 
                 value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
          <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-         <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
       </jaxws:properties> 
    </jaxws:endpoint>
    
@@ -86,7 +84,6 @@
          <entry key="ws-security.callback-handler" 
                 value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
          <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-         <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
          <entry key="ws-security.is-bsp-compliant" value="false"/>
       </jaxws:properties> 
    </jaxws:endpoint>



Mime
View raw message