You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/21 08:54:37 UTC

svn commit: r520788 - in /webservices/synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java src/main/assembly/bin.xml

Author: asankha
Date: Wed Mar 21 00:54:36 2007
New Revision: 520788

URL: http://svn.apache.org/viewvc?view=rev&rev=520788
Log:
update rampart.mar groupid and fix log mediator

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
    webservices/synapse/trunk/java/src/main/assembly/bin.xml

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java?view=diff&rev=520788&r1=520787&r2=520788
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/LogMediator.java Wed Mar 21 00:54:36 2007
@@ -20,6 +20,7 @@
 package org.apache.synapse.mediators.builtin;
 
 import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.soap.SOAPHeader;
 import org.apache.axiom.om.OMElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -118,15 +119,18 @@
 
     private String getHeadersLogMessage(MessageContext synCtx) {
         StringBuffer sb = new StringBuffer();
-        Iterator iter = synCtx.getEnvelope().getHeader().examineAllHeaderBlocks();
-        while (iter.hasNext()) {
-            Object o = iter.next();
-            if (o instanceof SOAPHeaderBlock) {
-                SOAPHeaderBlock header = (SOAPHeaderBlock) o;
-                sb.append(separator + header.getLocalName() + " : " + header.getText());
-            } else if (o instanceof OMElement) {
-                OMElement headerElem = (OMElement) o;
-                sb.append(separator + headerElem.getLocalName() + " : " + headerElem.getText());
+        SOAPHeader header = synCtx.getEnvelope().getHeader();
+        if (header != null) {
+            Iterator iter = header.examineAllHeaderBlocks();
+            while (iter.hasNext()) {
+                Object o = iter.next();
+                if (o instanceof SOAPHeaderBlock) {
+                    SOAPHeaderBlock headerBlk = (SOAPHeaderBlock) o;
+                    sb.append(separator + headerBlk.getLocalName() + " : " + headerBlk.getText());
+                } else if (o instanceof OMElement) {
+                    OMElement headerElem = (OMElement) o;
+                    sb.append(separator + headerElem.getLocalName() + " : " + headerElem.getText());
+                }
             }
         }
         setCustomProperties(sb, synCtx);
@@ -135,7 +139,7 @@
 
     private String getFullLogMessage(MessageContext synCtx) {
         StringBuffer sb = new StringBuffer();
-        sb.append(getSimpleLogMessage(synCtx));
+        sb.append(getHeadersLogMessage(synCtx));
         if (synCtx.getEnvelope() != null)
             sb.append(separator + "Envelope: " + synCtx.getEnvelope());        
         return trimLeadingSeparator(sb);

Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=520788&r1=520787&r2=520788
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Wed Mar 21 00:54:36 2007
@@ -207,7 +207,7 @@
             <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
             <excludes>
                 <exclude>org.apache.axis2:addressing:mar</exclude>
-                <exclude>org.apache.axis2:rampart:mar</exclude>
+                <exclude>org.apache.rampart:rampart:mar</exclude>
                 <exclude>org.apache.sandesha2:sandesha2:mar</exclude>
             </excludes>
         </dependencySet>
@@ -215,7 +215,7 @@
             <outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
-                <include>org.apache.axis2:rampart:mar</include>
+                <include>org.apache.rampart:rampart:mar</include>
                 <include>org.apache.sandesha2:sandesha2:mar</include>
             </includes>
         </dependencySet>
@@ -223,7 +223,7 @@
             <outputDirectory>synapse-${synapse.version}/samples/axis2Client/client_repo/modules</outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
-                <!--<include>org.apache.axis2:rampart:mar</include>-->
+                <include>org.apache.rampart:rampart:mar</include>
                 <!--<include>org.apache.sandesha2:sandesha2:mar</include>-->
             </includes>
         </dependencySet>
@@ -231,7 +231,7 @@
             <outputDirectory>synapse-${synapse.version}/samples/axis2Server/repository/modules</outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
-                <!--<include>org.apache.axis2:rampart:mar</include>-->
+                <include>org.apache.rampart:rampart:mar</include>
                 <!--<include>org.apache.sandesha2:sandesha2:mar</include>-->
             </includes>
         </dependencySet>



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org