Author: ruwan
Date: Wed Apr 1 19:24:12 2009
New Revision: 761020
URL: http://svn.apache.org/viewvc?rev=761020&view=rev
Log:
code refactoring / reformatting
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=761020&r1=761019&r2=761020&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Wed Apr 1 19:24:12 2009
@@ -42,10 +42,7 @@
import org.apache.synapse.core.axis2.SynapseMessageReceiver;
import org.apache.synapse.eventing.SynapseEventSource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Axis2 Based Synapse Controller
@@ -65,7 +62,7 @@
/*Reference to the Synapse configuration */
private SynapseEnvironment synapseEnvironment;
/*Indicate initialization state */
- private boolean initialize;
+ private boolean initialized;
/* ServerConfiguration Information */
private ServerConfigurationInformation information;
@@ -85,6 +82,7 @@
if (contextInformation == null ||
contextInformation.getServerContext() == null ||
configurationInformation.isCreateNewInstance()) {
+
if (log.isDebugEnabled()) {
log.debug("Initializing Synapse in a new axis2 server
environment instance ");
}
@@ -93,7 +91,7 @@
Object context = contextInformation.getServerContext();
if (context instanceof ConfigurationContext) {
if (log.isDebugEnabled()) {
- log.debug("Initializing Synapse in a already created " +
+ log.debug("Initializing Synapse in an already existing " +
"axis2 server environment instance");
}
configurationContext = (ConfigurationContext) context;
@@ -101,11 +99,11 @@
AddressingConstants.ADDR_VALIDATE_ACTION,
Boolean.FALSE);
} else {
handleFatal("Synapse startup initialization failed : Provided
server context is" +
- " invalid,expected a Axis2 ConfigurationContext
instance");
+ " invalid, expected an Axis2 ConfigurationContext
instance");
}
}
initDefault();
- initialize = true;
+ initialized = true;
}
/**
@@ -147,14 +145,14 @@
configurationContext.terminate();
}
}
- initialize = false;
+ initialized = false;
} catch (Exception e) {
log.error("Error stopping the Axis2 Based Server Environment", e);
}
}
public boolean isInitialized() {
- return initialize;
+ return initialized;
}
/**
@@ -245,7 +243,7 @@
/**
* Create a Axis2 Based Server Environment
*
- * @param information (ServerConfigurationInformation instance
+ * @param information ServerConfigurationInformation instance
*/
private void createNewInstance(ServerConfigurationInformation information)
{
@@ -272,9 +270,6 @@
listenerManager.addListener(trsIn, false);
}
- information.setCreateNewInstance(true);
- initialize = true;
-
} catch (Throwable t) {
handleFatal("Synapse startup failed...", t);
}
@@ -364,8 +359,7 @@
}
private void setupDataSources() {
- java.util.Properties synapseProperties =
SynapsePropertiesLoader.loadSynapseProperties();
-
+ Properties synapseProperties =
SynapsePropertiesLoader.loadSynapseProperties();
DataSourceInformationRepositoryHelper.
initializeDataSourceInformationRepository(
configurationContext.getAxisConfiguration(),
synapseProperties);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java?rev=761020&r1=761019&r2=761020&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerContextInformation.java
Wed Apr 1 19:24:12 2009
@@ -18,13 +18,14 @@
*/
package org.apache.synapse;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* Encapsulates server context information
*/
public class ServerContextInformation {
+
/* Underlying server's context - EX : Axis2 ConfigurationConext */
private Object serverContext;
/* A map to hold any context information*/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=761020&r1=761019&r2=761020&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
Wed Apr 1 19:24:12 2009
@@ -122,7 +122,7 @@
}
/**
- * Helper method that to do init
+ * Helper method to do the initialization
*/
private void doInit() {
@@ -194,10 +194,8 @@
private void assertInitialized() {
if (!initialized) {
- String msg = "Server manager has not been initialized by giving " +
- "required configurations information." +
- "It is needed to initiate by giving required
configurations information ," +
- " before access any operations";
+ String msg = "Server manager has not been initialized, it requires
to be " +
+ "initialized, with the required configurations before
starting";
log.error(msg);
throw new SynapseException(msg);
}
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java?rev=761020&r1=761019&r2=761020&view=diff
==============================================================================
---
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
(original)
+++
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
Wed Apr 1 19:24:12 2009
@@ -42,8 +42,7 @@
* @param properties DataSources configuration properties
*/
public static void initializeDataSourceInformationRepository(
- AxisConfiguration axisConfiguration,
- Properties properties) {
+ AxisConfiguration axisConfiguration, Properties properties) {
DataSourceInformationRepository repository =
getDataSourceInformationRepository(axisConfiguration);
