[jboss-svn-commits] JBossWS SVN: r900 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/jaxws/handler main/java/org/jboss/ws/soap test/java/org/jboss/test/ws/jaxws/logicalhandler

[jboss-svn-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-09-05 09:48:51 -0400 (Tue, 05 Sep 2006)
New Revision: 900

Modified:
   branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerChainExecutor.java
   branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
   branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/LogicalHandlerTestCase.java
Log:
[JBWS-1168] JAXWS handler ordering

Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerChainExecutor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerChainExecutor.java	2006-09-05 12:33:03 UTC (rev 899)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerChainExecutor.java	2006-09-05 13:48:51 UTC (rev 900)
@@ -34,11 +34,11 @@
 import javax.xml.ws.handler.MessageContext;
 
 import org.jboss.logging.Logger;
-import org.jboss.ws.utils.DOMWriter;
 import org.jboss.ws.common.SOAPMessageContextBase;
 import org.jboss.ws.jaxrpc.Style;
 import org.jboss.ws.metadata.EndpointMetaData;
 import org.jboss.ws.soap.SOAPEnvelopeImpl;
+import org.jboss.ws.utils.DOMWriter;
 
 /**
  * Executes a list of JAXWS handlers.
@@ -98,24 +98,23 @@
          Handler currHandler = null;
          try
          {
+            String lastMessageTrace = null;
             for (; doNext && handlerIndex < handlers.size(); handlerIndex++)
             {
-               String lastMessageTrace = null;
+               currHandler = handlers.get(handlerIndex);
+               
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("BEFORE handleRequest - " + currHandler, soapPart, lastMessageTrace);
                }
 
-               currHandler = handlers.get(handlerIndex);
-
-               log.debug("Handle request: " + currHandler);
                doNext = handleMessage(currHandler, soapContext);
 
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("AFTER handleRequest - " + currHandler, soapPart, lastMessageTrace);
                }
             }
          }
@@ -157,24 +156,23 @@
          Handler currHandler = null;
          try
          {
+            String lastMessageTrace = null;
             for (; doNext && handlerIndex >= 0; handlerIndex--)
             {
-               String lastMessageTrace = null;
+               currHandler = handlers.get(handlerIndex);
+               
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("BEFORE handleResponse - " + currHandler, soapPart, lastMessageTrace);
                }
 
-               currHandler = handlers.get(handlerIndex);
-
-               log.debug("Handle response: " + currHandler);
                doNext = handleMessage(currHandler, soapContext);
 
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("AFTER handleResponse - " + currHandler, soapPart, lastMessageTrace);
                }
             }
          }
@@ -213,23 +211,23 @@
          Handler currHandler = null;
          try
          {
+            String lastMessageTrace = null;
             for (; doNext && handlerIndex < handlers.size(); handlerIndex++)
             {
-               String lastMessageTrace = null;
+               currHandler = handlers.get(handlerIndex);
+               
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("BEFORE handleFault - " + currHandler, soapPart, lastMessageTrace);
                }
 
-               currHandler = handlers.get(handlerIndex);
-               log.debug("Handle fault: " + currHandler);
                doNext = handleFault(currHandler, soapContext);
 
                if (log.isTraceEnabled())
                {
                   SOAPPart soapPart = soapContext.getMessage().getSOAPPart();
-                  lastMessageTrace = traceSOAPPart(soapPart, lastMessageTrace);
+                  lastMessageTrace = traceSOAPPart("AFTER handleFault - " + currHandler, soapPart, lastMessageTrace);
                }
             }
          }
@@ -284,16 +282,21 @@
 
    /**
     * Trace the SOAPPart, do nothing if the String representation is equal to the last one.
+    * @param logMsg TODO
     */
-   protected String traceSOAPPart(SOAPPart soapPart, String lastMessageTrace)
+   protected String traceSOAPPart(String logMsg, SOAPPart soapPart, String lastMessageTrace)
    {
       try
       {
          SOAPEnvelopeImpl soapEnv = (SOAPEnvelopeImpl)soapPart.getEnvelope();
          String envString = DOMWriter.printNode(soapEnv, true);
-         if (envString.equals(lastMessageTrace) == false)
+         if (envString.equals(lastMessageTrace))
          {
-            log.debug(envString);
+            log.trace(logMsg + ": unchanged");
+         }
+         else
+         {
+            log.trace(logMsg + "\n" + envString);
             lastMessageTrace = envString;
          }
          return lastMessageTrace;

Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-09-05 12:33:03 UTC (rev 899)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-09-05 13:48:51 UTC (rev 900)
@@ -881,9 +881,8 @@
             log.trace("END: expandToDOM " + getElementName());
          }
 
-         // Either the dom-valid state, or the xml-valid state can be true
-         // Therefore we invalidate the xml content.
          invalidateXMLContent();
+         invalidateObjectContent();
       }
    }
 

Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/LogicalHandlerTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/LogicalHandlerTestCase.java	2006-09-05 12:33:03 UTC (rev 899)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/LogicalHandlerTestCase.java	2006-09-05 13:48:51 UTC (rev 900)
@@ -63,9 +63,8 @@
       expStr.append(":SOAP11ServerHandler");
       expStr.append(":PortServerHandler");
       expStr.append(":endpoint");
-      System.out.println("FIXME: JBWS-1168");
-      //expStr.append(":PortServerHandler");
-      //expStr.append(":SOAP11ServerHandler");
+      expStr.append(":PortServerHandler");
+      expStr.append(":SOAP11ServerHandler");
       expStr.append(":LogicalServerHandler");
       expStr.append(":PortClientHandler");
       expStr.append(":SOAP11ClientHandler");