[wsas-java-dev] svn commit r617 - in wsas/java/trunk/modules: admin/src/org/wso2/wsas/admin/service admin/src/org/wso2/wsas/admin/service/util core/src/org/wso2/wsas core/src/org/wso2/wsas/deployment core/src/org/wso2/wsas/transport/jetty core/src/org/wso2/wsas/util

[svn at wso2.com]

Author: azeez
Date: Fri Jan 26 03:21:52 2007
New Revision: 617

Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java
Log:
Introduced constants
Refactored constant



Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	Fri Jan 26 03:21:52 2007
@@ -333,7 +333,7 @@
 
         // We should not engage the throttle module to the wso2wsas-administration service group
         if (moduleId.equals("wso2throttle")) {
-            axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
+            axisConfig.getServiceGroup(ServerConstants.ADMIN_SERVICE_GROUP).
                     disengageModule(axisModule);
         }
 

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java	Fri Jan 26 03:21:52 2007
@@ -86,7 +86,7 @@
         wso2wsasVersion = ServerConfiguration.getInstance().getFirstProperty("Version");
 
         AxisServiceGroup asg =
-                axisConfig.getServiceGroup(org.wso2.wsas.ServerConstants.ADMINISTRATION_SERVICE_GROUP);
+                axisConfig.getServiceGroup(org.wso2.wsas.ServerConstants.ADMIN_SERVICE_GROUP);
         int adminServiceCount = 0;
 
         for (Iterator serviceIter = asg.getServices(); serviceIter.hasNext();) {

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java	Fri Jan 26 03:21:52 2007
@@ -47,11 +47,15 @@
     //=============================================
     //          Admin Constants
     //=============================================
-    public static final String ADMINISTRATION_SERVICE_GROUP = "wso2wsas-administration";
+    public static final String ADMIN_SERVICE_GROUP = "wso2wsas-administration";
     public static final String STATISTICS_SERVICE_GROUP = "wso2statistics";
     public static final String TRACER_SERVICE_GROUP = "wso2tracer";
     public static final String CODEGEN_SERVICE_GROUP = "wso2codegen";
 
+    public static final String ADMIN_MODULE = "wso2wsas-admin";
+    public static final String TRACER_MODULE = "wso2tracer";
+    public static final String STATISTICS_MODULE = "wso2statistics";
+
     public static final String LOGGED_IN = "logged.in";
 
     public static final String SERVER_REGISTERED = "wso2wsas.server.registered";

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java	Fri Jan 26 03:21:52 2007
@@ -417,7 +417,7 @@
 
                     // We should not engage the throttle module to the wso2wsas-administration service group
                     if (moduleId.equals("wso2throttle")) {
-                        axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
+                        axisConfig.getServiceGroup(ServerConstants.ADMIN_SERVICE_GROUP).
                                 disengageModule(axisConfig.getModule(moduleIdQName));
                     }
                 }

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java	Fri Jan 26 03:21:52 2007
@@ -152,10 +152,9 @@
 
         // We ignore admin module events
         String moduleId = ModuleIdUtil.getModuleId(axisModule);
-        System.err.println("########## moduleId=" +moduleId);
-        if(moduleId.equals("wso2wsas-admin") ||
-                moduleId.equals("wso2tracer") ||
-                moduleId.equals("wso2statistics")){
+        if(moduleId.equals(ServerConstants.ADMIN_MODULE) ||
+                moduleId.equals(ServerConstants.TRACER_MODULE) ||
+                moduleId.equals(ServerConstants.STATISTICS_MODULE)){
             return;
         }
 

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServiceHTMLProcessor.java	Fri Jan 26 03:21:52 2007
@@ -46,7 +46,7 @@
             temp += "<h2>" + "Deployed services" + "</h2>";
             while (serviceGroupsItr.hasNext()) {
                 AxisServiceGroup axisServiceGroup = (AxisServiceGroup) serviceGroupsItr.next();
-                if (!ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(axisServiceGroup.getServiceGroupName()))
+                if (!ServerConstants.ADMIN_SERVICE_GROUP.equals(axisServiceGroup.getServiceGroupName()))
                 {
                     status = true;
                     for (Iterator serviceItr = axisServiceGroup.getServices();

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/AdminServicesFilter.java	Fri Jan 26 03:21:52 2007
@@ -23,7 +23,7 @@
 public class AdminServicesFilter {
     
     public static boolean isFiltered(String serviceGroupName) {
-        return ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(serviceGroupName) ||
+        return ServerConstants.ADMIN_SERVICE_GROUP.equals(serviceGroupName) ||
                serviceGroupName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||
                serviceGroupName.endsWith(ServerConstants.TRACER_SERVICE_GROUP) ||
                serviceGroupName.startsWith(ServerConstants.CODEGEN_SERVICE_GROUP);