You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2009/04/01 19:57:20 UTC
svn commit: r760986 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
ServerConfigurationInformation.java
ServerConfigurationInformationFactory.java SynapseControllerFactory.java
Author: ruwan
Date: Wed Apr 1 17:57:20 2009
New Revision: 760986
URL: http://svn.apache.org/viewvc?rev=760986&view=rev
Log:
code refactoring / reformatting
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseControllerFactory.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java?rev=760986&r1=760985&r2=760986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformation.java Wed Apr 1 17:57:20 2009
@@ -25,8 +25,8 @@
import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* Encapsulates all server information
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java?rev=760986&r1=760985&r2=760986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerConfigurationInformationFactory.java Wed Apr 1 17:57:20 2009
@@ -126,8 +126,8 @@
information.setDeploymentMode(args[5]);
information.setServerName(args[6]);
}
- return information;
+ return information;
}
/**
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseControllerFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseControllerFactory.java?rev=760986&r1=760985&r2=760986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseControllerFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseControllerFactory.java Wed Apr 1 17:57:20 2009
@@ -47,24 +47,24 @@
private static SynapseController loadSynapseController(
ServerConfigurationInformation information) {
+
String provider = information.getServerControllerProvider();
try {
-
Class aClass = SynapseControllerFactory.class.getClassLoader().loadClass(provider);
Object instance = aClass.newInstance();
if (instance != null && instance instanceof SynapseController) {
return (SynapseController) instance;
} else {
- fatal("Invalid class as SynapseController : Class Name : " + provider);
+ handleFatal("Invalid class as SynapseController : Class Name : " + provider);
}
} catch (ClassNotFoundException e) {
- fatal("A SynapseController cannot be found for class name : " + provider, e);
+ handleFatal("A SynapseController cannot be found for class name : " + provider, e);
} catch (IllegalAccessException e) {
- fatal("Error creating a instance from class : " + provider, e);
+ handleFatal("Error creating a instance from class : " + provider, e);
} catch (InstantiationException e) {
- fatal("Error creating a instance from class : " + provider, e);
+ handleFatal("Error creating a instance from class : " + provider, e);
}
return null;
}
@@ -77,51 +77,51 @@
private static void validate(ServerConfigurationInformation information) {
if (information == null) {
- fatal("Server Configuration Information is null");
- }
+ handleFatal("Server Configuration Information is null");
+ } else {
- validatePath("Synapse home", information.getSynapseHome());
- if (information.isCreateNewInstance()) {
- validatePath("Axis2 repository", information.getAxis2RepoLocation());
- validatePath("axis2.xml location", information.getAxis2Xml());
- }
- validatePath("synapse.xml location", information.getSynapseXMLLocation());
+ validatePath("Synapse home", information.getSynapseHome());
+ if (information.isCreateNewInstance()) {
+ validatePath("Axis2 repository", information.getAxis2RepoLocation());
+ validatePath("axis2.xml location", information.getAxis2Xml());
+ }
+ validatePath("synapse.xml location", information.getSynapseXMLLocation());
- String serverName = information.getServerName();
- if (serverName == null) {
- try {
- serverName = InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException ignore) {
+ String serverName = information.getServerName();
+ if (serverName == null) {
+ try {
+ serverName = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException ignore) {}
+ log.info("The server name was not specified, defaulting to : " + serverName);
+ } else {
+ log.info("Using server name : " + serverName);
}
- log.info("The server name was not specified, defaulting to : " + serverName);
- } else {
- log.info("Using server name : " + serverName);
- }
- if (log.isDebugEnabled()) {
- log.debug("Using Server Configuration As : " + information);
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Using Server Configuration As : " + information);
+ }
- log.info("The timeout handler will run every : " +
- (SynapseConfigUtils.getTimeoutHandlerInterval() / 1000) + "s");
+ log.info("The timeout handler will run every : " +
+ (SynapseConfigUtils.getTimeoutHandlerInterval() / 1000) + "s");
+ }
}
private static void validatePath(String msgPre, String path) {
if (path == null) {
- fatal("The " + msgPre + " must be set as a system property or init-parameter");
+ handleFatal("The " + msgPre + " must be set as a system property or init-parameter");
} else if (!new File(path).exists()) {
- fatal("The " + msgPre + " " + path + " doesn't exist");
+ handleFatal("The " + msgPre + " " + path + " doesn't exist");
} else {
log.info("Using " + msgPre + " : " + new File(path).getAbsolutePath());
}
}
- private static void fatal(String msg) {
+ private static void handleFatal(String msg) {
log.fatal(msg);
throw new SynapseException(msg);
}
- private static void fatal(String msg, Exception e) {
+ private static void handleFatal(String msg, Exception e) {
log.fatal(msg, e);
throw new SynapseException(msg, e);
}