http://git-wip-us.apache.org/repos/asf/cxf/blob/30119990/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
index 188d05c..64219eb 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
@@ -138,7 +138,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         try {
             saml1Port.doubleIt(25);
@@ -149,7 +149,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
 
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false)
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
@@ -160,7 +160,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         updateAddressPort(saml1Port, PORT2);
         
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false)
         );
         
         try {
@@ -203,7 +203,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler samlCallbackHandler = new 
SamlCallbackHandler(false, true);
         samlCallbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER);
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", samlCallbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, samlCallbackHandler
         );
         
         int result = saml1Port.doubleIt(25);
@@ -242,7 +242,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(false, 
true);
         callbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER);
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         ((BindingProvider)saml1Port).getRequestContext().put(
@@ -296,7 +296,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new 
SamlElementCallbackHandler(false)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlElementCallbackHandler(false)
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
@@ -334,7 +334,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false)
         );
         try {
             saml2Port.doubleIt(25);
@@ -347,7 +347,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler samlCallbackHandler = new SamlCallbackHandler();
         samlCallbackHandler.setSignAssertion(true);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", samlCallbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, samlCallbackHandler
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
@@ -381,7 +381,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
 
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         
         try {
@@ -425,7 +425,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false)
         );
         try {
             saml2Port.doubleIt(25);
@@ -436,7 +436,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
@@ -447,7 +447,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         updateAddressPort(saml2Port, PORT);
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         
         try {
@@ -488,7 +488,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false, 
true)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false, true)
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
@@ -523,7 +523,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml1Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler(false, 
true)
+            SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler(false, true)
         );
         int result = saml1Port.doubleIt(25);
         assertTrue(result == 50);
@@ -556,7 +556,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
@@ -590,7 +590,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         if (!test.isStreaming() && PORT.equals(test.getPort())) {
             SamlCallbackHandler samlCallbackHandler = new 
SamlCallbackHandler();
             ((BindingProvider)saml2Port).getRequestContext().put(
-                "security.saml-callback-handler", samlCallbackHandler
+                SecurityConstants.SAML_CALLBACK_HANDLER, samlCallbackHandler
             );
             int result = saml2Port.doubleIt(25);
             assertTrue(result == 50);
@@ -628,7 +628,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
 
         int result = saml2Port.doubleIt(25);
@@ -667,7 +667,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         callbackHandler.setKeyInfoIdentifier(CERT_IDENTIFIER.KEY_VALUE);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
 
         int result = saml2Port.doubleIt(25);
@@ -705,7 +705,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
 
         int result = saml2Port.doubleIt(25);
@@ -737,7 +737,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
@@ -771,7 +771,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         // TODO Only working for DOM client + server atm
         if (!test.isStreaming() && PORT.equals(test.getPort())) {
             ((BindingProvider)saml2Port).getRequestContext().put(
-                "security.saml-callback-handler", new SamlCallbackHandler()
+                SecurityConstants.SAML_CALLBACK_HANDLER, new 
SamlCallbackHandler()
             );
             int result = saml2Port.doubleIt(25);
             assertTrue(result == 50);
@@ -805,7 +805,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         int result = saml2Port.doubleIt(25);
         assertTrue(result == 50);
@@ -842,7 +842,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
 
         int result = saml2Port.doubleIt(25);
@@ -921,7 +921,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         roleCallbackHandler.setSignAssertion(true);
         roleCallbackHandler.setRoleName("manager");
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", roleCallbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, roleCallbackHandler
         );
         
         int result = saml2Port.doubleIt(25);
@@ -963,7 +963,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
 
         // Create a SAML Token with no "OneTimeUse" Condition
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", new SamlCallbackHandler()
+            SecurityConstants.SAML_CALLBACK_HANDLER, new SamlCallbackHandler()
         );
         
         Client cxfClient = ClientProxy.getClient(saml2Port);
@@ -984,7 +984,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setConditions(conditions);
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         cxfClient.getOutInterceptors().remove(cacheInterceptor);
@@ -1038,7 +1038,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
         callbackHandler.setConditions(conditions);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         saml2Port.doubleIt(25);
@@ -1093,7 +1093,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
         callbackHandler.setConditions(conditions);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         saml2Port.doubleIt(25);
@@ -1132,7 +1132,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
         callbackHandler.setConditions(conditions);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         // It should fail with validation enabled
@@ -1149,7 +1149,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         updateAddressPort(saml2Port, portNumber);
         
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         saml2Port.doubleIt(25);
     }
@@ -1184,7 +1184,7 @@ public class SamlTokenTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setDigestAlgorithm(WSConstants.SHA256);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)saml2Port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
 
         int result = saml2Port.doubleIt(25);

http://git-wip-us.apache.org/repos/asf/cxf/blob/30119990/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
index fbdfbff..5c14d7a 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.rt.security.SecurityConstants;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.systest.ws.saml.client.SamlCallbackHandler;
@@ -117,7 +118,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setCryptoPropertiesFile("morpit.properties");
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         int result = port.doubleIt(25);
         assertTrue(result == 50);
@@ -131,7 +132,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setCryptoPropertiesFile("morpit.properties");
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         try {
             port.doubleIt(25);
@@ -165,7 +166,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, 
true);
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         try {
@@ -205,7 +206,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setCryptoPropertiesFile("morpit.properties");
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         try {
             port.doubleIt(25);
@@ -244,7 +245,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         int result = port.doubleIt(25);
         assertTrue(result == 50);
@@ -275,7 +276,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES);
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         try {
             port.doubleIt(25);
@@ -318,7 +319,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setCryptoPropertiesFile("morpit.properties");
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         int result = port.doubleIt(25);
         assertTrue(result == 50);
@@ -349,7 +350,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         try {
@@ -385,7 +386,7 @@ public class SamlSubjectConfTest extends 
AbstractBusClientServerTestBase {
         
callbackHandler.setConfirmationMethod("urn:oasis:names:tc:SAML:2.0:cm:custom");
         
         ((BindingProvider)port).getRequestContext().put(
-            "security.saml-callback-handler", callbackHandler
+            SecurityConstants.SAML_CALLBACK_HANDLER, callbackHandler
         );
         
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/30119990/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index 3d52467..0a8812f 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -36,6 +36,7 @@ import javax.xml.ws.Service;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.rt.security.SecurityConstants;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -204,13 +205,19 @@ public class WSSCUnitTest extends 
AbstractBusClientServerTestBase {
         stsClient.setLocation("http://localhost:"; + PORT2 + "/" + 
"DoubleItSymmetric");
         
         stsClient.setPolicy(createSymmetricBindingPolicy());
+<<<<<<< HEAD
         
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("security.encryption.username", "bob");
+=======
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+>>>>>>> 428f770... Switching to use security constants in the tests instead of 
strings
         TokenCallbackHandler callbackHandler = new TokenCallbackHandler();
-        properties.put("security.callback-handler", callbackHandler);
-        properties.put("security.signature.properties", "alice.properties");
-        properties.put("security.encryption.properties", "bob.properties");
+        properties.put(SecurityConstants.CALLBACK_HANDLER, callbackHandler);
+        properties.put(SecurityConstants.SIGNATURE_PROPERTIES, 
"alice.properties");
+        properties.put(SecurityConstants.ENCRYPT_PROPERTIES, "bob.properties");
         stsClient.setProperties(properties);
         
         SecurityToken securityToken = 
@@ -239,13 +246,19 @@ public class WSSCUnitTest extends 
AbstractBusClientServerTestBase {
         stsClient.setLocation("http://localhost:"; + PORT2 + "/" + 
"DoubleItSymmetric");
         
         stsClient.setPolicy(createSymmetricBindingPolicy());
+<<<<<<< HEAD
         
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("security.encryption.username", "bob");
+=======
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+>>>>>>> 428f770... Switching to use security constants in the tests instead of 
strings
         TokenCallbackHandler callbackHandler = new TokenCallbackHandler();
-        properties.put("security.callback-handler", callbackHandler);
-        properties.put("security.signature.properties", "alice.properties");
-        properties.put("security.encryption.properties", "bob.properties");
+        properties.put(SecurityConstants.CALLBACK_HANDLER, callbackHandler);
+        properties.put(SecurityConstants.SIGNATURE_PROPERTIES, 
"alice.properties");
+        properties.put(SecurityConstants.ENCRYPT_PROPERTIES, "bob.properties");
         stsClient.setProperties(properties);
         
         SecurityToken securityToken = 

http://git-wip-us.apache.org/repos/asf/cxf/blob/30119990/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java
index 7b37a1d..b4a37a0 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java
@@ -23,6 +23,7 @@ import javax.jws.WebService;
 import org.apache.cxf.annotations.EndpointProperties;
 import org.apache.cxf.annotations.EndpointProperty;
 import org.apache.cxf.feature.Features;
+import org.apache.cxf.rt.security.SecurityConstants;
 
 import org.example.contract.doubleit.DoubleItFault;
 import org.example.contract.doubleit.DoubleItPortType;
@@ -33,10 +34,17 @@ import org.example.contract.doubleit.DoubleItPortType;
 @Features(features = "org.apache.cxf.feature.LoggingFeature")    
 
 @EndpointProperties({
+<<<<<<< HEAD
     @EndpointProperty(key = "security.encryption.username", value = "alice"),
     @EndpointProperty(key = "security.encryption.properties", value = 
"alice.properties"),
     @EndpointProperty(key = "security.signature.properties", value = 
"bob.properties"),
     @EndpointProperty(key = "security.callback-handler", 
+=======
+    @EndpointProperty(key = SecurityConstants.ENCRYPT_USERNAME, value = 
"alice"),
+    @EndpointProperty(key = SecurityConstants.ENCRYPT_PROPERTIES, value = 
"alice.properties"),
+    @EndpointProperty(key = SecurityConstants.SIGNATURE_PROPERTIES, value = 
"bob.properties"),
+    @EndpointProperty(key = SecurityConstants.CALLBACK_HANDLER,
+>>>>>>> 428f770... Switching to use security constants in the tests instead of 
strings
                       value = 
"org.apache.cxf.systest.ws.common.KeystorePasswordCallback")
 })
 public class DoubleItPropertiesImpl implements DoubleItPortType {

Reply via email to