ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1549603 - in /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax: ConfigurationConverter.java WSSec.java ext/OutboundWSSec.java ext/WSSSecurityProperties.java impl/processor/output/EncryptEndingOutputProcessor.java
Date Mon, 09 Dec 2013 16:20:38 GMT
Author: coheigea
Date: Mon Dec  9 16:20:38 2013
New Revision: 1549603

URL: http://svn.apache.org/r1549603
Log:
Spelling correction

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java?rev=1549603&r1=1549602&r2=1549603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
Mon Dec  9 16:20:38 2013
@@ -458,7 +458,7 @@ public final class ConfigurationConverte
         
         boolean encryptSymmetricEncryptionKey = 
             decodeBooleanConfigValue(ConfigurationConstants.ENC_SYM_ENC_KEY, true, config);
-        properties.setEncryptSymmetricEncrytionKey(encryptSymmetricEncryptionKey);
+        properties.setEncryptSymmetricEncryptionKey(encryptSymmetricEncryptionKey);
         
         boolean use200512Namespace = 
             decodeBooleanConfigValue(ConfigurationConstants.USE_2005_12_NAMESPACE, true,
config);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1549603&r1=1549602&r2=1549603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
Mon Dec  9 16:20:38 2013
@@ -139,14 +139,14 @@ public class WSSec {
                         && securityProperties.getEncryptionKeyStore() == null
                         && securityProperties.getEncryptionCryptoProperties() ==
null
                         && !securityProperties.isUseReqSigCertForEncryption()
-                        && securityProperties.isEncryptSymmetricEncrytionKey()
+                        && securityProperties.isEncryptSymmetricEncryptionKey()
                         && securityProperties.getEncryptionCrypto() == null) {
                     throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE,
"encryptionKeyStoreNotSet");
                 }
                 if (securityProperties.getEncryptionUser() == null
                         && securityProperties.getEncryptionUseThisCertificate() ==
null
                         && !securityProperties.isUseReqSigCertForEncryption()
-                        && securityProperties.isEncryptSymmetricEncrytionKey()) {
+                        && securityProperties.isEncryptSymmetricEncryptionKey())
{
                     throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE,
"noEncryptionUser");
                 }
                 if (securityProperties.getEncryptionSymAlgorithm() == null) {
@@ -237,14 +237,14 @@ public class WSSec {
                         && securityProperties.getEncryptionKeyStore() == null
                         && securityProperties.getEncryptionCryptoProperties() ==
null
                         && !securityProperties.isUseReqSigCertForEncryption()
-                        && securityProperties.isEncryptSymmetricEncrytionKey()
+                        && securityProperties.isEncryptSymmetricEncryptionKey()
                         && securityProperties.getEncryptionCrypto() == null) {
                     throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE,
"encryptionKeyStoreNotSet");
                 }
                 if (securityProperties.getEncryptionUser() == null
                         && securityProperties.getEncryptionUseThisCertificate() ==
null
                         && !securityProperties.isUseReqSigCertForEncryption()
-                        && securityProperties.isEncryptSymmetricEncrytionKey()) {
+                        && securityProperties.isEncryptSymmetricEncryptionKey())
{
                     throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE,
"noEncryptionUser");
                 }
                 if (securityProperties.getEncryptionSymAlgorithm() == null) {

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java?rev=1549603&r1=1549602&r2=1549603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java
Mon Dec  9 16:20:38 2013
@@ -195,7 +195,7 @@ public class OutboundWSSec {
 
                 } else if (WSSConstants.ENCRYPT.equals(action)) {
                     encryptionAction = true;
-                    if (securityProperties.isEncryptSymmetricEncrytionKey()) {
+                    if (securityProperties.isEncryptSymmetricEncryptionKey()) {
                         final BinarySecurityTokenOutputProcessor binarySecurityTokenOutputProcessor
=
                             new BinarySecurityTokenOutputProcessor();
                         initializeOutputProcessor(outputProcessorChain, binarySecurityTokenOutputProcessor,
action);
@@ -500,7 +500,7 @@ public class OutboundWSSec {
             outputProcessorChain.getSecurityContext().put(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_ENCRYPTION,
symmId);
         }
         
-        if (!securityProperties.isEncryptSymmetricEncrytionKey()) {
+        if (!securityProperties.isEncryptSymmetricEncryptionKey()) {
             // No EncryptedKey Token required here, so return
             return;
         }

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=1549603&r1=1549602&r2=1549603&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
Mon Dec  9 16:20:38 2013
@@ -904,11 +904,11 @@ public class WSSSecurityProperties exten
         this.enableSamlOneTimeUseReplayCache = enableSamlOneTimeUseReplayCache;
     }
 
-    public boolean isEncryptSymmetricEncrytionKey() {
+    public boolean isEncryptSymmetricEncryptionKey() {
         return encryptSymmetricEncrytionKey;
     }
 
-    public void setEncryptSymmetricEncrytionKey(boolean encryptSymmetricEncrytionKey) {
+    public void setEncryptSymmetricEncryptionKey(boolean encryptSymmetricEncrytionKey) {
         this.encryptSymmetricEncrytionKey = encryptSymmetricEncrytionKey;
     }
     

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java?rev=1549603&r1=1549602&r2=1549603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
Mon Dec  9 16:20:38 2013
@@ -47,7 +47,7 @@ public class EncryptEndingOutputProcesso
     public void processHeaderEvent(OutputProcessorChain outputProcessorChain) throws XMLStreamException,
XMLSecurityException {
         OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
         if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(getAction())
-            || !((WSSSecurityProperties)getSecurityProperties()).isEncryptSymmetricEncrytionKey())
{
+            || !((WSSSecurityProperties)getSecurityProperties()).isEncryptSymmetricEncryptionKey())
{
             WSSUtils.createReferenceListStructureForEncryption(this, subOutputProcessorChain);
         }
         if (attachmentCount(outputProcessorChain) > 0) {
@@ -71,7 +71,7 @@ public class EncryptEndingOutputProcesso
                     if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, actor)) {
 
                         if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(getAction())
-                            || !((WSSSecurityProperties)getSecurityProperties()).isEncryptSymmetricEncrytionKey())
{
+                            || !((WSSSecurityProperties)getSecurityProperties()).isEncryptSymmetricEncryptionKey())
{
                             WSSUtils.updateSecurityHeaderOrder(
                                     outputProcessorChain, WSSConstants.TAG_xenc_ReferenceList,
getAction(), true);                            
                         }



Mime
View raw message