cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1445091 - /cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Date Tue, 12 Feb 2013 10:24:47 GMT
Author: coheigea
Date: Tue Feb 12 10:24:47 2013
New Revision: 1445091

URL: http://svn.apache.org/r1445091
Log:
Merged revisions 1445088 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1445088 | coheigea | 2013-02-12 10:21:21 +0000 (Tue, 12 Feb 2013) | 10 lines

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

  ........
    r1445084 | coheigea | 2013-02-12 10:16:42 +0000 (Tue, 12 Feb 2013) | 2 lines

    Adding a sample configuration of loading a Crypto file via the Spring factory method approach

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml

Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1445091&r1=1445090&r2=1445091&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
(original)
+++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Tue Feb 12 10:24:47 2013
@@ -19,6 +19,7 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
     xmlns:jaxws="http://cxf.apache.org/jaxws"
     xmlns:http="http://cxf.apache.org/transports/http/configuration"
     xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
@@ -27,6 +28,7 @@
     xmlns:p="http://cxf.apache.org/policy"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans                     http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
         http://cxf.apache.org/jaxws                                     http://cxf.apache.org/schemas/jaxws.xsd
         http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
         http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
@@ -78,12 +80,19 @@
        <jaxws:properties>
           <entry key="ws-security.callback-handler" 
                   value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
-          <entry key="ws-security.signature.properties" 
-                  value="org/apache/cxf/systest/ws/wssec10/client/bob.properties"/> 
+          <entry key="ws-security.signature.crypto" value-ref="crypto"/>
        </jaxws:properties> 
      
     </jaxws:endpoint> 
     
+    <bean id="crypto" class="org.apache.ws.security.components.crypto.CryptoFactory" 
+        factory-method="getInstance">
+        <constructor-arg>
+            <util:properties id="cryptoProperties" 
+                     location="classpath:org/apache/cxf/systest/ws/wssec10/client/bob.properties"/>
+        </constructor-arg>
+    </bean>
+    
     <jaxws:endpoint 
        id="KeyIdentifier2"
        address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier2" 



Mime
View raw message