Author: indika
Date: Mon Dec 3 03:36:43 2007
New Revision: 10428
Log:
some code clean up
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Main.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/services/AbstractESBAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/HibernateConfigFactory.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfigurationFactory.java
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Main.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Main.java
(original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/Main.java Mon Dec
3 03:36:43 2007
@@ -46,7 +46,7 @@
/** The Tomcat server used internally to host the admin console */
private WebServer webServer;
- private static ServiceBusConfiguration esbConfiguration;
+ private ServiceBusConfiguration esbConfiguration;
private String axis2RepoLocation;
public Main() {
@@ -74,7 +74,7 @@
ServiceBusManager.initSystemProperties();
Main esb = new Main();
- esb.setAxis2RepoLocation(esbConfiguration.getFirstProperty(
+ esb.setAxis2RepoLocation(esb.getEsbConfiguration().getFirstProperty(
ServerConfiguration.AXIS2_CONFIG_REPO_LOCATION));
try {
@@ -138,4 +138,12 @@
}
});
}
+
+ public ServiceBusConfiguration getEsbConfiguration() {
+ return esbConfiguration;
+ }
+
+ public void setEsbConfiguration(ServiceBusConfiguration esbConfiguration) {
+ this.esbConfiguration = esbConfiguration;
+ }
}
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 Dec 3 03:36:43 2007
@@ -32,7 +32,7 @@
private static ServiceBusConfiguration configuration = null;
- public static String defaultConfigurationXMLLocation =
"webapp/WEB-INF/classes/conf/server.xml";
+ private final static String defaultConfigurationXMLLocation =
"webapp/WEB-INF/classes/conf/server.xml";
private final static ServerConfiguration serverConfiguration =
ServerConfiguration.getInstance();
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/AbstractESBAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/AbstractESBAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/AbstractESBAdmin.java
Mon Dec 3 03:36:43 2007
@@ -30,7 +30,7 @@
*/
public abstract class AbstractESBAdmin {
- public static String LOGGED = "logged";
+ public static final String LOGGED = "logged";
public AxisConfiguration getAxisConfig() {
return
MessageContext.getCurrentMessageContext().getConfigurationContext()
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
Mon Dec 3 03:36:43 2007
@@ -47,10 +47,10 @@
private static final Log log = LogFactory.getLog(EndpointAdmin.class);
- public static int ADDRESS_EP = 0;
- public static int FAILOVER_EP = 2;
- public static int WSDL_EP = 1;
- public static int LOADBALANCE_EP = 3;
+ public static final int ADDRESS_EP = 0;
+ public static final int FAILOVER_EP = 2;
+ public static final int WSDL_EP = 1;
+ public static final int LOADBALANCE_EP = 3;
/**
* Gets the details about the endpoints as a EndpointData array
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/HibernateConfigFactory.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/HibernateConfigFactory.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/HibernateConfigFactory.java
Mon Dec 3 03:36:43 2007
@@ -26,7 +26,7 @@
*/
public final class HibernateConfigFactory {
- private static Map hibernateConfigMap = new HashMap();
+ private static final Map hibernateConfigMap = new HashMap();
public static HibernateConfig getDefaultConfig(String hbConfigKey,String
conFigFileName) {
HibernateConfig hbConfig;
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfigurationFactory.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfigurationFactory.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfigurationFactory.java
Mon Dec 3 03:36:43 2007
@@ -6,7 +6,7 @@
import java.util.Map;
public class XmlConfigurationFactory {
- private static Map configurations = new HashMap();
+ private static final Map configurations = new HashMap();
public static void init(String configKey, String configFile) throws
ServerException {
init(configKey, configFile, null);
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
