Return-Path: 
 <commits-return-24878-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 62CE6EF02
	for <apmail-cxf-commits-archive@www.apache.org>;
 Tue, 12 Feb 2013 10:50:21 +0000 (UTC)
Received: (qmail 52350 invoked by uid 500); 12 Feb 2013 10:50:20 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 52008 invoked by uid 500); 12 Feb 2013 10:50:16 -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 51912 invoked by uid 99); 12 Feb 2013 10:50:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2013 10:50:15 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 12 Feb 2013 10:50:13 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DFC2D238890B;
	Tue, 12 Feb 2013 10:49:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1445096 -
 /cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Date: Tue, 12 Feb 2013 10:49:54 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130212104954.DFC2D238890B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Tue Feb 12 10:49:54 2013
New Revision: 1445096

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

........
  r1445091 | coheigea | 2013-02-12 10:24:47 +0000 (Tue, 12 Feb 2013) | 18 lines

  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.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml

Modified: cxf/branches/2.5.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.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1445096&r1=1445095&r2=1445096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Tue Feb 12 10:49:54 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"