cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Fixing build
Date Wed, 15 Jul 2015 16:16:54 GMT
Fixing build


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

Branch: refs/heads/3.0.x-fixes
Commit: 0d3318d2cb5fc0e7c20e14dcc242865ef11175d5
Parents: 418a19b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Jul 15 17:15:55 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Jul 15 17:15:55 2015 +0100

----------------------------------------------------------------------
 .../rs/security/xml/XmlSecInInterceptor.java    | 38 ++++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0d3318d2/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
index 03c4dd9..21b431b 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
@@ -240,19 +240,19 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
         if (XMLSecurityConstants.Enc.equals(event.getAlgorithmUsage())
             && encryptionProperties.getEncryptionSymmetricKeyAlgo() != null
             && !encryptionProperties.getEncryptionSymmetricKeyAlgo().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The symmetric encryption algorithm "
-                                           + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The symmetric encryption
algorithm "
+                                           + event.getAlgorithmURI() + " is not allowed"});
         } else if ((XMLSecurityConstants.Sym_Key_Wrap.equals(event.getAlgorithmUsage())
             || XMLSecurityConstants.Asym_Key_Wrap.equals(event.getAlgorithmUsage()))
             && encryptionProperties.getEncryptionKeyTransportAlgo() != null
             && !encryptionProperties.getEncryptionKeyTransportAlgo().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The key transport algorithm "
-                + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The key transport algorithm
"
+                    + event.getAlgorithmURI() + " is not allowed"});
         } else if (XMLSecurityConstants.EncDig.equals(event.getAlgorithmUsage())
             && encryptionProperties.getEncryptionDigestAlgo() != null
             && !encryptionProperties.getEncryptionDigestAlgo().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The encryption digest algorithm "
-                + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The encryption digest
algorithm "
+                    + event.getAlgorithmURI() + " is not allowed"});
         }
     }
     
@@ -262,24 +262,24 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
             || XMLSecurityConstants.Sym_Sig.equals(event.getAlgorithmUsage()))
             && sigProps.getSignatureAlgo() != null
             && !sigProps.getSignatureAlgo().equals(event.getAlgorithmURI())) {
-            throw new XMLSecurityException("empty", "The signature algorithm "
-                                           + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The signature algorithm
"
+                                           + event.getAlgorithmURI() + " is not allowed"});
         } else if (XMLSecurityConstants.SigDig.equals(event.getAlgorithmUsage())
             && sigProps.getSignatureDigestAlgo() != null
             && !sigProps.getSignatureDigestAlgo().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The signature digest algorithm "
-                + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The signature digest algorithm
"
+                    + event.getAlgorithmURI() + " is not allowed"});
         } else if (XMLSecurityConstants.SigC14n.equals(event.getAlgorithmUsage())
             && sigProps.getSignatureC14nMethod() != null
             && !sigProps.getSignatureC14nMethod().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The signature c14n algorithm "
-                + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The signature c14n algorithm
"
+                    + event.getAlgorithmURI() + " is not allowed"});
         } else if (XMLSecurityConstants.SigTransform.equals(event.getAlgorithmUsage())
             && !XMLSecurityConstants.NS_XMLDSIG_ENVELOPED_SIGNATURE.equals(event.getAlgorithmURI())
             && sigProps.getSignatureC14nTransform() != null
             && !sigProps.getSignatureC14nTransform().equals(event.getAlgorithmURI()))
{
-            throw new XMLSecurityException("empty", "The signature transformation algorithm
"
-                + event.getAlgorithmURI() + " is not allowed");
+            throw new XMLSecurityException("empty", new Object[] {"The signature transformation
algorithm "
+                    + event.getAlgorithmURI() + " is not allowed"});
         }
     }
     
@@ -299,8 +299,8 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
             try {
                 new TrustValidator().validateTrust(sigCrypto, cert, publicKey, subjectDNPatterns);
             } catch (WSSecurityException e) {
-                throw new XMLSecurityException("empty", "Error during Signature Trust "
-                                               + "validation: " + e.getMessage());
+                throw new XMLSecurityException("empty", new Object[] {"Error during Signature
Trust "
+                                               + "validation: " + e.getMessage()});
             }
             
             if (persistSignature) {
@@ -408,7 +408,7 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
             if (incomingSecurityEventList == null) {
                 LOG.warning("Security processing failed (actions mismatch)");
                 XMLSecurityException ex = 
-                    new XMLSecurityException("empty", "The request was not signed or encrypted");
+                    new XMLSecurityException("empty", new Object[] {"The request was not
signed or encrypted"});
                 throwFault(ex.getMessage(), ex);
             }
             
@@ -417,7 +417,7 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
                 if (!isEventInResults(requiredEvent, incomingSecurityEventList)) {
                     LOG.warning("The request was not signed");
                     XMLSecurityException ex = 
-                        new XMLSecurityException("empty", "The request was not signed");
+                        new XMLSecurityException("empty", new Object[] {"The request was
not signed"});
                     throwFault(ex.getMessage(), ex);
                 }
             }
@@ -428,7 +428,7 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message>
{
                 if (!foundEncryptionPart) {
                     LOG.warning("The request was not encrypted");
                     XMLSecurityException ex = 
-                        new XMLSecurityException("empty", "The request was not encrypted");
+                        new XMLSecurityException("empty", new Object[] {"The request was
not encrypted"});
                     throwFault(ex.getMessage(), ex);
                 }
             }


Mime
View raw message