[wsas-java-dev] svn commit r1693 - trunk/wsas/java/modules/core/src/org/wso2/wsas

[svn at wso2.org]

Author: azeez
Date: Mon Apr  2 01:33:56 2007
New Revision: 1693

Modified:
   trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
Log:
1. Ability to disable Admin UI
2. Get WSAS server xml from the utility



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 Apr  2 01:33:56 2007
@@ -97,23 +97,11 @@
 
     public void start() throws ServerException {
         // ------------------------------------------------------------------------------------------
-        String axis2XML = System.getProperty(Constants.AXIS2_CONF);
-        if (axis2XML == null) {
-            axis2XML =
-                    ServerConfiguration.getInstance().
-                            getFirstProperty("Axis2Config.ConfigurationFile");
-        }
+        String axis2XML = Utils.getAxis2Xml();
+
         wso2wsasHome = System.getProperty(ServerConstants.WSO2WSAS_HOME);
-        /*if (axis2XML == null) {
-            System.setProperty(Constants.AXIS2_CONF, wso2wsasHome + File.separator + "conf" +
-                                                     File.separator + "axis2.xml");
-        }*/
-
-        String serverXML = System.getProperty(ServerConstants.WSO2WSAS_SERVER_XML);
-        if (serverXML == null) {
-            System.setProperty(ServerConstants.WSO2WSAS_SERVER_XML,
-                               ServerConfiguration.configurationXMLLocation);
-        }
+
+        Utils.getWsasServerXml();
         // ------------------------------------------------------------------------------------------
 
         try {
@@ -139,6 +127,15 @@
                     ConfigurationContextFactory
                             .createConfigurationContext(serverConfigurator);
 
+            // Disable admin services, if needed
+            String enableAdminConsole =
+                    serverConfig.getFirstProperty("Management.EnableConsole");
+            if (enableAdminConsole != null &&
+                !Boolean.valueOf(enableAdminConsole).booleanValue()) {
+                configContext.getAxisConfiguration().
+                        removeServiceGroup(ServerConstants.ADMIN_SERVICE_GROUP);
+            }
+
             // If an old config context existed, use its cluster manager
             if (oldContext != null) {
                 ClusterManager originalClusterManager =
@@ -214,8 +211,8 @@
                 continue;
             }
             scenario.setScenarioId(scenarioId);
-            scenario.setSummary(
-                    omElement.getFirstChildWithName(ServerConstants.Security.SUMMARY_QN).getText());
+            scenario.setSummary(omElement.
+                    getFirstChildWithName(ServerConstants.Security.SUMMARY_QN).getText());
             scenario.setDescription(omElement
                     .getFirstChildWithName(ServerConstants.Security.DESCRIPTION_QN).getText());
             scenario.setCategory(omElement
@@ -525,14 +522,19 @@
     }
 
     public void printMgtConsoleURL() {
-        try {
-            String contextRoot = configContext.getContextRoot();
-            log.info("Management Console available at   ----> https://" +
-                     NetworkUtils.getLocalHostname() + ":" + ServerManager.httpsPort +
-                     (contextRoot.equals("/") ? contextRoot : contextRoot + "/"));
+        if (Utils.isAdminConsoleEnabled()) {
+            try {
+                String contextRoot = configContext.getContextRoot();
+                log.info("Management Console available at   ----> https://" +
+                         NetworkUtils.getLocalHostname() + ":" + ServerManager.httpsPort +
+                         (contextRoot.equals("/") ? contextRoot : contextRoot + "/"));
+                log.info("");
+            } catch (SocketException e) {
+                log.error("Cannot get host IP ", e);
+            }
+        } else {
+            log.info("Management Console has been disabled.");
             log.info("");
-        } catch (SocketException e) {
-            log.error("Cannot get host IP ", e);
         }
     }