[esb-java-dev] svn commit r750 - in trunk/esb/java/modules:
core/src/main/java/org/wso2/esb
core/src/main/java/org/wso2/esb/modules/authentication/handler
core/src/main/java/org/wso2/esb/persistence
core/src/main/java/org/wso2/esb/persistence/dao
core/src/main/java/org/wso2/esb/persistence/dataobject
core/src/main/java/org/wso2/esb/services
core/src/main/java/org/wso2/esb/services/utils
core/src/main/java/org/wso2/esb/statistics
core/src/main/java/org/wso2/esb/statistics/persistence
core/src/test/java/org/wso2/esb/util
distribution/src/main/www/extensions/core
distribution/src/main/www/extensions/core/xslt
svn at wso2.org
svn at wso2.org
Mon Feb 5 13:09:05 PST 2007
Author: asankha
Date: Mon Feb 5 13:08:09 2007
New Revision: 750
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Constants.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusException.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/modules/authentication/handler/AuthenticationHandler.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/PersistenceManager.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/BaseDAO.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/RegistryEntryDAO.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/BaseDO.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/RegistryEntryDO.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/StatisticsDO.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerStatus.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/persistence/StatisticsDBUtils.java
trunk/esb/java/modules/core/src/test/java/org/wso2/esb/util/ServiceBusUtils.java
trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl
Log:
code cleanup and refactoring
This line, and those below, will be ignored--
M modules/distribution/src/main/www/extensions/core/menu.html
M modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl
M modules/core/src/test/java/org/wso2/esb/util/ServiceBusUtils.java
M modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
M modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
M modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java
M modules/core/src/main/java/org/wso2/esb/services/utils/ServerStatus.java
M modules/core/src/main/java/org/wso2/esb/persistence/PersistenceManager.java
M modules/core/src/main/java/org/wso2/esb/persistence/dataobject/BaseDO.java
M modules/core/src/main/java/org/wso2/esb/persistence/dataobject/StatisticsDO.java
M modules/core/src/main/java/org/wso2/esb/persistence/dataobject/RegistryEntryDO.java
M modules/core/src/main/java/org/wso2/esb/persistence/dao/BaseDAO.java
M modules/core/src/main/java/org/wso2/esb/persistence/dao/RegistryEntryDAO.java
M modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
M modules/core/src/main/java/org/wso2/esb/ServiceBus.java
M modules/core/src/main/java/org/wso2/esb/statistics/persistence/StatisticsDBUtils.java
M modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
M modules/core/src/main/java/org/wso2/esb/Constants.java
M modules/core/src/main/java/org/wso2/esb/modules/authentication/handler/AuthenticationHandler.java
M modules/core/src/main/java/org/wso2/esb/ServiceBusException.java
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Constants.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Constants.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Constants.java Mon Feb 5 13:08:09 2007
@@ -18,78 +18,66 @@
import java.net.URI;
/*
- *
+ * Constants use by WSO2 ESB
*/
-
public final class Constants {
- public static final String MESSAGE_MAP_KEY = "Message_Map_Key";
- public static final String IN_MESSAGE_MAP_KEY = "IN_Message_Map_Key";
- public static final String OUT_MESSAGE_MAP_KEY = "OUT_Message_Map_Key";
- public static final String IN_FAULT_MESSAGE_MAP_KEY = "IN_FAULT_Message_Map_Key";
+ public static final String MESSAGE_MAP_KEY = "Message_Map_Key";
+ public static final String IN_MESSAGE_MAP_KEY = "IN_Message_Map_Key";
+ public static final String OUT_MESSAGE_MAP_KEY = "OUT_Message_Map_Key";
+ public static final String IN_FAULT_MESSAGE_MAP_KEY = "IN_FAULT_Message_Map_Key";
public static final String OUT_FAULT_MESSAGE_MAP_KEY = "OUT_FAULT_Message_Map_Key";
- public static String ADMIN_SERVICE_GROUP = "ESBAdmin";
- public static String ESB_INSTANCE = "WSO2 ESB";
+ public static final String ADMIN_SERVICE_GROUP = "ESBAdmin";
+ public static final String ESB_INSTANCE = "WSO2 ESB";
+ public static final String ESB_XML_NAMESPACE = "http://www.wso2.org/projects/esb";
+ public static final String ESB_WEB_XML_KEY = "ESB_WEB_XML_KEY";
- public static String ESB_XML_NAMESPACE = "http://www.wso2.org/projects/esb";
- public static String ESB_WEB_XML_KEY = "ESB_WEB_XML_KEY";
- public static final String WELCOME_PAGE = "INDEX_HTML_FILE";
- public static final String GENERATED_PAGES = "wso2esb.generated.pages";
+ public static final String WELCOME_PAGE = "INDEX_HTML_FILE";
+ public static final String GENERATED_PAGES = "wso2esb.generated.pages";
// Constants for ESB registry
-
- public static final int LOCAL_HOST_REGISTRY = 100;
- public static final int REMOTE_HOST_REGISTRY = 101;
- public static final int REGISTRY_MODE = LOCAL_HOST_REGISTRY;
- public static final String LOCAL_REGISTRY_ROOT = "registry/"; // this will be overwritten if localRegistry parameter is set
- public static final String REGISTRY_FILE = "file";
- public static final String REGISTRY_FOLDER = "folder";
- public static final URI folder = URI.create("http://wso2.org/projects/esb/registry/types/folder");
+ public static final int LOCAL_HOST_REGISTRY = 100;
+ public static final int REMOTE_HOST_REGISTRY = 101;
+ public static final int REGISTRY_MODE = LOCAL_HOST_REGISTRY;
+ // this will be overwritten if localRegistry parameter is set
+ public static final String LOCAL_REGISTRY_ROOT = "registry/";
+ public static final String REGISTRY_FILE = "file";
+ public static final String REGISTRY_FOLDER = "folder";
+ public static final URI folder =
+ URI.create("http://wso2.org/projects/esb/registry/types/folder");
// Constants for ESBSendMediator
-
- public static final String ESBSEND_ELEMENT = "send";
- public static final String LOADBALANCE_ELEMENT = "loadbalance";
- public static final String FAILOVER_ELEMENT = "failover"; // failover only element
+ public static final String ESBSEND_ELEMENT = "send";
+ public static final String LOADBALANCE_ELEMENT = "loadbalance";
+ public static final String FAILOVER_ELEMENT = "failover"; // failover only element
public static final String RETRY_AFTER_FAILURE_TIME = "retryAfterFailure";
- public static final String MAXIMUM_RETRIES = "maximumRetries";
- public static final String RETRY_INTERVAL = "retryInterval";
- public static final String FAILOVER = "failover"; // failover attribute in the loadbalance element
- public static final String SESSION_AFFINITY = "sessionAffinity";
- public static final String ALGORITHM_NAME = "algorithmName";
- public static final String FAILOVER_GROUP_ELEMENT = "failover"; // failover group element inside the loadbalance element
- public static final String DISPATCH_MANAGER = "DISPATCH_MANAGER";
- public static final String DISPATCHERS_ELEMENT = "dispatchers";
- public static final String DISPATCHER_ELEMENT = "dispatcher";
+ public static final String MAXIMUM_RETRIES = "maximumRetries";
+ public static final String RETRY_INTERVAL = "retryInterval";
+ public static final String FAILOVER = "failover"; // failover attribute in the loadbalance element
+ public static final String SESSION_AFFINITY = "sessionAffinity";
+ public static final String ALGORITHM_NAME = "algorithmName";
+ public static final String FAILOVER_GROUP_ELEMENT = "failover"; // failover group element inside the loadbalance element
+ public static final String DISPATCH_MANAGER = "DISPATCH_MANAGER";
+ public static final String DISPATCHERS_ELEMENT = "dispatchers";
+ public static final String DISPATCHER_ELEMENT = "dispatcher";
public static final String SAMPLE_CLIENT_INITIATED_SESSION = "SampleClientInitiatedSession";
public static final String SAMPLE_SERVER_INITIATED_SESSION = "SampleServerInitiatedSession";
public static final String SERVICE_GROUP_SESSION = "ServiceGroupSession";
public static final String WSO2ESB_HB_CONFIG_KEY ="wso2esb_hb_configuration_key";
-
public static int MSG_BUFFER_SIZE = 200;
public static class Logging {
-
- public static String ESB_CONSOLE_APPENDER = "ESB_CONSOLE_APPENDER";
+ public static String ESB_CONSOLE_APPENDER = "ESB_CONSOLE_APPENDER";
public static String ESB_LOG_FILE_APPENDER = "ESB_LOG_FILE_APPENDER";
- public static String ESB_MEMORY_APPENDER = "ESB_MEMORY_APPENDER";
+ public static String ESB_MEMORY_APPENDER = "ESB_MEMORY_APPENDER";
}
+
// Constants for DataBase Access
public static class DBAccess{
-
public static final String DERBY_NETWOEK_SERVER_DRIVER = "org.apache.derby.jdbc.ClientDriver";
-
-// /** Statistics Table Name */
-// public static final String STATISTICS_TABLE_NAME ="statistics";
-
- /**
- * Statistics Table Name
- */
public static final String STATISTICS_DO = "StatisticsDO";
-
-
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java Mon Feb 5 13:08:09 2007
@@ -30,58 +30,54 @@
import java.io.File;
/*
- * ESB Startup Class for Standalone distribution
+ * ESB Startup Class
*/
-
public class ServiceBus {
private static Log log = LogFactory.getLog(ServiceBus.class);
//ESB lifecycle commads
- public static final String COMMAND_START = "START";
- public static final String COMMAND_RUN = "RUN";
- public static final String COMMAND_STOP = "STOP";
+ public static final String COMMAND_START = "START";
+ public static final String COMMAND_RUN = "RUN";
+ public static final String COMMAND_STOP = "STOP";
public static final String COMMAND_STATUS = "STATUS";
- public static final String COMMAND_HELP = "HELP";
+ public static final String COMMAND_HELP = "HELP";
+
+ /** The Jetty server used internally to host the admin console */
private JettyServer jettyServer;
private static ServiceBusConfiguration esbConfiguration;
-
+ /** The thread which reads statistics from memory and write them to the DB */
private StatisticsReporterThread statisticsReporterThread;
-
private String axis2RepoLocation;
-
- private ServiceBusManager esbManager;
-
+ private ServiceBusManager serviceBusManager;
private static boolean isShutdownHookAdded;
-
-
public ServiceBus() {
- System.setProperty("esb.home", ".");
+ if (System.getProperty("esb.home") == null) {
+ System.setProperty("esb.home", ".");
+ }
esbConfiguration = ServiceBusConfiguration.getServiceBusInstance();
- esbManager = new ServiceBusManager(esbConfiguration);
+ serviceBusManager = new ServiceBusManager(esbConfiguration);
}
-
public void startServer() throws ServiceBusException {
try {
- esbManager.start();
+ serviceBusManager.start();
} catch (AxisFault axisFault) {
- log.fatal("WSO2 ESB Starting Failed", axisFault);
+ log.fatal("WSO2 ESB failed to start", axisFault);
throw new ServiceBusException(axisFault);
}
+
startListeners();
try {
- HttpServerManager
- .startServer(org.wso2.esb.transport.jetty.Constants.HTTP_SERVER);
+ HttpServerManager.startServer(org.wso2.esb.transport.jetty.Constants.HTTP_SERVER);
HttpServerManager.startServer(org.wso2.esb.transport.jetty.Constants.HTTPS_SERVER);
} catch (Exception e) {
- log.fatal("WSO2 ESB Encounterd an Error", e);
+ log.fatal("Error starting http/s servers", e);
throw new ServiceBusException(e);
}
-
}
public void stopServer() throws ServiceBusException {
@@ -89,17 +85,17 @@
}
private void startListeners() throws ServiceBusException {
- jettyServer = new JettyServer(esbManager.configurationContext);
+
+ jettyServer = new JettyServer(serviceBusManager.configurationContext);
try {
jettyServer.start();
} catch (AxisFault axisFault) {
throw new ServiceBusException(axisFault);
}
- Parameter synapseEnvParameter = esbManager.configurationContext.getAxisConfiguration().getParameter(org.apache.synapse.Constants.SYNAPSE_ENV);
+ Parameter synapseEnvParameter = serviceBusManager.configurationContext.getAxisConfiguration().getParameter(org.apache.synapse.Constants.SYNAPSE_ENV);
if (synapseEnvParameter != null) {
try {
-
SynapseEnvironment synEnv = (SynapseEnvironment) synapseEnvParameter.getValue();
statisticsReporterThread = new StatisticsReporterThread(synEnv);
statisticsReporterThread.start();
@@ -110,30 +106,31 @@
}
//THIS METHOD ONLY FOR TESTING PURPOSES.
- public void startListener(final int port) throws AxisFault {
- esbManager.start();
- jettyServer = new JettyServer(esbManager.configurationContext);
+ public void startListener(final int port) throws AxisFault, ServiceBusException {
+ serviceBusManager.start();
+ jettyServer = new JettyServer(serviceBusManager.configurationContext);
jettyServer.start();
}
private void stopListeners() throws ServiceBusException {
if (statisticsReporterThread != null) {
- statisticsReporterThread.interrupt();
+ statisticsReporterThread.shutdown();
}
+
// To shutdown derby network server
try {
- esbManager.startDataBaseServer();
+ serviceBusManager.stopDataBaseServer();
} catch (Exception e) {
log.fatal(e);
}
+
if (jettyServer != null) {
try {
jettyServer.stop();
} catch (AxisFault axisFault) {
- log.fatal("ServiceBus#stopListener encounted an error");
- throw new ServiceBusException(
- "ServiceBus#stopListener encounted an error");
+ log.fatal("ServiceBus#stopListener encounted an error", axisFault);
+ throw new ServiceBusException("ServiceBus#stopListener encounted an error");
}
} else {
log.fatal("ServiceBus#stopListener encounted an error");
@@ -143,7 +140,7 @@
}
public void status() {
- esbManager.status();
+ //serviceBusManager.status();
}
public void shutdown() throws ServiceBusException {
@@ -284,7 +281,7 @@
}
public ConfigurationContext getConfigurationContext() {
- return this.esbManager.configurationContext;
+ return this.serviceBusManager.configurationContext;
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusConfiguration.java Mon Feb 5 13:08:09 2007
@@ -21,18 +21,16 @@
import org.wso2.utils.ServerConfiguration;
/*
- *
+ * Loads the service bus configuration from the config file server.xml
*/
-
public class ServiceBusConfiguration extends ServerConfiguration {
+
private static Log log = LogFactory.getLog(ServiceBusConfiguration.class);
private static ServiceBusConfiguration configuration = null;
private ServiceBusConfiguration() {
super();
- log.info("ServiceBusConfiguration");
-
}
public static ServiceBusConfiguration getServiceBusInstance() {
@@ -40,9 +38,8 @@
// intializing the configurationXMLLocation
configurationXMLLocation = "conf/server.xml";
configuration = new ServiceBusConfiguration();
+ log.info("Service Bus Configuration loaded from : " + configurationXMLLocation);
}
return configuration;
}
-
-
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusException.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusException.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusException.java Mon Feb 5 13:08:09 2007
@@ -18,7 +18,6 @@
/*
*
*/
-
public class ServiceBusException extends Exception {
private static final long serialVersionUID = 5967324819038387267L;
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java Mon Feb 5 13:08:09 2007
@@ -28,6 +28,7 @@
import org.wso2.adminui.UIProcessor;
import org.wso2.esb.util.XmlConfigurationFactory;
import org.wso2.esb.util.JettyWebConfiguration;
+import org.wso2.utils.ServerException;
import java.io.File;
import java.net.UnknownHostException;
@@ -35,21 +36,18 @@
import java.util.Properties;
/*
- *
+ * The Service bus manager
*/
-
public class ServiceBusManager {
- public static int httpPort = 8080;
- public static int httpsPort = 9443;
-
private static Log log = LogFactory.getLog(ServiceBusManager.class);
- private ServiceBusConfiguration esbConfiguration;
+ public static int httpPort = 8080;
+ public static int httpsPort = 9443;
+ private ServiceBusConfiguration esbConfiguration;
public ConfigurationContext configurationContext;
-
- private NetworkServerControl networkServerControl ;
+ private NetworkServerControl networkServerControl;
public ServiceBusManager() {
this(ServiceBusConfiguration.getServiceBusInstance());
@@ -59,79 +57,90 @@
this.esbConfiguration = esbConfiguration;
}
- // Authentication via wso2esb.html, need a database to do this
- // FixMe This code need to be moved to a Adminstrative Class which can access a
- // database.
+ /**
+ * This implementation does not validaye the user against a database. In future it
+ * is envisioned that the ESB will reuse the common authentication components shared
+ * between WSAS and ESB
+ * @param username
+ * @param password
+ * @return true if the user is authenticated successfully
+ */
public boolean authenticate(String username, String password) {
- String esb_username =
- esbConfiguration.getFirstProperty("DefaultAdmin.Username");
- String esb_password =
- esbConfiguration.getFirstProperty("DefaultAdmin.Password");
+ String esb_username = esbConfiguration.getFirstProperty("DefaultAdmin.Username");
+ String esb_password = esbConfiguration.getFirstProperty("DefaultAdmin.Password");
return username.equals(esb_username) &&
password.equals(esb_password);
+ }
+ /**
+ * Starts the Derby database instance in network mode for multi user access
+ * Waits till the server can be pinged, upto a maximum of 10 seconds
+ * @throws ServiceBusException
+ */
+ public void startDataBaseServer() throws ServiceBusException {
- }
- public void startDataBaseServer() throws Exception {
- //start derby network server
+ String host = null;
try {
networkServerControl = new NetworkServerControl();
networkServerControl.start(null);
- for (int i=0; i<5; i++) {
+
+ for (int i=0; i<10; i++) {
Thread.sleep(1000);
try {
networkServerControl.ping();
Properties properties = networkServerControl.getCurrentProperties();
- String host = properties.getProperty("derby.drda.host");
+ host = properties.getProperty("derby.drda.host");
int port = Integer.parseInt(properties.getProperty("derby.drda.portNumber"));
- log.info("DataBase Network Server :: Host :" + host + " Port :" + port);
+ log.info("Database server started on " + host + " over port " + port);
return;
+
} catch (Exception ignore) {}
}
- log.fatal("Derby DB Network Server failed to start");
- throw new ServiceBusException("Derby DB Network Server failed to start");
+ handleFatal("Database server failed to start");
+
} catch (UnknownHostException e) {
- throw new ServiceBusException(e);
+ handleException("Unknown host : " + host, e);
} catch (Exception e) {
- throw new ServiceBusException(e);
+ handleException("Error starting the database server", e);
}
}
-
+
+ /**
+ * Requests the Derby DB to stop itself
+ * @throws ServiceBusException
+ */
public void stopDataBaseServer() throws ServiceBusException {
if (networkServerControl != null) {
try {
networkServerControl.shutdown();
- log.info("Network Server is shopped");
+ log.info("Database server shutting down");
} catch (Exception e) {
throw new ServiceBusException(e);
}
}
}
- public void start() throws AxisFault {
- log.debug("ServiceBusManager#start()");
+ public void start() throws AxisFault, ServiceBusException {
+
+ log.debug("Starting the ServiceBusManager");
initSystemProperties();
- try {
- startDataBaseServer();
- } catch (Exception e) {
- log.fatal(e);
- }
+ startDataBaseServer();
//axis2.xml ; axis2.repo and synapse.xml will inject as System properties
- configurationContext = ConfigurationContextFactory
- .createConfigurationContextFromFileSystem(null, null);
+ configurationContext = ConfigurationContextFactory.
+ createConfigurationContextFromFileSystem(null, null);
initListenerManager();
// intializing configs related to JettyServer
try {
- XmlConfigurationFactory.init(Constants.ESB_WEB_XML_KEY, "conf/server-web.xml",
- Constants.ESB_XML_NAMESPACE);
- } catch (Exception e) {
- log.fatal(e);
+ XmlConfigurationFactory.init(Constants.ESB_WEB_XML_KEY,
+ "conf/server-web.xml", Constants.ESB_XML_NAMESPACE);
+ } catch (ServerException e) {
+ handleException("Error loading server-web.xml", e);
}
JettyWebConfiguration.getInstance().setXmlFileKey(Constants.ESB_WEB_XML_KEY);
JettyWebConfiguration.getInstance().init();
@@ -141,20 +150,21 @@
}
- private void generateWelcomePage() {
- // Create the index.html page and save it in the ConfigContext
+ /**
+ * Generate the index.html page and cache it in the ConfigurationContext
+ */
+ private void generateWelcomePage() throws ServiceBusException {
+
Hashtable fileContents = new Hashtable();
try {
UIProcessor.createPages(
- JettyWebConfiguration.getInstance().adminWebResourceBase, null, fileContents);
+ JettyWebConfiguration.getInstance().adminWebResourceBase, null, fileContents);
} catch (UIProcessingException e) {
- log.warn("Welcome page generation failed: " + e);
- log.debug("Welcome page generation failed", e);
+ handleException("Error generating welcome page", e);
}
configurationContext.setProperty(Constants.GENERATED_PAGES, fileContents);
}
-
private void initListenerManager() {
ListenerManager listenerManager = new ListenerManager();
listenerManager.init(configurationContext);
@@ -164,40 +174,35 @@
private void initSystemProperties() {
String axis2Xml = System.getProperty("axis2.xml");
- String esbHome =
- System.getProperty("esb.home"); // this has to be provided
+ String esbHome = System.getProperty("esb.home"); // this has to be provided
if (axis2Xml == null) {
- System.setProperty("axis2.xml", esbHome + File.separator +
- "conf" + File.separator +
- "axis2.xml");
+ System.setProperty("axis2.xml",
+ esbHome + File.separator + "conf" + File.separator + "axis2.xml");
}
String esbXml = System.getProperty("esb.xml");
-
if (esbXml == null) {
- System.setProperty("esb.xml",
- ServiceBusConfiguration.configurationXMLLocation);
+ System.setProperty("esb.xml", ServiceBusConfiguration.configurationXMLLocation);
}
String synapseXml = System.getProperty("synapse.xml");
-
if (synapseXml == null) {
- System.setProperty("synapse.xml", esbHome + File.separator +
- "conf" + File.separator +
- "synapse.xml");
+ System.setProperty("synapse.xml",
+ esbHome + File.separator + "conf" + File.separator + "synapse.xml");
}
- System.setProperty("derby.system.home",esbHome + File.separator +
- "conf");
- // axis2.repo needed to dealt with.
-
+ System.setProperty("derby.system.home",esbHome + File.separator + "conf");
}
- /*TODO: contextPath and serviePath does not configure in run time.
- TODO: Thus defaults will be used here. */
+ private static void handleFatal(String msg) throws ServiceBusException {
+ log.fatal(msg);
+ throw new ServiceBusException(msg);
+ }
- public void status() {
- //TODO Status report
+ private static void handleException(String msg, Exception e) throws ServiceBusException {
+ log.error(msg, e);
+ throw new ServiceBusException(msg, e);
}
+
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/modules/authentication/handler/AuthenticationHandler.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/modules/authentication/handler/AuthenticationHandler.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/modules/authentication/handler/AuthenticationHandler.java Mon Feb 5 13:08:09 2007
@@ -23,40 +23,30 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.wso2.esb.services.AbstractESBAdmin;
/*
- * This will Authenticate if the Request is for administrative
- * Services only.
+ * This will Authenticate admin services requests
*/
-
public class AuthenticationHandler extends AbstractHandler {
- private MessageContext msgContext;
- private static final String LOGIN_ADMIN = "LoginAdmin";
+ private static final String LOGIN_ADMIN = "LoginAdmin";
private static final String LOGIN_METHOD = "login";
- public InvocationResponse invoke(MessageContext messageContext) throws AxisFault {
- this.msgContext = messageContext;
- authenticate();
- return InvocationResponse.CONTINUE;
- }
-
- protected void authenticate() throws AxisFault {
- if (!isAuthenticated()) {
- throw new AxisFault("Access Denied. Please login first.");
- }
- }
+ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
- private boolean isAuthenticated() {
- OperationContext opCtx = msgContext.getOperationContext();
+ OperationContext opCtx = msgContext.getOperationContext();
ServiceContext serviceCtx = opCtx.getServiceContext();
if (serviceCtx.getAxisService().getName().equals(LOGIN_ADMIN) &&
- opCtx.getAxisOperation().getName().getLocalPart()
- .equals(LOGIN_METHOD)) {
- return true;
+ opCtx.getAxisOperation().getName().getLocalPart().equals(LOGIN_METHOD)) {
+ return InvocationResponse.CONTINUE;
}
- String status =
- (String) serviceCtx.getServiceGroupContext()
- .getProperty(AbstractESBAdmin.LOGGED);
- return "true".equals(status);
+
+ String status = (String) serviceCtx.getServiceGroupContext()
+ .getProperty(AbstractESBAdmin.LOGGED);
+
+ if (!"true".equals(status)) {
+ throw new AxisFault("Access Denied. Please login first.");
+ }
+
+ return InvocationResponse.CONTINUE;
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/PersistenceManager.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/PersistenceManager.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/PersistenceManager.java Mon Feb 5 13:08:09 2007
@@ -28,20 +28,17 @@
/**
*
- *
*/
-
public class PersistenceManager {
- /**
- * The HibernateConfiguration
- */
- private HibernateConfig hbConfig;
private static Log log = LogFactory.getLog(PersistenceManager.class);
+ /** The HibernateConfiguration */
+ private HibernateConfig hbConfig;
+
public PersistenceManager() {
this.hbConfig = HibernateConfigFactory.getDefaultConfig(
- org.wso2.esb.Constants.WSO2ESB_HB_CONFIG_KEY, "wso2esb.hibernate.cfg.xml");
+ org.wso2.esb.Constants.WSO2ESB_HB_CONFIG_KEY, "wso2esb.hibernate.cfg.xml");
}
public PersistenceManager(HibernateConfig hbConfig) {
@@ -49,7 +46,7 @@
}
/**
- * To add a Statistics Record
+ * add a Statistics Record to the database
*
* @param statisticsDO
*/
@@ -58,7 +55,7 @@
}
/**
- * To delete a Statistics Record
+ * delete a Statistics Record
*
* @param statisticsDO
*/
@@ -67,7 +64,7 @@
}
/**
- * To update a Satistics Record
+ * update a Satistics Record
*
* @param statisticsDO
*/
@@ -76,7 +73,7 @@
}
/**
- * To Retrieves Statistics Records
+ * Retrieves Statistics Records
*
* @param hqlQuery
* @return The Statistics Records
@@ -86,7 +83,7 @@
}
/**
- * To Retrieves Statistics Records using SQL
+ * Retrieves Statistics Records using custom SQL query passed in
*
* @param sqlQuery
* @param aClass
@@ -110,8 +107,7 @@
return new StatisticsDAO(hbConfig).selectCustomObjectList(hqlQuery);
}
- /* Data access methods for ESB registry */
-
+ /* Data access methods for ESB registry */
public void addRegistryEntry(RegistryEntryDO registryEntryDO) {
new RegistryEntryDAO(hbConfig).addRegistryEntry(registryEntryDO);
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/BaseDAO.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/BaseDAO.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/BaseDAO.java Mon Feb 5 13:08:09 2007
@@ -25,18 +25,15 @@
import java.util.List;
/**
- *
- *
+ * The base DataAccessObject from which each DAO of the ESB is extended
*/
-
public abstract class BaseDAO {
- /**
- * The HibernateConfiguration
- */
- protected HibernateConfig hbConfig;
protected Logger log = Logger.getLogger(BaseDAO.class);
+ /** The HibernateConfiguration */
+ protected HibernateConfig hbConfig;
+
public BaseDAO(HibernateConfig hbConfig) {
this.hbConfig = hbConfig;
}
@@ -56,12 +53,11 @@
session.flush();
tx.commit();
} catch (ConstraintViolationException e) {
- String msg = "Trying to create duplicate entity";
+ String msg = "Trying to create duplicate entity : " + trasientInstance;
log.warn(msg, e);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (HibernateException e) {
tx.rollback();
- throw new RuntimeException("Cannot create entity", e);
+ handleException("Cannot create entity " + trasientInstance, e);
} finally {
hbConfig.closeSession();
}
@@ -84,12 +80,11 @@
session.flush();
tx.commit();
} catch (ConstraintViolationException e) {
- String msg = "Trying to create duplicate entity";
+ String msg = "Trying to create duplicate entity " + instance;
log.warn(msg, e);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (HibernateException e) {
tx.rollback();
- throw new RuntimeException("Cannot create entity", e);
+ handleException("Cannot create entity " + instance, e);
} finally {
hbConfig.closeSession();
}
@@ -110,11 +105,9 @@
session.merge(abstractDO);
session.flush();
tx.commit();
- } catch (Throwable e) {
+ } catch (HibernateException e) {
tx.rollback();
- String msg = "Unable to update";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
+ handleException("Unable to update " + abstractDO, e);
} finally {
hbConfig.closeSession();
}
@@ -132,11 +125,9 @@
session.delete(abstractDO);
session.flush();
tx.commit();
- } catch (Throwable e) {
+ } catch (HibernateException e) {
tx.rollback();
- String msg = "Unable to delete";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
+ handleException("Unable to delete " + abstractDO, e);
} finally {
hbConfig.closeSession();
}
@@ -156,11 +147,9 @@
try {
query = session.createQuery(hqlQuery);
result = query.list();
- } catch (Throwable e) {
+ } catch (HibernateException e) {
tx.rollback();
- String msg = "Unable to get Data Object";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
+ handleException("Error executing HQL query : " + hqlQuery, e);
} finally {
hbConfig.closeSession();
}
@@ -182,11 +171,9 @@
try {
query = session.createQuery(hqlQuery);
result = query.uniqueResult();
- } catch (Throwable e) {
+ } catch (HibernateException e) {
tx.rollback();
- String msg = "Unable to get Data Object";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
+ handleException("Error executing HQL query : " + hqlQuery, e);
} finally {
hbConfig.closeSession();
}
@@ -203,31 +190,30 @@
public List selectBySQL(String sqlQuery, Class aClass) {
Session session = hbConfig.currentSession();
List result = null;
- if (session != null) {
- Transaction tx = session.beginTransaction();
- try {
- SQLQuery query = session.createSQLQuery(sqlQuery).addEntity(aClass);
- result = query.list();
-
- } catch (HibernateException e) {
- tx.rollback();
- log.error(e);
- } catch (Exception e) {
- tx.rollback();
- log.error(e);
- } finally {
- if (session != null) {
- try {
- hbConfig.closeSession();
- } catch (HibernateException ignore) {
- log.warn(ignore);
- }
+
+ Transaction tx = session.beginTransaction();
+ try {
+ SQLQuery query = session.createSQLQuery(sqlQuery).addEntity(aClass);
+ result = query.list();
+
+ } catch (HibernateException e) {
+ tx.rollback();
+ handleException("Error executing SQL : " + sqlQuery, e);
+ } finally {
+ if (session != null) {
+ try {
+ hbConfig.closeSession();
+ } catch (HibernateException ignore) {
+ log.warn(ignore);
}
}
- } else {
- log.info("Session Factory is null");
}
return result;
}
+
+ private void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/RegistryEntryDAO.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/RegistryEntryDAO.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dao/RegistryEntryDAO.java Mon Feb 5 13:08:09 2007
@@ -24,6 +24,7 @@
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
import org.hibernate.criterion.Expression;
public class RegistryEntryDAO extends BaseDAO {
@@ -36,7 +37,7 @@
if (registryEntryDO != null && registryEntryDO.getRegistryKey() != null) {
super.create(registryEntryDO);
} else {
- throw new RuntimeException("Invalid registry entry.");
+ throw new RuntimeException("Invalid registry entry for add " + registryEntryDO);
}
}
@@ -48,7 +49,7 @@
super.update(storedEntry);
}
} else {
- throw new RuntimeException("Invalid registry entry.");
+ throw new RuntimeException("Invalid registry entry for update " + registryEntryDO);
}
}
@@ -62,23 +63,30 @@
super.create(registryEntryDO);
}
} else {
- throw new RuntimeException("Invalid registry entry.");
+ throw new RuntimeException("Invalid registry entry for save/update " + registryEntryDO);
}
}
public RegistryEntryDO getRegistryEntry(String key) {
Session session = hbConfig.currentSession();
- Transaction tx = session.beginTransaction();
-
- Criteria criteria = session.createCriteria(RegistryEntryDO.class);
- criteria.add(Expression.eq("registryKey", key.trim()));
-
- RegistryEntryDO registryEntryDO = (RegistryEntryDO) criteria.uniqueResult();
-
- session.flush();
- tx.commit();
- hbConfig.closeSession();
+ Transaction tx = null;
+ RegistryEntryDO registryEntryDO = null;
+ try {
+ tx = session.beginTransaction();
+ Criteria criteria = session.createCriteria(RegistryEntryDO.class);
+ criteria.add(Expression.eq("registryKey", key.trim()));
+ registryEntryDO = (RegistryEntryDO) criteria.uniqueResult();
+ session.flush();
+ tx.commit();
+ } catch (HibernateException e) {
+ tx.rollback();
+ String msg = "Error getting registry key for key : " + key;
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ } finally {
+ session.close();
+ }
return registryEntryDO;
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/BaseDO.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/BaseDO.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/BaseDO.java Mon Feb 5 13:08:09 2007
@@ -18,10 +18,8 @@
import java.util.Date;
/**
- *
- *
+ * Base data object for all DO's used in the ESB
*/
-
public abstract class BaseDO {
private Long id;
@@ -46,4 +44,11 @@
public void setLastUpdatedTime(Date lastUpdatedTime) {
this.lastUpdatedTime = lastUpdatedTime;
}
+
+ public String toString() {
+ return "BaseDO{" +
+ "id=" + id +
+ ", lastUpdatedTime=" + lastUpdatedTime +
+ '}';
+ }
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/RegistryEntryDO.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/RegistryEntryDO.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/RegistryEntryDO.java Mon Feb 5 13:08:09 2007
@@ -19,6 +19,9 @@
package org.wso2.esb.persistence.dataobject;
+/**
+ * The DO representing a RegistryEntry record
+ */
public class RegistryEntryDO extends BaseDO {
private String registryKey;
@@ -39,4 +42,11 @@
public void setExpiryTime(Long expiryTime) {
this.expiryTime = expiryTime;
}
+
+ public String toString() {
+ return "RegistryEntryDO{" +
+ "registryKey='" + registryKey + '\'' +
+ ", expiryTime=" + expiryTime +
+ '}';
+ }
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/StatisticsDO.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/StatisticsDO.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/persistence/dataobject/StatisticsDO.java Mon Feb 5 13:08:09 2007
@@ -16,10 +16,8 @@
package org.wso2.esb.persistence.dataobject;
/**
- *
- *
+ * The DO representing a statistics record
*/
-
public class StatisticsDO extends BaseDO {
private String serverId;
@@ -32,10 +30,11 @@
private double avgTime;
private long direction;
- public StatisticsDO() {
- }
+ public StatisticsDO() {}
+
+ public StatisticsDO(String serverId, long category, String name, long totalCount,
+ long faultCount, long maxTime, long minTime, double avgTime, long direction) {
- public StatisticsDO(String serverId, long category, String name, long totalCount, long faultCount, long maxTime, long minTime, double avgTime, long direction) {
this.serverId = serverId;
this.category = category;
this.name = name;
@@ -118,4 +117,18 @@
public void setDirection(long direction) {
this.direction = direction;
}
+
+ public String toString() {
+ return "StatisticsDO{" +
+ "serverId='" + serverId + '\'' +
+ ", category=" + category +
+ ", name='" + name + '\'' +
+ ", totalCount=" + totalCount +
+ ", faultCount=" + faultCount +
+ ", maxTime=" + maxTime +
+ ", minTime=" + minTime +
+ ", avgTime=" + avgTime +
+ ", direction=" + direction +
+ '}';
+ }
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java Mon Feb 5 13:08:09 2007
@@ -28,64 +28,64 @@
import org.wso2.esb.services.utils.ServerStatus;
import org.wso2.esb.services.utils.ServerData;
import org.wso2.utils.MemoryAppender;
+
/*
- *
+ * Returns ServerStatus for the ESB home page
+ * Detailed ServerData for the Manage->System page
+ * Tracing and Log entry views off the MemoryAppender
*/
-
public class ServerAdmin extends AbstractESBAdmin {
private static Logger log = Logger.getLogger(ServerAdmin.class);
public ServerStatus getStatus() throws AxisFault {
-
- ServerStatus serverStatus = new ServerStatus();
- serverStatus.update(getAxisConfig());
- return serverStatus;
- }
+ return new ServerStatus(getAxisConfig());
+ }
public ServerData getServerData() throws AxisFault {
-
return new ServerData(
- org.wso2.esb.Constants.ESB_INSTANCE,
- getAxisConfig().getRepository().getPath());
+ org.wso2.esb.Constants.ESB_INSTANCE,
+ getAxisConfig().getRepository().getPath());
}
public String[] getTraceLogs(int amount) throws ServiceBusException {
+
int DEFAULT_NO_OF_LOGS = 100;
String DEFAULT_LOGGING_PATTERN = "[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n";
Logger logger = Logger.getLogger(org.apache.synapse.Constants.TRACE_LOGGER);
Appender appender = logger.getAppender("TRACE_MEMORYAPPENDER");
+
if (appender instanceof MemoryAppender) {
MemoryAppender memoryAppender = (MemoryAppender) appender;
if ((memoryAppender.getCircularQueue() == null) ||
- (memoryAppender.getCircularQueue().getObjects(amount) ==
- null) ||
- (memoryAppender.getCircularQueue().getObjects(amount)
- .length == 0)) {
+ (memoryAppender.getCircularQueue().getObjects(amount) == null) ||
+ (memoryAppender.getCircularQueue().getObjects(amount).length == 0)) {
+
return new String[]{
- "--- No Trace Entries Found. " +
- "Need to enable trace in mediator level ---"
- };
+ "--- No Trace Entries Found. " +
+ "You need to enable tracing on the configuration elements ---"};
}
- Object[] objects;
+ Object[] objects;
if (amount < 1) {
- objects = memoryAppender.getCircularQueue()
- .getObjects(DEFAULT_NO_OF_LOGS);
+ objects = memoryAppender.getCircularQueue().getObjects(DEFAULT_NO_OF_LOGS);
} else {
objects = memoryAppender.getCircularQueue().getObjects(amount);
}
- String [] resp = new String[objects.length];
+
+ String[] resp = new String[objects.length];
Layout layout = new PatternLayout(DEFAULT_LOGGING_PATTERN);
for (int i = 0; i < objects.length; i++) {
LoggingEvent logEvt = (LoggingEvent) objects[i];
resp[i] = layout.format(logEvt);
}
+
return resp;
} else {
- throw new ServiceBusException("");
+ throw new ServiceBusException("The Trace log must be configured to use the " +
+ "org.wso2.utils.MemoryAppender to view entries on the admin console");
}
}
@@ -95,16 +95,14 @@
int DEFAULT_NO_OF_LOGS = 100;
String DEFAULT_LOGGING_PATTERN = "%5p [%d] [%t] %C{1} - %m%n";
- MemoryAppender memoryAppender = (MemoryAppender) Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER") ;
+ MemoryAppender memoryAppender = (MemoryAppender) Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER");
if ((memoryAppender == null) ||
- (memoryAppender.getCircularQueue() == null) ||
- (memoryAppender.getCircularQueue().getObjects(amount) ==
- null) ||
- (memoryAppender.getCircularQueue().getObjects(amount)
- .length == 0)) {
+ (memoryAppender.getCircularQueue() == null) ||
+ (memoryAppender.getCircularQueue().getObjects(amount) == null) ||
+ (memoryAppender.getCircularQueue().getObjects(amount).length == 0)) {
resp = new String[]{
- "--- No Log Entries Found. " +
- "You may try increasing the log level ---"
+ "--- No Log Entries Found. " +
+ "You may try increasing the log level ---"
};
return resp;
@@ -113,17 +111,14 @@
Object[] objects;
if (amount < 1) {
- objects = memoryAppender.getCircularQueue()
- .getObjects(DEFAULT_NO_OF_LOGS);
+ objects = memoryAppender.getCircularQueue().getObjects(DEFAULT_NO_OF_LOGS);
} else {
objects = memoryAppender.getCircularQueue().getObjects(amount);
}
resp = new String[objects.length];
-
Layout layout = new PatternLayout(DEFAULT_LOGGING_PATTERN);
-
for (int i = 0; i < objects.length; i++) {
LoggingEvent logEvt = (LoggingEvent) objects[i];
resp[i] = layout.format(logEvt);
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java Mon Feb 5 13:08:09 2007
@@ -2,7 +2,11 @@
import org.wso2.esb.ServiceBusConfiguration;
+/**
+ * Compute and Hold detailed server information
+ */
public class ServerData {
+
private String javaRuntimeName;
private String javaVMVersion;
private String javaVMVendor;
@@ -31,25 +35,24 @@
private void init() {
javaRuntimeName = System.getProperty("java.runtime.name");
- javaVMVersion = System.getProperty("java.vm.version");
- javaVMVendor = System.getProperty("java.vm.vendor");
- userCountry = System.getProperty("user.country");
- osName = System.getProperty("os.name");
- osVersion = System.getProperty("os.version");
- userHome = System.getProperty("user.home");
- userTimezone = System.getProperty("user.timezone");
- userName = System.getProperty("user.name");
- javaHome = System.getProperty("java.home");
- javaVersion = System.getProperty("java.version");
+ javaVMVersion = System.getProperty("java.vm.version");
+ javaVMVendor = System.getProperty("java.vm.vendor");
+ userCountry = System.getProperty("user.country");
+ osName = System.getProperty("os.name");
+ osVersion = System.getProperty("os.version");
+ userHome = System.getProperty("user.home");
+ userTimezone = System.getProperty("user.timezone");
+ userName = System.getProperty("user.name");
+ javaHome = System.getProperty("java.home");
+ javaVersion = System.getProperty("java.version");
wso2wsasVersion = ServiceBusConfiguration.getInstance().getFirstProperty("Version");
- axis2Location = axis2Location();
+ axis2Location = axis2Location();
}
private String axis2Location() {
try {
Class clazz = Class.forName("org.apache.axis2.engine.AxisEngine");
- java.net.URL url = clazz.getProtectionDomain().getCodeSource()
- .getLocation();
+ java.net.URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
String location = url.toString();
if (location.startsWith("jar")) {
@@ -59,13 +62,14 @@
if (location.startsWith("file")) {
java.io.File file = new java.io.File(url.getFile());
-
return file.getAbsolutePath();
+
} else {
return url.toString();
}
+
} catch (Throwable t) {
- return "an unknown location";
+ return "An error occured while trying to determine Axis2 location";
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerStatus.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerStatus.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerStatus.java Mon Feb 5 13:08:09 2007
@@ -23,17 +23,18 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.wso2.statistics.StatisticsConstants;
+import org.wso2.statistics.Counter;
import org.wso2.statistics.module.StatisticsModule;
-import org.wso2.utils.Counter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
+
/*
- *
+ * Holds information about the server status which is displayed on the home page
*/
-
public class ServerStatus {
+
private int responseCount;
private int faultCount;
private String serverName;
@@ -50,62 +51,74 @@
private SimpleDateFormat dateFormatter = new SimpleDateFormat(
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+ /**
+ * Generate server status data reading necessary information from the
+ * Axis2 configuration passed in
+ *
+ * @param axisConfig
+ * @throws AxisFault
+ */
+ public ServerStatus(AxisConfiguration axisConfig) throws AxisFault {
- public void update(AxisConfiguration axisConfig) throws AxisFault {
Parameter systemStartTime = axisConfig.getParameter(StatisticsConstants.SERVER_START_TIME);
long startTime = ((Long) systemStartTime.getValue()).longValue();
Date stTime = new Date(startTime);
serverStartTime = dateFormatter.format(stTime);
systemUpTime = (getTime((System.currentTimeMillis() - startTime) / 1000));
- Parameter globalCounter = axisConfig.getParameter(
- StatisticsConstants.GLOBAL_REQUEST_COUNTER);
- // need to handle responses as well, once the metrics are in order with Synapse.
+ Parameter globalCounter = axisConfig.getParameter(StatisticsConstants.GLOBAL_REQUEST_COUNTER);
+ // need to handle responses as well, once the metrics are in order with Synapse.
if (globalCounter != null) {
Object value = globalCounter.getValue();
-
if (value instanceof Counter) {
requestCount = ((Counter) value).getCount();
}
}
responseCount =
- ((Counter) axisConfig.
+ ((org.wso2.statistics.Counter) axisConfig.
getParameter(StatisticsConstants.GLOBAL_RESPONSE_COUNTER).getValue()).
getCount();
faultCount =
- ((Counter) axisConfig.
+ ((org.wso2.statistics.Counter) axisConfig.
getParameter(StatisticsConstants.GLOBAL_FAULT_COUNTER).getValue()).
getCount();
- freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
+
+ freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
totalMemory = formatMemoryValue(Runtime.getRuntime().totalMemory());
- AxisServiceGroup asg = axisConfig.getServiceGroup(org.wso2.esb.Constants.ADMIN_SERVICE_GROUP);
- Iterator srviceitr = asg.getServices();
+ AxisServiceGroup asg =
+ axisConfig.getServiceGroup(org.wso2.esb.Constants.ADMIN_SERVICE_GROUP);
+
int adminservicecout = 0;
int activeServices = 0;
int totalRequestForAdmin = 0;
int totalResponseFromAdmin = 0;
int totalFaultCountForAdmin = 0;
- while (srviceitr.hasNext()) {
- AxisService axisService = (AxisService) srviceitr.next();
+
+ Iterator iter = asg.getServices();
+ while (iter.hasNext()) {
+
+ AxisService axisService = (AxisService) iter.next();
Parameter parameter =
- axisService
- .getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER);
+ axisService.getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER);
+
if (parameter != null) {
totalRequestForAdmin += ((Counter) parameter.getValue()).getCount();
}
+
Parameter faultCounterParameter =
- axisService
- .getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER);
+ axisService.getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER);
+
if (faultCounterParameter != null) {
totalFaultCountForAdmin += ((Counter) faultCounterParameter.getValue()).getCount();
}
- totalResponseFromAdmin = totalResponseFromAdmin + getServiceResponseCount(axisService);
+ totalResponseFromAdmin = totalResponseFromAdmin + getServiceResponseCount(axisService);
adminservicecout++;
}
+
Iterator services = axisConfig.getServices().values().iterator();
while (services.hasNext()) {
@@ -120,47 +133,19 @@
}
}
- // conter for Synapse Service As well
+ // counter includes Synapse Service as well
// Following code only Shows the awailable proxy services.
- requestCount -= totalRequestForAdmin;
+ requestCount -= totalRequestForAdmin;
responseCount -= totalResponseFromAdmin;
- faultCount -= totalFaultCountForAdmin;
- this.services = activeServices - adminservicecout - 1;
- serverName = org.wso2.esb.Constants.ESB_INSTANCE;
+ faultCount -= totalFaultCountForAdmin;
+ this.services = activeServices - adminservicecout - 1;
+ serverName = org.wso2.esb.Constants.ESB_INSTANCE;
avgResponseTime = StatisticsModule.responseTimeProcessor.getAvgResponseTime();
maxResponseTime = StatisticsModule.responseTimeProcessor.getMaxResponseTime();
minResponseTime = StatisticsModule.responseTimeProcessor.getMinResponseTime();
}
- public String getSystemUpTime() {
- return systemUpTime;
- }
-
- public String getServerStartTime() {
- return serverStartTime;
- }
-
- public String getServerName() {
- return serverName;
- }
-
- public int getRequestCount() {
- return requestCount;
- }
-
- public int getServices() {
- return services;
- }
-
- public String getFreeMemory() {
- return freeMemory;
- }
-
- public String getTotalMemory() {
- return totalMemory;
- }
-
private String formatMemoryValue(long value) {
String formatterMemoryValue = "";
@@ -190,7 +175,48 @@
seconds = timeInSeconds;
return hours + " hour(s) " + minutes + " minute(s) " + seconds +
- " second(s)";
+ " second(s)";
+ }
+
+ public int getServiceResponseCount(AxisService axisService) throws AxisFault {
+
+ int count = 0;
+ for (Iterator opIter = axisService.getOperations(); opIter.hasNext();) {
+ AxisOperation axisOp = (AxisOperation) opIter.next();
+ Parameter parameter = axisOp.getParameter(StatisticsConstants.OUT_OPERATION_COUNTER);
+ if (parameter != null) {
+ count += ((Counter) parameter.getValue()).getCount();
+ }
+ }
+ return count;
+ }
+
+ public String getSystemUpTime() {
+ return systemUpTime;
+ }
+
+ public String getServerStartTime() {
+ return serverStartTime;
+ }
+
+ public String getServerName() {
+ return serverName;
+ }
+
+ public int getRequestCount() {
+ return requestCount;
+ }
+
+ public int getServices() {
+ return services;
+ }
+
+ public String getFreeMemory() {
+ return freeMemory;
+ }
+
+ public String getTotalMemory() {
+ return totalMemory;
}
public double getAvgResponseTime() {
@@ -220,17 +246,4 @@
public void setResponseCount(int responseCount) {
this.responseCount = responseCount;
}
-
- public int getServiceResponseCount(AxisService axisService) throws AxisFault {
-
- int count = 0;
- for (Iterator opIter = axisService.getOperations(); opIter.hasNext();) {
- AxisOperation axisOp = (AxisOperation) opIter.next();
- Parameter parameter = axisOp.getParameter(StatisticsConstants.OUT_OPERATION_COUNTER);
- if (parameter != null) {
- count += ((Counter) parameter.getValue()).getCount();
- }
- }
- return count;
- }
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/StatisticsReporterThread.java Mon Feb 5 13:08:09 2007
@@ -29,14 +29,13 @@
*
*
*/
-
public class StatisticsReporterThread extends Thread {
- PersistenceManager pm =
- new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
- org.wso2.esb.Constants.WSO2ESB_HB_CONFIG_KEY, "wso2esb.hibernate.cfg.xml"));
-
private static Logger log = Logger.getLogger(StatisticsReporterThread.class);
+ private boolean shutdownRequested = false;
+
+ PersistenceManager pm = new PersistenceManager(HibernateConfigFactory.getDefaultConfig(
+ org.wso2.esb.Constants.WSO2ESB_HB_CONFIG_KEY, "wso2esb.hibernate.cfg.xml"));
/** The reference to the synapse environment */
private SynapseEnvironment synapseEnvironment;
@@ -45,69 +44,73 @@
* To construct it is need synapse Env. and PersistenceManager
*
* @param synapseEnvironment
- *
*/
-
public StatisticsReporterThread(SynapseEnvironment synapseEnvironment) {
this.synapseEnvironment = synapseEnvironment;
-
}
/**
*
*/
public void run() {
- while (!isInterrupted()) {
+
+ while (!shutdownRequested) {
+
StatisticsCollector statisticsCollector = synapseEnvironment.getStatisticsCollector();
- // log.info("Statistics Reporter is running");
+
+ // log.info("Statistics Reporter is running");
if (statisticsCollector != null) {
- // report sequence statistics to database
- for (Iterator sequenceStatistics = statisticsCollector.getSequenceStatistics(); sequenceStatistics.hasNext();)
- {
- Object statisticsHolderObject = sequenceStatistics.next();
- if (statisticsHolderObject instanceof StatisticsHolder) {
- StatisticsHolder statisticsHolder = (StatisticsHolder) statisticsHolderObject;
- StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
- statisticsHolder.clearStatistics();
- }
+
+ // report sequence statistics to database
+ for (Iterator sequenceStatistics = statisticsCollector.getSequenceStatistics();
+ sequenceStatistics.hasNext();) {
+
+ Object statisticsHolderObject = sequenceStatistics.next();
+ if (statisticsHolderObject instanceof StatisticsHolder) {
+ StatisticsHolder statisticsHolder =
+ (StatisticsHolder) statisticsHolderObject;
+ StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
+ statisticsHolder.clearStatistics();
}
- // report proxy service statistics to database
- for (Iterator proxyServiceStatistics = statisticsCollector.getProxyServiceStatistics(); proxyServiceStatistics.hasNext();)
- {
- Object statisticsHolderObject = proxyServiceStatistics.next();
- if (statisticsHolderObject instanceof StatisticsHolder) {
- StatisticsHolder statisticsHolder = (StatisticsHolder) statisticsHolderObject;
- StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
- statisticsHolder.clearStatistics();
- }
+ }
+ // report proxy service statistics to database
+ for (Iterator proxyServiceStatistics = statisticsCollector.
+ getProxyServiceStatistics(); proxyServiceStatistics.hasNext();) {
+
+ Object statisticsHolderObject = proxyServiceStatistics.next();
+ if (statisticsHolderObject instanceof StatisticsHolder) {
+ StatisticsHolder statisticsHolder =
+ (StatisticsHolder) statisticsHolderObject;
+ StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
+ statisticsHolder.clearStatistics();
}
- // report end point statistics to database
- for (Iterator endPointStatistics = statisticsCollector.getEndPointStatistics(); endPointStatistics.hasNext();)
- {
- Object statisticsHolderObject = endPointStatistics.next();
- if (statisticsHolderObject instanceof StatisticsHolder) {
- StatisticsHolder statisticsHolder = (StatisticsHolder) statisticsHolderObject;
- StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
- statisticsHolder.clearStatistics();
- }
+ }
+ // report end point statistics to database
+ for (Iterator endPointStatistics = statisticsCollector.getEndPointStatistics();
+ endPointStatistics.hasNext();) {
+
+ Object statisticsHolderObject = endPointStatistics.next();
+ if (statisticsHolderObject instanceof StatisticsHolder) {
+ StatisticsHolder statisticsHolder =
+ (StatisticsHolder) statisticsHolderObject;
+ StatisticsDBUtils.updateRecord(pm, "1", statisticsHolder);
+ statisticsHolder.clearStatistics();
}
-
}
+ }
+
try {
// sleep for one minute
- Thread.sleep(1000 * 60);
- } catch (InterruptedException e) {
- log.error(e);
- }
+ Thread.sleep(1000 * 60); // TODO FIXME to be configurable
+ } catch (InterruptedException ignore) {}
}
}
/**
*
*/
- public void interrupt() {
- log.info("Statistics Reporter is stopping ");
-
- super.interrupt();
+ public void shutdown() {
+ log.info("Statistics reporter thread is being shutdown ");
+ shutdownRequested = true;
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/persistence/StatisticsDBUtils.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/persistence/StatisticsDBUtils.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/statistics/persistence/StatisticsDBUtils.java Mon Feb 5 13:08:09 2007
@@ -31,12 +31,13 @@
public class StatisticsDBUtils {
private static final String SERVER_ID_ = "serverId";
- private static final String CATEGORY_ = "category";
- private static final String NAME_ = "name";
+ private static final String CATEGORY_ = "category";
+ private static final String NAME_ = "name";
private static final String DIRECTION_ = "direction";
+ private static StatisticsDO createStatisticsRecord(String serverId, int statisticsCategory,
+ String key, int direction, Statistics statistics) {
- private static StatisticsDO createStatisticsRecord(String serverId, int statisticsCategory, String key, int direction, Statistics statistics) {
StatisticsDO statisticsDO = new StatisticsDO();
statisticsDO.setName(key);
statisticsDO.setDirection(direction);
@@ -50,7 +51,6 @@
return statisticsDO;
}
-
/**
* To insert a record to the statistics table
*
@@ -59,14 +59,18 @@
* @param statisticsHolder
* @
*/
- public static void insertRecord(PersistenceManager pm, String serverId, StatisticsHolder statisticsHolder) {
+ public static void insertRecord(PersistenceManager pm, String serverId,
+ StatisticsHolder statisticsHolder) {
+
String key = statisticsHolder.getKey();
int statisticsCategory = statisticsHolder.getStatisticsCategory();
if (statisticsHolder.getInFlowStatistics() != null) {
- pm.addStatisticsRecord(createStatisticsRecord(serverId, statisticsCategory, key, 0, statisticsHolder.getInFlowStatistics()));
+ pm.addStatisticsRecord(createStatisticsRecord(
+ serverId, statisticsCategory, key, 0, statisticsHolder.getInFlowStatistics()));
}
if (statisticsHolder.getOutFlowStatistics() != null) {
- pm.addStatisticsRecord(createStatisticsRecord(serverId, statisticsCategory, key, 1, statisticsHolder.getOutFlowStatistics()));
+ pm.addStatisticsRecord(createStatisticsRecord(
+ serverId, statisticsCategory, key, 1, statisticsHolder.getOutFlowStatistics()));
}
}
@@ -78,15 +82,18 @@
* @param statisticsHolder
* @
*/
- public static void updateRecord(PersistenceManager pm, String serverId, StatisticsHolder statisticsHolder) {
+ public static void updateRecord(PersistenceManager pm, String serverId,
+ StatisticsHolder statisticsHolder) {
String key = statisticsHolder.getKey();
int statisticsCategory = statisticsHolder.getStatisticsCategory();
if (statisticsHolder.getInFlowStatistics() != null) {
- updateRecord(pm, serverId, statisticsCategory, key, 0, statisticsHolder.getInFlowStatistics());
+ updateRecord(pm, serverId, statisticsCategory,
+ key, 0, statisticsHolder.getInFlowStatistics());
}
if (statisticsHolder.getOutFlowStatistics() != null) {
- updateRecord(pm, serverId, statisticsCategory, key, 1, statisticsHolder.getOutFlowStatistics());
+ updateRecord(pm, serverId, statisticsCategory,
+ key, 1, statisticsHolder.getOutFlowStatistics());
}
}
@@ -101,11 +108,13 @@
* @param statistics
* @
*/
- private static void updateRecord(PersistenceManager pm, String serverId, int statisticsCategory, String key, int direction, Statistics statistics) {
+ private static void updateRecord(PersistenceManager pm, String serverId,
+ int statisticsCategory, String key, int direction, Statistics statistics) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + "= '" + serverId + "' and " + CATEGORY_ + "=" + statisticsCategory + " and " + NAME_ + "= '" + key +
- "' and " + DIRECTION_ + " = " + direction + "";
+ " where " + SERVER_ID_ + "= '" + serverId + "' and " +
+ CATEGORY_ + "=" + statisticsCategory + " and " + NAME_ + "= '" + key +
+ "' and " + DIRECTION_ + " = " + direction + "";
int currentTotalCount = statistics.getCount();
int currentFaultCount = statistics.getFaultCount();
@@ -134,9 +143,12 @@
updatedTotalCount = (currentTotalCount + previousTotalCount);
if (updatedTotalCount != 0) {
updatedFaultCount = currentFaultCount + previousFaultCount;
- updatedAvgTime = (currentAvgTime * currentTotalCount + previousAvgTime * previousTotalCount) / updatedTotalCount;
- updatedMaxTime = (currentMaxTime * currentTotalCount + previousMaxTime * previousTotalCount) / updatedTotalCount;
- updatedMinTime = (currentMinTime * currentTotalCount + previousMinTime * previousTotalCount) / updatedTotalCount;
+ updatedAvgTime = (currentAvgTime * currentTotalCount +
+ previousAvgTime * previousTotalCount) / updatedTotalCount;
+ updatedMaxTime = (currentMaxTime * currentTotalCount +
+ previousMaxTime * previousTotalCount) / updatedTotalCount;
+ updatedMinTime = (currentMinTime * currentTotalCount +
+ previousMinTime * previousTotalCount) / updatedTotalCount;
previousDO.setFaultCount(updatedFaultCount);
previousDO.setTotalCount(updatedTotalCount);
previousDO.setMaxTime(updatedMaxTime);
@@ -146,7 +158,8 @@
}
} else if (resultSet == null || resultSet.length == 0) {
- previousDO = createStatisticsRecord(serverId, statisticsCategory, key, direction, statistics);
+ previousDO = createStatisticsRecord(
+ serverId, statisticsCategory, key, direction, statistics);
pm.addStatisticsRecord(previousDO);
}
}
@@ -155,22 +168,23 @@
public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO +
- " Where " + SERVER_ID_ + " = '" + serverid + "'";
+ " where " + SERVER_ID_ + " = '" + serverid + "'";
return pm.selectStatisticsRecords(queryString);
}
public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid, int direction) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO +
- " Where " + SERVER_ID_ + " = '" + serverid +
+ " where " + SERVER_ID_ + " = '" + serverid +
"' and " + DIRECTION_ + " = " + direction + "";
return pm.selectStatisticsRecords(queryString);
}
- public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid, int direction, int category) {
+ public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid,
+ int direction, int category) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
+ " where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
" and " + DIRECTION_ + " = " + direction + "";
return pm.selectStatisticsRecords(queryString);
}
@@ -178,23 +192,25 @@
public static StatisticsDO[] getTotalStatisticsForServer(PersistenceManager pm, String serverid) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "'";
+ " where " + SERVER_ID_ + " = '" + serverid + "'";
return pm.selectStatisticsRecords(queryString);
}
- public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid, int category, String name) {
+ public static StatisticsDO[] getStatistics(PersistenceManager pm, String serverid,
+ int category, String name) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
+ " where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
" and " + NAME_ + " = '" + name + "'";
return pm.selectStatisticsRecords(queryString);
}
- public static StatisticsDO getStatistics(PersistenceManager pm, String serverid, int category, int direction, String name) {
+ public static StatisticsDO getStatistics(PersistenceManager pm, String serverid, int category,
+ int direction, String name) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
+ " where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
" and " + NAME_ + " = '" + name + "'" +
" and " + DIRECTION_ + " = " + direction + "";
return (StatisticsDO) pm.createAnewObjectFromStatistics(queryString);
@@ -202,61 +218,68 @@
public static StatisticsDO[] getStatistics(PersistenceManager pm, int category, String name) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + CATEGORY_ + "= " + category +
+ " where " + CATEGORY_ + "= " + category +
" and " + NAME_ + " = '" + name + "'";
return pm.selectStatisticsRecords(queryString);
}
public static StatisticsDO[] getStatistics(PersistenceManager pm, int category) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + CATEGORY_ + "= " + category +
+ " where " + CATEGORY_ + "= " + category +
"";
return pm.selectStatisticsRecords(queryString);
}
public static StatisticsDO[] getStatistics(PersistenceManager pm, int category, int direction) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + CATEGORY_ + "= " + category + " and " + DIRECTION_ + " = " + direction + " ";
+ " where " + CATEGORY_ + "= " + category + " and " + DIRECTION_ + " = " + direction + " ";
return pm.selectStatisticsRecords(queryString);
}
- public static StatisticsDO[] getStatisticsForServer(PersistenceManager pm, String serverid, int category) {
+ public static StatisticsDO[] getStatisticsForServer(PersistenceManager pm, String serverid,
+ int category) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid +
+ " where " + SERVER_ID_ + " = '" + serverid +
"' and " + CATEGORY_ + " = " + category + "";
return pm.selectStatisticsRecords(queryString);
}
- public static StatisticsDO[] getStatisticsForServer(PersistenceManager pm, String serverid, int direction, int category) {
+ public static StatisticsDO[] getStatisticsForServer(PersistenceManager pm, String serverid,
+ int direction, int category) {
String queryString = "from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
+ " where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
" and " + DIRECTION_ + " = " + direction + "";
return pm.selectStatisticsRecords(queryString);
}
- public static Object getSummaryStatisticsForServer(PersistenceManager pm, String serverid, int direction, int category) {
+ public static Object getSummaryStatisticsForServer(PersistenceManager pm, String serverid,
+ int direction, int category) {
- String queryString = "select sum(totalCount),sum(faultCount),avg(maxTime),avg(minTime),avg(avgTime) from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
- " and " + DIRECTION_ + " = " + direction + "";
+ String queryString = "select sum(totalCount), sum(faultCount), avg(maxTime), " +
+ "avg(minTime), avg(avgTime) from " + Constants.DBAccess.STATISTICS_DO + " " +
+ " where " + SERVER_ID_ + " = '" + serverid + "' and " + CATEGORY_ + "= " + category +
+ " and " + DIRECTION_ + " = " + direction + "";
return pm.createAnewObjectFromStatistics(queryString);
}
public static List getTotalCountForServerS(PersistenceManager pm,int category) {
- String queryString = "select " + SERVER_ID_ + " ,sum(totalCount) from " + Constants.DBAccess.STATISTICS_DO + " "+
- " Where " + CATEGORY_ + "= " + category +" group by "+SERVER_ID_+" ";
+ String queryString = "select " + SERVER_ID_ + " ,sum(totalCount) from " +
+ Constants.DBAccess.STATISTICS_DO + " "+
+ " where " + CATEGORY_ + "= " + category +" group by "+SERVER_ID_+" ";
return pm.selectCustomObjectList(queryString);
}
public static Object getServersIds(PersistenceManager pm) {
- String queryString = "select distinct " + SERVER_ID_ + " from " + Constants.DBAccess.STATISTICS_DO + " ";
+ String queryString = "select distinct " + SERVER_ID_ + " from " +
+ Constants.DBAccess.STATISTICS_DO + " ";
return pm.createAnewObjectFromStatistics(queryString);
}
public static List getTotalCountForCategory(PersistenceManager pm,int category) {
- String queryString = "select " + NAME_ + ",sum(totalCount) from " + Constants.DBAccess.STATISTICS_DO + " " +
- " Where " + CATEGORY_ + "= " + category + " group by "+NAME_+" ";
+ String queryString = "select " + NAME_ + ",sum(totalCount) from " +
+ Constants.DBAccess.STATISTICS_DO + " " +
+ " where " + CATEGORY_ + "= " + category + " group by "+NAME_+" ";
return pm.selectCustomObjectList(queryString);
}
}
Modified: trunk/esb/java/modules/core/src/test/java/org/wso2/esb/util/ServiceBusUtils.java
==============================================================================
--- trunk/esb/java/modules/core/src/test/java/org/wso2/esb/util/ServiceBusUtils.java (original)
+++ trunk/esb/java/modules/core/src/test/java/org/wso2/esb/util/ServiceBusUtils.java Mon Feb 5 13:08:09 2007
@@ -64,7 +64,7 @@
return asg;
}
- public void startServer() throws AxisFault {
+ public void startServer() throws AxisFault, ServiceBusException {
try {
//setting the System properties
System.setProperty("axis2.xml", "conf/axis2.xml");
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html Mon Feb 5 13:08:09 2007
@@ -21,24 +21,23 @@
Home</a></li>
<li class="menu_manage_class"><span> Manage</span>
<ul class="submenu">
- <li><a href="#" onclick="javascript:showsequences(); return false;"
- class="menu_sequences_class" title="Sequences Management"> Sequences</a>
- </li>
- <li><a href="#" onclick="javascript:showProxyServices(); return false;"
- class="menu_proxy_services_class" title="Proxy Services Management"> Proxy
- Services</a></li>
- <li><a href="#" onclick="javascript:showEndpoints(); return false;"
- class="menu_endpoints_class" title="Endpoints Management"> EndPoints</a>
+ <li><a href="#" onclick="javascript:showESBRegistry(); return false;"
+ class="menu_registries_class" title="Registry Management"> Registry</a>
</li>
<li><a href="#" onclick="javascript:showProperties(); return false;"
class="menu_properties_class" title="Properties Management"> Properties</a>
</li>
- <li><a href="#" onclick="javascript:showESBRegistry(); return false;"
- class="menu_registries_class" title="Registry Management"> Registry</a>
+ <li><a href="#" onclick="javascript:showEndpoints(); return false;"
+ class="menu_endpoints_class" title="Endpoints Management"> EndPoints</a>
+ </li>
+ <li><a href="#" onclick="javascript:showProxyServices(); return false;"
+ class="menu_proxy_services_class" title="Proxy Services Management"> Proxy Services</a></li>
+ <li><a href="#" onclick="javascript:showsequences(); return false;"
+ class="menu_sequences_class" title="Sequences Management"> Sequences</a>
</li>
<li><a href="#" onclick="javascript:showSaveConfig(); return false;"
- class="menu_save_class" title="Save Configuration"> Save
- Changes</a></li>
+ class="menu_save_class" title="Save Configuration"> Save Changes</a>
+ </li>
</ul>
</li>
<li class="menu_monitor_class"><span> Monitor</span>
@@ -55,7 +54,6 @@
<li><a href="#" onclick="javascript:viewTraceLogs(); return false;"
class="menu_tracer_ti_class" title="SOAP Tracer"> Tracer</a>
</li>
- <!--<li><a href="#" onclick="javascript:alert('Medator Tracer Comes Here!'); return false;" class="menu_tracer_ti_class" title="SOAP Tracer"> Tracer</a></li>-->
</ul>
</li>
</ul>
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl Mon Feb 5 13:08:09 2007
@@ -29,50 +29,50 @@
<xsl:for-each select="return">
<tr>
<td>
- <strong>Free Memory (JVM)</strong>
+ <strong>Server Name</strong>
</td>
<td>
- <xsl:value-of select="freeMemory"/>
+ <xsl:value-of select="serverName"/>
</td>
</tr>
<tr>
<td>
- <strong>Request Count</strong>
+ <strong>Server Start Time</strong>
</td>
<td>
- <xsl:value-of select="requestCount"/>
+ <xsl:value-of select="serverStartTime"/>
</td>
</tr>
<tr>
<td>
- <strong>Server Name</strong>
+ <strong>System Up Time</strong>
</td>
<td>
- <xsl:value-of select="serverName"/>
+ <xsl:value-of select="systemUpTime"/>
</td>
</tr>
<tr>
<td>
- <strong>Server Start Time</strong>
+ <strong>Active Services</strong>
</td>
<td>
- <xsl:value-of select="serverStartTime"/>
+ <xsl:value-of select="services"/>
</td>
</tr>
<tr>
<td>
- <strong>Active Proxy Services</strong>
+ <strong>Request Count</strong>
</td>
<td>
- <xsl:value-of select="services"/>
+ <xsl:value-of select="requestCount"/>
</td>
</tr>
<tr>
<td>
- <strong>System Up Time</strong>
+ <strong>Free Memory (JVM)</strong>
</td>
<td>
- <xsl:value-of select="systemUpTime"/>
+ <xsl:value-of select="freeMemory"/>
</td>
</tr>
<tr>
More information about the Esb-java-dev
mailing list