Return-Path: 
 <commits-return-39827-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 36DC118406
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed,  6 Jan 2016 15:39:39 +0000 (UTC)
Received: (qmail 40214 invoked by uid 500); 6 Jan 2016 15:39:39 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 40135 invoked by uid 500); 6 Jan 2016 15:39:39 -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 39967 invoked by uid 99); 6 Jan 2016 15:39:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2016 15:39:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id DBCEBE0AF3; Wed,  6 Jan 2016 15:39:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Wed, 06 Jan 2016 15:39:40 -0000
Message-Id: <25563b03df354041bf1e3b6c6d5f706c@git.apache.org>
In-Reply-To: <ecbd6f12ff09410ca710ea5d9c73bf2b@git.apache.org>
References: <ecbd6f12ff09410ca710ea5d9c73bf2b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] cxf git commit: Fixing merge

Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c2e2c830
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c2e2c830
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c2e2c830

Branch: refs/heads/3.0.x-fixes
Commit: c2e2c830d03f0684204af38d425d4bd8bf98ca58
Parents: 7d259b1
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Jan 6 15:39:28 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Jan 6 15:39:28 2016 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml   | 6 +++---
 .../org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml  | 4 ++--
 .../apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c2e2c830/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
index 8d82e71..a30e469 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
@@ -58,9 +58,9 @@
     
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2SupportingPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
-            <entry key="security.encryption.username" value="myservicekey"/>
-            <entry key="security.sts.client" value-ref="stsClient"/>
+            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="ws-security.encryption.username" value="myservicekey"/>
+            <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/c2e2c830/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
index ed9815b..1533cca 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
@@ -77,8 +77,8 @@
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2SupportingPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.Server}/doubleit/services/doubleitsymmetricsaml2supporting" wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
+            <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.is-bsp-compliant" value="false"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/c2e2c830/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
index d49b196..2b7beec 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
@@ -80,8 +80,8 @@
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2SupportingPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2supporting" wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
+            <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.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>