[wsas-java-dev] svn commit r1871 - in trunk/wsas/java: . modules/core/conf modules/core/src/org/wso2/wsas/util

[svn at wso2.org]

Author: saminda
Date: Wed Apr 18 00:27:19 2007
New Revision: 1871

Modified:
   trunk/wsas/java/modules/core/conf/log4j.properties
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
   trunk/wsas/java/pom.xml
Log:
Tracing messages to a log file IFF tracing of messages is enabled. 
Use a workaround to fix transient dependency problem cause by AXIOM 


Modified: trunk/wsas/java/modules/core/conf/log4j.properties
==============================================================================
--- trunk/wsas/java/modules/core/conf/log4j.properties	(original)
+++ trunk/wsas/java/modules/core/conf/log4j.properties	Wed Apr 18 00:27:19 2007
@@ -35,6 +35,8 @@
 log4j.logger.org.apache.axis2.enterprise=FATAL, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
 log4j.logger.de.hunsicker.jalopy.io=FATAL, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
 
+log4j.logger.trace.messages=TRACE,WSO2WSAS_TRACE_LOGFILE
+
 
 # WSO2WSAS_CONSOLE is set to be a ConsoleAppender using a PatternLayout.
 log4j.appender.WSO2WSAS_CONSOLE=org.apache.log4j.ConsoleAppender
@@ -63,4 +65,12 @@
 log4j.appender.WSO2WSAS_SYS_LOG.layout.ConversionPattern=%5p [%d] %x %m%n
 log4j.appender.WSO2WSAS_SYS_LOG.SyslogHost=localhost
 log4j.appender.WSO2WSAS_SYS_LOG.Facility=USER
-log4j.appender.WSO2WSAS_SYS_LOG.threshold=DEBUG
\ No newline at end of file
+log4j.appender.WSO2WSAS_SYS_LOG.threshold=DEBUG
+
+# Appender config to WSO2WSAS_TRACE_LOGFILE
+log4j.appender.WSO2WSAS_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.WSO2WSAS_TRACE_LOGFILE.File=logs/wso2wsas-trace-messages.log
+log4j.appender.WSO2WSAS_TRACE_LOGFILE.Append=true
+log4j.appender.WSO2WSAS_TRACE_LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.WSO2WSAS_TRACE_LOGFILE.layout.ConversionPattern=%5p [%d] %x %m%n
+log4j.additivity.trace.messages=false
\ No newline at end of file

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java	Wed Apr 18 00:27:19 2007
@@ -45,6 +45,8 @@
     private static Log log = LogFactory.getLog(TracePersisterImpl.class);
     private MessageContext msgContext;
 
+    private static final Log TRACE_MESSAGES = LogFactory.getLog("trace.messages");
+
     private PersistenceManager pm = new PersistenceManager();
 
     public void setMsgContext(MessageContext msgContext) {
@@ -70,6 +72,9 @@
         }
 
         msgDO.setXml(xml);
+        if (TRACE_MESSAGES.isTraceEnabled()) {
+            TRACE_MESSAGES.trace(xml);
+        }
 
         long msgSequence = getMessageSequence(serviceName + "." + operationName,
                                               serviceName,
@@ -102,7 +107,7 @@
 
                 if (message.getType() == MessageContext.IN_FLOW ||
                     message.getType() == MessageContext.IN_FAULT_FLOW) {
-                    resp[0]  = message.getXml();
+                    resp[0] = message.getXml();
                 } else if (message.getType() == MessageContext.OUT_FLOW ||
                            message.getType() == MessageContext.OUT_FAULT_FLOW) {
                     resp[1] = message.getXml();
@@ -136,7 +141,8 @@
             if (counterInt == null) {
                 PersistenceManager pm = new PersistenceManager();
                 msgSequence = pm.getMaxMessageSequence(serviceName,
-                                                       ServiceIdentifierDO.EMPTY_SERVICE_VERSION, //TODO: replace this with service version when it is available
+                                                       ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
+                                                       //TODO: replace this with service version when it is available
                                                        operationName) + 1;
             } else if (counterInt instanceof Long) {
                 msgSequence = ((Long) counterInt).intValue() + 1;

Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml	(original)
+++ trunk/wsas/java/pom.xml	Wed Apr 18 00:27:19 2007
@@ -1086,6 +1086,14 @@
             <version>${slf4j.version}</version>
         </dependency>
 
+        <!-- AXIOM contains wstx-asl dependency under woodstx.
+        This redirects to org.codehaus.woodsts. Redirection dosen't happen though -->
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+
     </dependencies>
 
     <profiles>
@@ -1178,7 +1186,8 @@
                                     <followSymlinks>false</followSymlinks>
                                 </fileset>
                                 <fileset>
-                                    <directory>modules/admin/test-resources/repository/modules</directory>
+                                    <directory>
+                                        modules/admin/test-resources/repository/modules</directory>
                                     <includes>
                                         <include>wso2throttle-${wso2throttle.version}.mar</include>
                                         <include>addressing-${addressing.version}.mar</include>