[wsas-java-dev] svn commit r2252 - in trunk/wsas/java/modules: core/src/org/wso2/wsas core/src/org/wso2/wsas/util servlet-edition/conf standalone-edition/conf www/extensions/core/js

[svn at wso2.org]

Author: saminda
Date: Mon May  7 00:51:54 2007
New Revision: 2252

Modified:
   trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
   trunk/wsas/java/modules/servlet-edition/conf/axis2.xml
   trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
   trunk/wsas/java/modules/www/extensions/core/js/tracer.js
Log:
1. Update to axis2.xmls ; removed the wso2tracer module 
2. Update to ServerManager
3. Update to tracer.js 
//TODO finishing the filtering logic of admin console


Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java	Mon May  7 00:51:54 2007
@@ -30,7 +30,6 @@
 import org.apache.log4j.Logger;
 import org.wso2.adminui.UIProcessingException;
 import org.wso2.adminui.UIProcessor;
-import org.wso2.tracer.TracerConstants;
 import org.wso2.utils.NetworkUtils;
 import org.wso2.utils.ServerConfiguration;
 import org.wso2.utils.ServerException;
@@ -154,7 +153,6 @@
                                 rootLogger.getAppender(ServerConstants.
                                         Logging.WSO2WSAS_MEMORY_APPENDER));
 
-            configureMessageMonitoring();
             createDefaultServiceUserRoles();
             createDefaultAdminAccount();
 
@@ -358,7 +356,8 @@
         ServiceUserDO admin = pm.getUser(adminUsername);
         ServerConfiguration config = ServerConfiguration.getInstance();
         CryptoUtil cryptoUtil =
-                new CryptoUtil(new File(config.getFirstProperty("Security.KeyStore.Location")).getAbsolutePath(),
+                new CryptoUtil(new File(
+                        config.getFirstProperty("Security.KeyStore.Location")).getAbsolutePath(),
                                config.getFirstProperty("Security.KeyStore.Password"),
                                config.getFirstProperty("Security.KeyStore.KeyAlias"),
                                config.getFirstProperty("Security.KeyStore.KeyPassword"),
@@ -446,20 +445,6 @@
         return adminPassword;*/
     }
 
-    private void configureMessageMonitoring() {
-        String tracingStatusFromDB = pm.getConfigurationProperty(TracerConstants.TRACING_STATUS);
-        if (tracingStatusFromDB == null) { // Tracing status not available in DB
-            pm.updateConfigurationProperty(TracerConstants.TRACING_STATUS,
-                                           "OFF");
-            configContext.setProperty(TracerConstants.IS_TRACING, Boolean.FALSE);
-        } else {
-            if (tracingStatusFromDB.equalsIgnoreCase("on")) {
-                configContext.setProperty(TracerConstants.IS_TRACING, Boolean.TRUE);
-            } else {
-                configContext.setProperty(TracerConstants.IS_TRACING, Boolean.FALSE);
-            }
-        }
-    }
 
     private void registerHouseKeepingTask() {
         if (!isHouseKeepingTaskCreated) {

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	Mon May  7 00:51:54 2007
@@ -86,9 +86,6 @@
 
     public void saveTraceStatus(String onOff) {
         pm.updateConfigurationProperty(TracerConstants.TRACING_STATUS, onOff);
-        /*if(onOff.equalsIgnoreCase("on")){
-            TRACE_LOGGER.set
-        }*/
     }
 
     public String[] getMessages(String serviceId,
@@ -158,10 +155,11 @@
         return msgSequence;
     }
 
-    private String getPrettyString(SOAPEnvelope env) throws AxisFault {
+    private String getPrettyString(SOAPEnvelope env) {
         InputStream xmlIn = new ByteArrayInputStream(env.toString().getBytes());
-        String encoding = (String)msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
-        XMLPrettyPrinter xmlPrettyPrinter = new XMLPrettyPrinter(xmlIn,encoding);
-        return  xmlPrettyPrinter.xmlFormat();
+        String encoding =
+                (String) msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
+        XMLPrettyPrinter xmlPrettyPrinter = new XMLPrettyPrinter(xmlIn, encoding);
+        return xmlPrettyPrinter.xmlFormat();
     }
 }

Modified: trunk/wsas/java/modules/servlet-edition/conf/axis2.xml
==============================================================================
--- trunk/wsas/java/modules/servlet-edition/conf/axis2.xml	(original)
+++ trunk/wsas/java/modules/servlet-edition/conf/axis2.xml	Mon May  7 00:51:54 2007
@@ -4,7 +4,7 @@
     <!-- Globally engaged modules -->
     <!-- ================================================= -->
     <module ref="wso2statistics"/>
-    <module ref="wso2tracer"/>
+    <!--<module ref="wso2tracer"/>-->
 
     <!-- ================================================= -->
     <!-- Parameters -->

Modified: trunk/wsas/java/modules/standalone-edition/conf/axis2.xml
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	(original)
+++ trunk/wsas/java/modules/standalone-edition/conf/axis2.xml	Mon May  7 00:51:54 2007
@@ -4,7 +4,7 @@
     <!-- Globally engaged modules -->
     <!-- ================================================= -->
     <module ref="wso2statistics"/>
-    <module ref="wso2tracer"/>
+    <!--<module ref="wso2tracer"/>-->
 
     <!-- ================================================= -->
     <!-- Parameters -->

Modified: trunk/wsas/java/modules/www/extensions/core/js/tracer.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/tracer.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/tracer.js	Mon May  7 00:51:54 2007
@@ -94,6 +94,7 @@
 
     var body_xml = '<req:getLastMessagesRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
                    '<messages>1</messages>\n' +
+                   '<filter></filter>\n'+
                    '</req:getLastMessagesRequest>\n';
 
     var callURL = serverURL + "/" + "wso2tracer" ;
@@ -217,6 +218,7 @@
 
     var body_xml = '<req:getLastMessagesRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
                    '<messages>30</messages>\n' +
+                   '<filter></filter>\n'+
                    '</req:getLastMessagesRequest>\n';
 
     var callURL = serverURL + "/" + "wso2tracer" ;