Author: ruwan
Date: Tue Sep 21 16:01:41 2010
New Revision: 999476
URL: http://svn.apache.org/viewvc?rev=999476&view=rev
Log:
Fixing the compilation failure and few typos
Modified:
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/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java
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=999476&r1=999475&r2=999476&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
Tue Sep 21 16:01:41 2010
@@ -30,7 +30,7 @@ import java.util.Map;
*/
public class ServerContextInformation {
- /* Underlying server's context - EX : Axis2 ConfigurationConext */
+ /* Underlying server's context - EX : Axis2 ConfigurationContext */
private Object serverContext;
/* A map to hold any context information*/
private final Map<String, Object> properties = new HashMap<String,
Object>();
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=999476&r1=999475&r2=999476&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
Tue Sep 21 16:01:41 2010
@@ -37,9 +37,10 @@ import java.util.Date;
* When the WAR deployment is used, the SynapseStartUpServlet servlet calls on
this class to
* initialize Synapse.
* <p/>
- * This is the entry point for starting an Syanpse instance. All the synapse
related management
- * oprations are exposed through this class.
+ * This is the entry point for starting an Synapse instance. All the synapse
related management
+ * operations are exposed through this class.
*/
+...@suppresswarnings({"UnusedDeclaration"})
public class ServerManager {
private static final Log log = LogFactory.getLog(ServerManager.class);
@@ -64,7 +65,7 @@ public class ServerManager {
/**
* Save the TCCL of the initial thread that starts the ESB for future use.
When JMX calls are
- * received via RMI connections, re-start etc may otherwise fail due to
classloading issues.
+ * received via RMI connections, re-start etc may otherwise fail due to
class loading issues.
*/
private ClassLoader classLoader;
@@ -76,7 +77,7 @@ public class ServerManager {
/**
* Initializes the server, if we need to create a new axis2 instance,
calling this will create
- * the new axis2 environment, but this won't start the transport lsiteners
+ * the new axis2 environment, but this won't start the transport listeners
*
* @param serverConfigurationInformation ServerConfigurationInformation
instance
* @param serverContextInformation ServerContextInformation instance
@@ -297,7 +298,7 @@ public class ServerManager {
*
* @param maxWaitMillis the maximum number of ms to wait until a graceful
stop is achieved,
* before forcing a stop
- * @return if successfull ServerState#STOPPED
+ * @return if successful ServerState#STOPPED
*
* @throws SynapseException
*/
@@ -351,9 +352,9 @@ public class ServerManager {
}
/**
- * Returns the context classloader of the original thread.
+ * Returns the context class loader of the original thread.
*
- * @return the context classloader of the original thread.
+ * @return the context class loader of the original thread.
*/
public ClassLoader getClassLoader() {
return classLoader;
@@ -426,7 +427,7 @@ public class ServerManager {
PasswordManager.getInstance().shutDown();
}
- // unregister the ServerManager MBean
+ // un-register the ServerManager MBean
unRegisterMBean();
// destroy the SynapseController
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java
Tue Sep 21 16:01:41 2010
@@ -32,8 +32,9 @@ import java.util.concurrent.ExecutorServ
/**
* The SynapseEnvironment allows access into the the host SOAP engine. It
allows
- * the sending of messages, classloader access etc.
+ * the sending of messages, class loader access etc.
*/
+...@suppresswarnings({"UnusedDeclaration"})
public interface SynapseEnvironment {
/**
@@ -50,7 +51,7 @@ public interface SynapseEnvironment {
/**
* This method injects a new message into the Synapse engine for the
mediation
* by the specified sequence. This is used by custom mediation tasks like
splitting message
- * in EIP mediations. This method will do the mediation asynchronously
using a separate
+ * in EIP mediation. This method will do the mediation asynchronously
using a separate
* thread from the environment thread pool
*
* @param smc - Synapse message context to be injected
@@ -127,8 +128,8 @@ public interface SynapseEnvironment {
public SynapseConfiguration getSynapseConfiguration();
/**
- * Retrive the {...@link org.apache.synapse.task.SynapseTaskManager} from
the
- * <code>envioronment</code>.
+ * Retrieve the {...@link org.apache.synapse.task.SynapseTaskManager} from
the
+ * <code>environment</code>.
*
* @return SynapseTaskManager of this synapse environment
*/
@@ -136,7 +137,7 @@ public interface SynapseEnvironment {
/**
- * Get the inforamtion about the synape environment.
+ * Get the information about the synapse environment.
*
* @return {...@link org.apache.synapse.ServerContextInformation} of this
synapse environment
*/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Tue Sep 21 16:01:41 2010
@@ -65,10 +65,10 @@ public class Axis2SynapseEnvironment imp
int coreThreads = SynapseThreadPool.SYNAPSE_CORE_THREADS;
int maxThreads = SynapseThreadPool.SYNAPSE_MAX_THREADS;
long keepAlive = SynapseThreadPool.SYNAPSE_KEEP_ALIVE;
- int qlength = SynapseThreadPool.SYNAPSE_THREAD_QLEN;
+ int qLength = SynapseThreadPool.SYNAPSE_THREAD_QLEN;
try {
- qlength =
Integer.parseInt(synCfg.getProperty(SynapseThreadPool.SYN_THREAD_QLEN));
+ qLength =
Integer.parseInt(synCfg.getProperty(SynapseThreadPool.SYN_THREAD_QLEN));
} catch (Exception ignore) {}
try {
@@ -83,7 +83,7 @@ public class Axis2SynapseEnvironment imp
keepAlive =
Long.parseLong(synCfg.getProperty(SynapseThreadPool.SYN_THREAD_ALIVE));
} catch (Exception ignore) {}
- this.executorService = new SynapseThreadPool(coreThreads, maxThreads,
keepAlive, qlength,
+ this.executorService = new SynapseThreadPool(coreThreads, maxThreads,
keepAlive, qLength,
synCfg.getProperty(SynapseThreadPool.SYN_THREAD_GROUP,
SynapseThreadPool.SYNAPSE_THREAD_GROUP),
synCfg.getProperty(SynapseThreadPool.SYN_THREAD_IDPREFIX,
@@ -356,7 +356,7 @@ public class Axis2SynapseEnvironment imp
}
/**
- * Retrive the {...@link org.apache.synapse.ServerContextInformation} from
the <code>environment.
+ * Retrieve the {...@link org.apache.synapse.ServerContextInformation}
from the <code>environment.
*
* @return ServerContextInformation of the environment
*/
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
Tue Sep 21 16:01:41 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.endpoints.EndpointFactory;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
Tue Sep 21 16:01:41 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.eventing.EventSourceFactory;
import org.apache.synapse.config.xml.eventing.EventSourceSerializer;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
Tue Sep 21 16:01:41 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.EntryFactory;
import org.apache.synapse.config.xml.EntrySerializer;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
Tue Sep 21 16:01:41 2010
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.ProxyServiceFactory;
import org.apache.synapse.config.xml.ProxyServiceSerializer;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
Tue Sep 21 16:01:41 2010
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.xml.MediatorSerializerFinder;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
Tue Sep 21 16:01:41 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.ServerManager;
import org.apache.synapse.Startup;
import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.StartupFinder;
Modified:
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java?rev=999476&r1=999475&r2=999476&view=diff
==============================================================================
---
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java
(original)
+++
synapse/trunk/java/modules/handler/src/main/java/org/apache/synapse/handler/SynapseModule.java
Tue Sep 21 16:01:41 2010
@@ -29,9 +29,10 @@ import org.apache.commons.logging.LogFac
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.synapse.*;
+import org.apache.synapse.core.SynapseEnvironment;
/**
- * This will be the Module class for the Synapse handler based mediations
inside axis2 server. This
+ * This will be the Module class for the Synapse handler based mediation
inside axis2 server. This
* will just set the default system property of SYNAPSE_XML to the
repository/conf/synapse.xml in
* the axis2 servers repository and call the normal Synapse startup.
*/
@@ -44,27 +45,31 @@ public class SynapseModule implements Mo
/**
* This method will call the normal initiation after setting the
SYNAPSE_XML file to get from
- * the axis2 respository/conf folder
+ * the axis2 repository/conf folder
*
* @param configurationContext - ConfigurationContext of the Axis2 env
* @param axisModule - AxisModule describing handler initializationModule
of Synapse
- * @throws AxisFault - incase of a failure in initiation
+ * @throws AxisFault - in-case of a failure in initiation
*/
public void init(ConfigurationContext configurationContext, AxisModule
axisModule)
throws AxisFault {
- ServerManager serverManager = ServerManager.getInstance();
- if (!(serverManager.getServerState() == ServerState.STARTED)) {
+ Object synEnvParameter =
configurationContext.getAxisConfiguration().getParameterValue(
+ SynapseConstants.SYNAPSE_ENV);
+
+ if (synEnvParameter != null && !(((SynapseEnvironment) synEnvParameter)
+ .getServerContextInformation().getServerState() ==
ServerState.STARTED)) {
log.info("Initializing the Synapse as a handler");
ServerConfigurationInformation configurationInformation =
ServerConfigurationInformationFactory.createServerConfigurationInformation(
configurationContext.getAxisConfiguration());
ServerContextInformation contextInfo
- = new ServerContextInformation(configurationContext);
+ = new ServerContextInformation(configurationContext,
configurationInformation);
+ ServerManager serverManager = new ServerManager();
serverManager.init(configurationInformation, contextInfo);
serverManager.start();
} else {
- log.info("Detected an already strated synapse instance using that
for the mediation");
+ log.info("Detected an already started synapse instance using that
for the mediation");
}
}
