Return-Path: 
 <commits-return-19981-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 E5A199B2C
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 23 May 2012 08:32:49 +0000 (UTC)
Received: (qmail 21467 invoked by uid 500); 23 May 2012 08:32:49 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 21408 invoked by uid 500); 23 May 2012 08:32:48 -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 21383 invoked by uid 99); 23 May 2012 08:32:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2012 08:32:47 +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; Wed, 23 May 2012 08:32:44 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A4B752388865;
	Wed, 23 May 2012 08:32:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1341784 - in /cxf/branches/2.4.x-fixes: ./
 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
 systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
Date: Wed, 23 May 2012 08:32:23 -0000
To: commits@cxf.apache.org
From: ffang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120523083223.A4B752388865@eris.apache.org>

Author: ffang
Date: Wed May 23 08:32:23 2012
New Revision: 1341784

URL: http://svn.apache.org/viewvc?rev=1341784&view=rev
Log:
Merged revisions 1341781 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1341781 | ffang | 2012-05-23 16:23:37 +0800 (三, 23  5 2012) | 9 lines
  
  Merged revisions 1341775 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1341775 | ffang | 2012-05-23 16:11:49 +0800 (三, 23  5 2012) | 1 line
    
    [CXF-4335]WSSecTest use some unecessary properties for WSS4JInterceptor configuration
  ........
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
    cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml

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

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml?rev=1341784&r1=1341783&r2=1341784&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml Wed May 23 08:32:23 2012
@@ -56,10 +56,8 @@
       <map>
         <entry key="action" value="UsernameToken Timestamp Signature"/> 
         <entry key="passwordType" value="PasswordText"/>
-	<entry key="user" value="serverx509v1"/>
         <entry key="passwordCallbackClass" value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback"/> 
         <entry key="signaturePropFile" value="org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties"/>
-        <entry key="signatureKeyIdentifier" value="DirectReference"/>
       </map>
     </constructor-arg>
   </bean>

Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml?rev=1341784&r1=1341783&r2=1341784&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml Wed May 23 08:32:23 2012
@@ -34,12 +34,10 @@
 			<map>
 				<entry key="action" value="UsernameToken Timestamp Signature" />
 				<entry key="passwordType" value="PasswordDigest" />
-				<entry key="user" value="serverx509v1" />
 				<entry key="passwordCallbackClass"
 					value="org.apache.cxf.systest.ws.security.handler.UsernamePasswordCallback" />
 				<entry key="signaturePropFile"
 					value="org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties" />
-				<entry key="signatureKeyIdentifier" value="DirectReference" />
 			</map>
 		</constructor-arg>
 	</bean>