svn commit: r1569777 - /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java

[coheigea]

Author: coheigea
Date: Wed Feb 19 14:58:29 2014
New Revision: 1569777

URL: http://svn.apache.org/r1569777
Log:
Removing the encryption key identifier, which we are now picking up from 
Santuario

Modified:
    
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java?rev=1569777&r1=1569776&r2=1569777&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
 Wed Feb 19 14:58:29 2014
@@ -104,7 +104,6 @@ public class WSSSecurityProperties exten
     private WSSCrypto decryptionWSSCrypto;
     private WSSCrypto encryptionWSSCrypto;
     private String encryptionUser;
-    private WSSecurityTokenConstants.KeyIdentifier encryptionKeyIdentifier;
     private boolean useReqSigCertForEncryption = false;
     private String encryptionCompressionAlgorithm;
     private boolean enableRevocation = false;
@@ -158,7 +157,6 @@ public class WSSSecurityProperties exten
         this.decryptionWSSCrypto = wssSecurityProperties.decryptionWSSCrypto;
         this.encryptionWSSCrypto = wssSecurityProperties.encryptionWSSCrypto;
         this.encryptionUser = wssSecurityProperties.encryptionUser;
-        this.encryptionKeyIdentifier = 
wssSecurityProperties.encryptionKeyIdentifier;
         this.useReqSigCertForEncryption = 
wssSecurityProperties.useReqSigCertForEncryption;
         this.encryptionCompressionAlgorithm = 
wssSecurityProperties.encryptionCompressionAlgorithm;
         this.enableRevocation = wssSecurityProperties.enableRevocation;
@@ -199,24 +197,6 @@ public class WSSSecurityProperties exten
         this.callbackHandler = callbackHandler;
     }
 
-    /**
-     * returns the KeyIdentifierType which will be used in the secured document
-     *
-     * @return The KeyIdentifierType
-     */
-    public WSSecurityTokenConstants.KeyIdentifier getEncryptionKeyIdentifier() 
{
-        return encryptionKeyIdentifier;
-    }
-
-    /**
-     * Specifies the KeyIdentifierType to use in the secured document
-     *
-     * @param encryptionKeyIdentifier
-     */
-    public void 
setEncryptionKeyIdentifier(WSSecurityTokenConstants.KeyIdentifier 
encryptionKeyIdentifier) {
-        this.encryptionKeyIdentifier = encryptionKeyIdentifier;
-    }
-
     public Integer getTimestampTTL() {
         return timestampTTL;
     }