[Carbon-dev] svn commit r17193 - in trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer: module module/handler service

[svn at wso2.org]

Author: saminda
Date: Tue May 20 11:06:17 2008
New Revision: 17193

Log:
finished with tracer component


Modified:
   trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/TracerModule.java
   trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/handler/TracingHandler.java
   trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/service/TracerService.java

Modified: trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/TracerModule.java
==============================================================================
--- trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/TracerModule.java	(original)
+++ trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/TracerModule.java	Tue May 20 11:06:17 2008
@@ -15,21 +15,17 @@
  */
 package org.wso2.tracer.module;
 
-import org.apache.axis2.modules.Module;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.Loader;
 import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.modules.Module;
+import org.apache.axis2.util.Loader;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
 import org.wso2.tracer.TracerConstants;
-import org.wso2.tracer.module.DefaultTraceFilter;
-import org.wso2.tracer.module.MemoryBasedTracePersister;
-import org.wso2.tracer.module.TraceFilter;
-import org.wso2.tracer.module.TracePersister;
 
 /**
  * 
@@ -56,8 +52,11 @@
                 traceFilterImplParam.setValue(traceFilter);
                 axisModule.addParameter(traceFilterImplParam);
             } else {
-                axisModule.addParameter(new Parameter(TracerConstants.TRACE_FILTER_IMPL,
+                // create the default filter and add it to the axis config
+                synchronized (axisConfig) {
+                    axisConfig.addParameter(new Parameter(TracerConstants.TRACE_FILTER_IMPL,
                                                       new DefaultTraceFilter()));
+                }
             }
         }
 
@@ -78,11 +77,12 @@
                 tracePersisterImplParam.setValue(tracePersister);
                 axisModule.addParameter(tracePersisterImplParam);
             } else {
-                MemoryBasedTracePersister tracePersister = new MemoryBasedTracePersister();
-                axisModule.addParameter(new Parameter(TracerConstants.TRACE_PERSISTER_IMPL,
-                                                      tracePersister));
-                configContext.setProperty(TracerConstants.TRACE_PERSISTER_IMPL,
-                                          tracePersister);
+                //create the default tracer persister and add it to the axisconfiguration
+                synchronized (axisConfig) {
+                    axisConfig.addParameter(new Parameter(TracerConstants.TRACE_PERSISTER_IMPL,
+                                                          new MemoryBasedTracePersister()));
+                }
+
             }
         }
     }

Modified: trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/handler/TracingHandler.java
==============================================================================
--- trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/handler/TracingHandler.java	(original)
+++ trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/module/handler/TracingHandler.java	Tue May 20 11:06:17 2008
@@ -53,7 +53,8 @@
 
 
         TraceFilter traceFilter =
-                (TraceFilter) getParameter(TracerConstants.TRACE_FILTER_IMPL).getValue();
+                (TraceFilter) configCtx.getAxisConfiguration()
+                        .getParameter(TracerConstants.TRACE_FILTER_IMPL).getValue();
         if (traceFilter.isFilteredOut(msgContext)) {
             return InvocationResponse.CONTINUE;
         }
@@ -64,7 +65,7 @@
                     msgContext.getAxisOperation().getName().getLocalPart();
             String serviceName = axisService.getName();
             long msgSeq = storeMessage(operationName,
-                                       serviceName,msgContext);
+                                       serviceName, msgContext);
 
             // Add the message id to the CircularBuffer.
             // We need to track only the IN_FLOW msg, since with that sequence number,
@@ -94,9 +95,9 @@
     /**
      * Store the received message
      *
-     * @param operationName
-     * @param serviceName
-     * @param msgCtxt
+     * @param operationName operationName
+     * @param serviceName   serviceName
+     * @param msgCtxt       msgCtxt
      * @return the sequence of the message stored with respect to the operation
      *         in the service
      */
@@ -104,7 +105,8 @@
                               String serviceName,
                               MessageContext msgCtxt) {
         TracePersister tracePersister =
-                (TracePersister) getParameter(TracerConstants.TRACE_PERSISTER_IMPL).getValue();
+                (TracePersister) msgCtxt.getConfigurationContext().getAxisConfiguration()
+                        .getParameter(TracerConstants.TRACE_PERSISTER_IMPL).getValue();
         tracePersister.setMsgContext(msgCtxt);
         return tracePersister
                 .saveMessage(operationName, serviceName, msgCtxt.getFLOW(), msgCtxt.getEnvelope());

Modified: trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/service/TracerService.java
==============================================================================
--- trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/service/TracerService.java	(original)
+++ trunk/carbon-components/tracer/org.wso2.tracer/src/main/java/org/wso2/tracer/service/TracerService.java	Tue May 20 11:06:17 2008
@@ -26,7 +26,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.utils.CircularBuffer;
 import org.wso2.tracer.TracerConstants;
-import org.wso2.tracer.module.MemoryBasedTracePersister;
 import org.wso2.tracer.module.TracePersister;
 
 import java.util.ArrayList;
@@ -163,6 +162,7 @@
         tracePersister.saveTraceStatus(flag);
         tracerServiceInfo.setEmpty(true);
         tracerServiceInfo.setFlag(flag);
+        tracerServiceInfo.setTracePersister(tracePersister.getClass().getName());
 
         return tracerServiceInfo;
     }
@@ -214,8 +214,8 @@
                 }
             }
         } else {
-            //fallback to default MemoryBasedTracePersister
-            return new MemoryBasedTracePersister();
+            throw new AxisFault(TracerConstants.TRACE_PERSISTER_IMPL +
+                                " parameter not defined in axis2.xml");
         }
         return tracePersister;
     }