You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2012/08/22 15:10:38 UTC

svn commit: r1376029 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java

Author: dkulp
Date: Wed Aug 22 13:10:38 2012
New Revision: 1376029

URL: http://svn.apache.org/viewvc?rev=1376029&view=rev
Log:
Fix a merge conflict issue

Modified:
    cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java

Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=1376029&r1=1376028&r2=1376029&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java Wed Aug 22 13:10:38 2012
@@ -234,13 +234,6 @@ public final class SecurityConstants {
         "ws-security.cache.config.file";
     
     /**
-<<<<<<< HEAD
-     * This configuration tag is a comma separated String of regular expressions which
-     * will be applied to the subject DN of the certificate used for signature
-     * validation, after trust verification of the certificate chain associated with the 
-     * certificate. These constraints are not used when the certificate is contained in
-     * the keystore (direct trust).
-=======
      * The TokenStore instance to use to cache security tokens. By default this uses the
      * EHCacheTokenStore if EhCache is available. Otherwise it uses the MemoryTokenStore.
      */
@@ -252,7 +245,6 @@ public final class SecurityConstants {
      * the certificate used for signature validation, after trust verification of the certificate 
      * chain associated with the  certificate. These constraints are not used when the certificate 
      * is contained in the keystore (direct trust).
->>>>>>> 8d01268... Merged revisions 1368875 via  git cherry-pick from
      */
     public static final String SUBJECT_CERT_CONSTRAINTS = "ws-security.subject.cert.constraints";