[wsas-java-dev] svn commit r3447 - in trunk/wsas/java/modules:
core/src/org/wso2/wsas standalone-edition/src/org/wso2/wsas
svn at wso2.org
svn at wso2.org
Fri Jun 1 03:53:17 PDT 2007
Author: saminda
Date: Fri Jun 1 03:52:30 2007
New Revision: 3447
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerInitializer.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
Log:
Cleaning up the ServerInitializer interface
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java Fri Jun 1 03:52:30 2007
@@ -56,7 +56,6 @@
public class DefaultServerInitializer implements ServerInitializer {
- private ConfigurationContext configurationContext;
private ServerConfiguration serverConfig;
private PersistenceManager pm;
@@ -76,11 +75,8 @@
this.pm = new PersistenceManager();
}
- public void setConfigurationContext(ConfigurationContext configurationContext) {
- this.configurationContext = configurationContext;
- }
- public void init() throws AxisFault, ServerException {
+ public void init(ConfigurationContext configurationContext) throws AxisFault, ServerException {
wso2wsasHome = System.getProperty(ServerConstants.WSO2WSAS_HOME);
@@ -89,10 +85,10 @@
initLoggingConfiguration();
// enabled clustering
- enableClustering();
+ enableClustering(configurationContext);
// Create the dynamic pages and save it in the ConfigContext
- generatePages();
+ generatePages(configurationContext);
// Enabling http binding generation
Parameter enableHttp = new Parameter("enableHTTP", "true");
@@ -110,22 +106,18 @@
handleGlobalModuleEngagements(axisConfig);
- initServiceGroupContextTimeout();
+ initServiceGroupContextTimeout(configurationContext);
- registerHouseKeepingTask();
+ registerHouseKeepingTask(configurationContext);
persistSecurityKeyStore();
- persistSecurityScenarios();
+ persistSecurityScenarios(configurationContext);
initKeystoresDir();
}
- public void shutdown() throws ServerException {
- stopHouseKeeping();
- }
-
/**
* Reads the data base and check whether log setting already there.
* if so update the logger settings with the database settings
@@ -144,11 +136,11 @@
}
}
- private void enableClustering() throws AxisFault {
+ private void enableClustering(ConfigurationContext configurationContext) throws AxisFault {
ClusteringUtil.enableClustering(configurationContext);
}
- private void generatePages() {
+ private void generatePages(ConfigurationContext configurationContext) {
Map files = new Hashtable();
try {
UIProcessor.createPages(serverManager.adminResourceBase, "ui-extensions-config.xml",
@@ -280,7 +272,7 @@
}
}
- private void initServiceGroupContextTimeout() {
+ private void initServiceGroupContextTimeout(ConfigurationContext configurationContext) {
String serviceGroupContextIdleTimeout =
serverConfig.getFirstProperty("Axis2Config.ServiceGroupContextIdleTime");
@@ -292,7 +284,7 @@
}
}
- private void registerHouseKeepingTask() {
+ private void registerHouseKeepingTask(ConfigurationContext configurationContext) {
if (!isHouseKeepingTaskCreated) {
if (Boolean.valueOf(serverConfig.
getFirstProperty("HouseKeeping.AutoStart")).booleanValue()) {
@@ -339,7 +331,7 @@
}
}
- private void persistSecurityScenarios() throws ServerException {
+ private void persistSecurityScenarios(ConfigurationContext configurationContext) throws ServerException {
String scenarioConfigXml = wso2wsasHome + File.separator + "conf" +
File.separator + "rampart" +
File.separator + "scenario-config.xml";
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerConstants.java Fri Jun 1 03:52:30 2007
@@ -98,7 +98,6 @@
public static final String WEB_RESOURCE_LOCATION = "web.location";
public static final String GENERATED_PAGES = "local_wso2wsas.generated.pages";
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
- public static final String WSO2WSAS_SERVER_INITIALIZER_LIST = "local_server.intializer.list";
public static class Axis2ParameterNames {
public static final String CONTEXT_ROOT = "contextRoot";
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerInitializer.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerInitializer.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerInitializer.java Fri Jun 1 03:52:30 2007
@@ -23,20 +23,14 @@
*/
public interface ServerInitializer {
+
/**
- * Set the ConfigurationContext
+ * Intialize the Server logics
* @param configurationContext
+ * @throws AxisFault
+ * @throws ServerException
*/
- public void setConfigurationContext(ConfigurationContext configurationContext);
+ public void init(ConfigurationContext configurationContext) throws AxisFault, ServerException ;
- /**
- * Initializing logic
- */
- public void init() throws AxisFault, ServerException ;
- /**
- * Called when server is shutting down
- * @throws ServerException
- */
- public void shutdown() throws ServerException;
}
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 Fri Jun 1 03:52:30 2007
@@ -20,37 +20,18 @@
import org.apache.axis2.clustering.ClusterManager;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.i18n.Messages;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.log4j.Logger;
-import org.wso2.adminui.UIProcessingException;
-import org.wso2.adminui.UIProcessor;
import org.wso2.utils.NetworkUtils;
import org.wso2.utils.ServerConfiguration;
import org.wso2.utils.ServerException;
-import org.wso2.utils.security.CryptoException;
-import org.wso2.utils.security.CryptoUtil;
import org.wso2.wsas.deployment.ServerConfigurator;
-import org.wso2.wsas.persistence.PersistenceManager;
-import org.wso2.wsas.persistence.dataobject.ModuleDO;
-import org.wso2.wsas.persistence.dataobject.SecurityScenarioDO;
-import org.wso2.wsas.persistence.dataobject.ServiceUserDO;
-import org.wso2.wsas.persistence.dataobject.ServiceUserRoleDO;
-import org.wso2.wsas.persistence.exception.KeyStoreAlreadyExistsException;
-import org.wso2.wsas.persistence.exception.SecurityScenarioAlreadyExistsException;
-import org.wso2.wsas.persistence.exception.ServiceUserAlreadyExistsException;
-import org.wso2.wsas.persistence.exception.UserRoleAlreadyExistsException;
-import org.wso2.wsas.util.*;
+import org.wso2.wsas.util.Monitor;
+import org.wso2.wsas.util.Utils;
import javax.xml.namespace.QName;
-import java.io.File;
import java.net.SocketException;
-import java.util.*;
+import java.util.Iterator;
/**
* The delegate used by WSAS standalone edition & servlet edition and contains the
@@ -162,7 +143,7 @@
}
}
- private void processServerIntializer() throws ServerException {
+ private void startServerIntializer() throws ServerException {
//TODO better pattern will be the builder
OMElement documentEle = this.serverConfig.getDocumentElement();
OMElement serverInitEle = documentEle.getFirstChildWithName(
@@ -175,8 +156,6 @@
throw new ServerException(message);
}
- ArrayList serverInitList = new ArrayList();
-
for (Iterator iterator = serverInitEle.getChildrenWithName(
new QName(ServerConstants.WSO2WSAS_XML_NAMESPACE, "Initialize"));
iterator.hasNext();) {
@@ -194,8 +173,8 @@
Class clazz = Class.forName(clazzName);
ServerInitializer serverInitObj = (ServerInitializer) clazz.newInstance();
- serverInitObj.setConfigurationContext(configContext);
- serverInitList.add(serverInitObj);
+ log.info("Intializing ServerInitializer " + ServerInitializer.class.getName());
+ serverInitObj.init(configContext);
} catch (ClassNotFoundException e1) {
log.error(e1);
@@ -206,24 +185,12 @@
} catch (InstantiationException e1) {
log.error(e1);
throw new ServerException(e1);
+ } catch (AxisFault e1) {
+ log.error(e1);
+ throw new ServerException(e1);
}
}
- configContext.setProperty(ServerConstants.WSO2WSAS_SERVER_INITIALIZER_LIST, serverInitList);
-
- }
-
- private void startServerIntializer() throws ServerException, AxisFault {
-
- processServerIntializer();
-
- ArrayList serverInitList = (ArrayList) configContext
- .getProperty(ServerConstants.WSO2WSAS_SERVER_INITIALIZER_LIST);
- for (int i = 0 ; i < serverInitList.size();i++) {
- ServerInitializer serverInitializer = (ServerInitializer)serverInitList.get(i);
- log.info("Intializing ServerInitializer " + ServerInitializer.class.getName());
- serverInitializer.init();
- }
}
}
Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java (original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/Main.java Fri Jun 1 03:52:30 2007
@@ -29,7 +29,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import java.util.ArrayList;
/**
* The main class of the WSO2 WSAS standalone distribution
@@ -96,12 +95,6 @@
public void shutdown() throws ServerException {
stopListeners();
- ArrayList arrayList = (ArrayList) ServerManager.getInstance().configContext
- .getProperty(ServerConstants.WSO2WSAS_SERVER_INITIALIZER_LIST);
- for (int j = 0 ; j < arrayList.size(); j++) {
- ServerInitializer serverInitializer = (ServerInitializer)arrayList.get(j);
- serverInitializer.shutdown();
- }
cleanupSystem();
}
More information about the Wsas-java-dev
mailing list