You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2017/02/13 14:37:11 UTC

svn commit: r1782780 - in /webservices/wss4j/trunk: performance/src/test/java/org/apache/wss4j/performance/ ws-security-common/src/main/java/org/apache/wss4j/common/saml/ ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/ ws-sec...

Author: coheigea
Date: Mon Feb 13 14:37:11 2017
New Revision: 1782780

URL: http://svn.apache.org/viewvc?rev=1782780&view=rev
Log:
Fixing some logging stuff

Modified:
    webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java

Modified: webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java?rev=1782780&r1=1782779&r2=1782780&view=diff
==============================================================================
--- webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java Mon Feb 13 14:37:11 2017
@@ -363,9 +363,9 @@ public abstract class AbstractTestBase e
 
     class CustomWSS4JHandler extends WSHandler {
 
-        private final org.slf4j.Logger log =
+        private final org.slf4j.Logger LOG =
             org.slf4j.LoggerFactory.getLogger(CustomWSS4JHandler.class.getName());
-        private final boolean doDebug = log.isDebugEnabled();
+        private final boolean doDebug = LOG.isDebugEnabled();
 
         /**
          * Handles incoming web service requests and outgoing responses
@@ -420,7 +420,7 @@ public abstract class AbstractTestBase e
                 );
             }
             if (doDebug) {
-                log.debug("Actor: " + reqData.getActor());
+                LOG.debug("Actor: " + reqData.getActor());
             }
             /*
             * Now get the SOAP part from the request message and convert it into a
@@ -435,8 +435,8 @@ public abstract class AbstractTestBase e
                 );
             }
             if (doDebug) {
-                log.debug("WSS4JHandler: orginal SOAP request: ");
-                log.debug(XMLUtils.prettyDocumentToString(doc));
+                LOG.debug("WSS4JHandler: orginal SOAP request: ");
+                LOG.debug(XMLUtils.prettyDocumentToString(doc));
             }
             doSenderAction(doc, reqData, actions, isRequest);
 
@@ -489,7 +489,7 @@ public abstract class AbstractTestBase e
                 wsResult = secEngine.processSecurityHeader(elem, reqData);
             } catch (WSSecurityException ex) {
                 if (doDebug) {
-                    log.debug(ex.getMessage(), ex);
+                    LOG.debug(ex.getMessage(), ex);
                 }
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
                         "WSS4JHandler: security processing failed", ex
@@ -510,7 +510,7 @@ public abstract class AbstractTestBase e
             }
 
             if (doDebug) {
-                log.debug("Processed received SOAP request");
+                LOG.debug("Processed received SOAP request");
             }
 
             /*
@@ -535,7 +535,7 @@ public abstract class AbstractTestBase e
             WSHandlerResult rResult = new WSHandlerResult(actor, wsResult);
             results.add(0, rResult);
             if (doDebug) {
-                log.debug("WSS4JHandler: exit invoke()");
+                LOG.debug("WSS4JHandler: exit invoke()");
             }
 
             return true;

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1782780&r1=1782779&r2=1782780&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Mon Feb 13 14:37:11 2017
@@ -72,7 +72,7 @@ import org.w3c.dom.Element;
  */
 public class SamlAssertionWrapper {
     /**
-     * Field log
+     * Field LOG
      */
     private static final org.slf4j.Logger LOG =
         org.slf4j.LoggerFactory.getLogger(SamlAssertionWrapper.class);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java?rev=1782780&r1=1782779&r2=1782780&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java Mon Feb 13 14:37:11 2017
@@ -143,7 +143,7 @@ public class SecurityHeaderInputProcesso
                             ((WSSSecurityProperties) getSecurityProperties()).getActor())) {
                         //we are in the security header and the depth is +1, so every child
                         //element should have a responsible handler with the exception of an EncryptedData SecurityHeader
-                        //which is already handled in the above StartElement logic (@see comment above).
+                        //which is already handled in the above StartElement Logic (@see comment above).
                         if (!WSSConstants.TAG_xenc_EncryptedData.equals(xmlSecEndElement.getName())) {
                             engageSecurityHeaderHandler(subInputProcessorChain, getSecurityProperties(),
                                     xmlSecEventList, startIndexForProcessor, xmlSecEndElement.getName());

Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1782780&r1=1782779&r2=1782780&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Mon Feb 13 14:37:11 2017
@@ -373,9 +373,9 @@ public abstract class AbstractTestBase e
 
     class CustomWSS4JHandler extends WSHandler {
 
-        private final org.slf4j.Logger log =
+        private final org.slf4j.Logger LOG =
             org.slf4j.LoggerFactory.getLogger(CustomWSS4JHandler.class.getName());
-        private final boolean doDebug = log.isDebugEnabled();
+        private final boolean doDebug = LOG.isDebugEnabled();
 
         /**
          * Handles incoming web service requests and outgoing responses
@@ -432,7 +432,7 @@ public abstract class AbstractTestBase e
                 );
             }
             if (doDebug) {
-                log.debug("Actor: " + reqData.getActor());
+                LOG.debug("Actor: " + reqData.getActor());
             }
             /*
             * Now get the SOAP part from the request message and convert it into a
@@ -447,8 +447,8 @@ public abstract class AbstractTestBase e
                 );
             }
             if (doDebug) {
-                log.debug("WSS4JHandler: orginal SOAP request: ");
-                log.debug(XMLUtils.prettyDocumentToString(doc));
+                LOG.debug("WSS4JHandler: orginal SOAP request: ");
+                LOG.debug(XMLUtils.prettyDocumentToString(doc));
             }
             doSenderAction(doc, reqData, actions, isRequest);
 
@@ -507,7 +507,7 @@ public abstract class AbstractTestBase e
                 wsResult = secEngine.processSecurityHeader(elem, reqData);
             } catch (WSSecurityException ex) {
                 if (doDebug) {
-                    log.debug(ex.getMessage(), ex);
+                    LOG.debug(ex.getMessage(), ex);
                 }
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex, "empty",
                                               new Object[] {"WSS4JHandler: security processing failed"}
@@ -528,7 +528,7 @@ public abstract class AbstractTestBase e
             }
 
             if (doDebug) {
-                log.debug("Processed received SOAP request");
+                LOG.debug("Processed received SOAP request");
             }
 
             /*
@@ -552,7 +552,7 @@ public abstract class AbstractTestBase e
             }
             results.add(0, wsResult);
             if (doDebug) {
-                log.debug("WSS4JHandler: exit invoke()");
+                LOG.debug("WSS4JHandler: exit invoke()");
             }
 
             return true;