Author: asankha
Date: Thu Nov 2 01:11:02 2006
New Revision: 470285
URL: http://svn.apache.org/viewvc?view=rev&rev=470285
Log:
Comitting for Ruwan
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java?view=diff&rev=470285&r1=470284&r2=470285
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceFactory.java
Thu Nov 2 01:11:02 2006
@@ -75,6 +75,13 @@
}
}
+ OMAttribute startOnLoad = elem.getAttribute(new
QName(Constants.NULL_NAMESPACE, "startOnLoad"));
+ if(startOnLoad != null) {
+
proxy.setStartOnLoad(Boolean.parseBoolean(startOnLoad.getAttributeValue()));
+ } else {
+ proxy.setStartOnLoad(true);
+ }
+
// read definition of the target of this proxy service. The target
could be an 'endpoint'
// or a named sequence. If none of these are specified, the messages
would be mediated
// by the Synapse main mediator
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java?view=diff&rev=470285&r1=470284&r2=470285
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ProxyServiceSerializer.java
Thu Nov 2 01:11:02 2006
@@ -70,6 +70,14 @@
proxy.addAttribute(fac.createOMAttribute("transports", nullNS,
transportStr));
}
+ if (service.isStartOnLoad()) {
+ proxy.addAttribute(fac.createOMAttribute(
+ "startOnLoad", nullNS, "true"));
+ } else {
+ proxy.addAttribute(fac.createOMAttribute(
+ "startOnLoad", nullNS, "false"));
+ }
+
if (service.getTargetEndpoint() != null) {
OMElement target = fac.createOMElement("target", synNS);
target.addAttribute(fac.createOMAttribute(
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=470285&r1=470284&r2=470285
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
Thu Nov 2 01:11:02 2006
@@ -78,6 +78,10 @@
private boolean wsRMEnabled = false;
/** Should WS Sec (default configuration) be engaged on this service */
private boolean wsSecEnabled = false;
+ /** This will say weather need to start the service at the load or not */
+ private boolean startOnLoad = true;
+ /** This will hold the status of the proxy weather it is running or not */
+ private boolean running = false;
public static final String ALL_TRANSPORTS = "all";
@@ -209,11 +213,17 @@
op.setMessageReceiver(msgRcvr);
}
+try {
+ axisCfg.addService(proxyService);
+ this.setRunning(true);
+ } catch (AxisFault axisFault) {
+ handleException("Unable to start the Proxy Service");
+ }
+
// should RM be engaged on this service?
if (wsRMEnabled) {
try {
- proxyService.engageModule(
- axisCfg.getModule(Constants.SANDESHA2_MODULE_NAME),
axisCfg);
+
proxyService.engageModule(axisCfg.getModule(Constants.SANDESHA2_MODULE_NAME),
axisCfg);
} catch (AxisFault axisFault) {
handleException("Error loading WS RM module on proxy service :
" + name, axisFault);
}
@@ -222,29 +232,25 @@
// should Security be engaged on this service?
if (wsSecEnabled) {
try {
- proxyService.engageModule(
- axisCfg.getModule(Constants.RAMPART_MODULE_NAME), axisCfg);
+
proxyService.engageModule(axisCfg.getModule(Constants.RAMPART_MODULE_NAME),
axisCfg);
} catch (AxisFault axisFault) {
handleException("Error loading WS Sec module on proxy service
: " + name, axisFault);
}
}
-
return proxyService;
}
public void start(SynapseConfiguration synCfg) {
AxisConfiguration axisConfig =
synCfg.getConfigurationContext().getAxisConfiguration();
- try {
- axisConfig.addService(this.buildAxisService(synCfg, axisConfig));
- } catch (AxisFault axisFault) {
- handleException(axisFault.getMessage());
- }
+ axisConfig.getServiceForActivation(this.getName()).setActive(true);
+ this.setRunning(true);
}
public void stop(SynapseConfiguration synCfg) {
AxisConfiguration axisConfig =
synCfg.getConfigurationContext().getAxisConfiguration();
try {
axisConfig.getService(this.getName()).setActive(false);
+ this.setRunning(false);
} catch (AxisFault axisFault) {
handleException(axisFault.getMessage());
}
@@ -336,6 +342,22 @@
public void setWsSecEnabled(boolean wsSecEnabled) {
this.wsSecEnabled = wsSecEnabled;
+ }
+
+ public boolean isStartOnLoad() {
+ return startOnLoad;
+ }
+
+ public void setStartOnLoad(boolean startOnLoad) {
+ this.startOnLoad = startOnLoad;
+ }
+
+ public boolean isRunning() {
+ return running;
+ }
+
+ public void setRunning(boolean running) {
+ this.running = running;
}
private static void handleException(String msg) {
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=470285&r1=470284&r2=470285
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
Thu Nov 2 01:11:02 2006
@@ -66,7 +66,10 @@
Iterator iter = synCfg.getProxyServices().iterator();
while (iter.hasNext()) {
ProxyService proxy = (ProxyService) iter.next();
- axisCfg.addService(proxy.buildAxisService(synCfg, axisCfg));
+ proxy.buildAxisService(synCfg, axisCfg);
+ if(!proxy.isStartOnLoad()) {
+ proxy.stop(synCfg);
+ }
}
log.info("Synapse initialized successfully...!");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
