Author: ruwan
Date: Wed Oct 10 20:15:26 2007
New Revision: 583672
URL: http://svn.apache.org/viewvc?rev=583672&view=rev
Log:
Refactoring the startup jobs to tasks and the configuration accordinglly
Added:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Task.java
- copied, changed from r583385,
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Job.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/
- copied from r583385,
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
- copied, changed from r583441,
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/MessageInjector.java
Removed:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Job.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Startup.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
Wed Oct 10 20:15:26 2007
@@ -226,7 +226,7 @@
public void setWSAMessageID(String messageID);
/**
- * Gets the message id
+ * Gets the message name
* @return the WSA MessageID
*/
public String getWSAMessageID();
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Startup.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Startup.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Startup.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Startup.java
Wed Oct 10 20:15:26 2007
@@ -34,16 +34,16 @@
public abstract QName getTagQName();
/**
- * This will return the id of the startup
+ * This will return the name of the startup
*
- * @return String representing the id
+ * @return String representing the name
*/
- public String getId();
+ public String getName();
/**
- * This will set the id of a Startup
+ * This will set the name of a Startup
*
- * @param id String id to be set to the startup
+ * @param id String name to be set to the startup
*/
- public void setId(String id);
+ public void setName(String id);
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Wed Oct 10 20:15:26 2007
@@ -602,11 +602,11 @@
}
/**
- * Get the Startup with the specified id
+ * Get the Startup with the specified name
*
* @param id
- * String id of the startup to be retrieved
- * @return Startup object with the specified id or null
+ * String name of the startup to be retrieved
+ * @return Startup object with the specified name or null
*/
public Startup getStartup(String id) {
return (Startup) startups.get(id);
@@ -619,7 +619,7 @@
* Startup object to be added
*/
public void addStartup(Startup startup) {
- startups.put(startup.getId(), startup);
+ startups.put(startup.getName(), startup);
}
/**
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/StartupFinder.java
Wed Oct 10 20:15:26 2007
@@ -24,7 +24,6 @@
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
import org.apache.axiom.om.*;
import org.apache.commons.logging.Log;
@@ -73,8 +72,7 @@
try {
sf = (StartupFactory) b.newInstance();
} catch (Exception e) {
- throw new SynapseException("cannot instantiate " + b.getName(),
- e);
+ throw new SynapseException("cannot instantiate " +
b.getName(), e);
}
factoryMap.put(sf.getTagQName(), b);
@@ -126,8 +124,8 @@
*/
public Startup getStartup(OMElement element) {
- String id = element.getAttributeValue(new
QName(XMLConfigConstants.NULL_NAMESPACE, "id"));
- if (id == null) {
+ String name = element.getAttributeValue(new
QName(XMLConfigConstants.NULL_NAMESPACE, "name"));
+ if (name == null) {
String msg = "Id for an startup is required, missing Id in the
startup";
if (log.isDebugEnabled()) {
log.debug(msg);
@@ -135,7 +133,7 @@
throw new SynapseException(msg);
}
- QName qName = element.getFirstElement().getQName();
+ QName qName = element.getQName();
if (log.isDebugEnabled()) {
log.debug("getStartup(" + qName + ")");
}
@@ -150,8 +148,8 @@
try {
StartupFactory sf = (StartupFactory) cls.newInstance();
- Startup startup = sf.createStartup(element.getFirstElement());
- startup.setId(id);
+ Startup startup = sf.createStartup(element);
+ startup.setName(name);
return startup;
} catch (InstantiationException e) {
@@ -191,7 +189,7 @@
OMFactory fac = OMAbstractFactory.getOMFactory();
OMElement startupElement = fac.createOMElement(
"startup",
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn"));
- startupElement.addAttribute("id", startup.getId(),
fac.createOMNamespace("", ""));
+ startupElement.addAttribute("name", startup.getName(),
fac.createOMNamespace("", ""));
StartupSerializer ss = (StartupSerializer) cls.newInstance();
ss.serializeStartup(startupElement, startup);
if (parent != null) {
@@ -233,7 +231,7 @@
* @param om
* @return
*/
- public Object getObjectFromOMNode(OMNode om) {
+ public Startup getObjectFromOMNode(OMNode om) {
if (om instanceof OMElement) {
return getStartup((OMElement) om);
} else {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
Wed Oct 10 20:15:26 2007
@@ -82,7 +82,7 @@
defineProxy(config, elt);
} else if
(XMLConfigConstants.REGISTRY_ELT.equals(elt.getQName())) {
defineRegistry(config, elt);
- } else if
(XMLConfigConstants.STARTUP_ELT.equals(elt.getQName())) {
+ } else if (XMLConfigConstants.TASK_ELT.equals(elt.getQName()))
{
defineStartup(config, elt);
} else {
Mediator m =
MediatorFactoryFinder.getInstance().getMediator(elt);
@@ -136,8 +136,8 @@
private static void defineStartup(SynapseConfiguration config, OMElement
elem) {
Startup startup = StartupFinder.getInstance().getStartup(elem);
- if (config.getStartup(startup.getId()) != null) {
- handleException("Duplicate startup with id : " + startup.getId());
+ if (config.getStartup(startup.getName()) != null) {
+ handleException("Duplicate startup with name : " +
startup.getName());
}
config.addStartup(startup);
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorFactory.java
Wed Oct 10 20:15:26 2007
@@ -37,7 +37,7 @@
* <p/>
* <validate [source="xpath"]>
* <schema key="string">+
- * <property name="<validation-feature-id>" value="true|false"/> *
+ * <property name="<validation-feature-name>" value="true|false"/>
* <on-fail>
* mediator+
* </on-fail>
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ValidateMediatorSerializer.java
Wed Oct 10 20:15:26 2007
@@ -20,8 +20,6 @@
package org.apache.synapse.config.xml;
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.mediators.builtin.ValidateMediator;
import org.apache.synapse.mediators.MediatorProperty;
@@ -32,7 +30,7 @@
/**
* <validate [source="xpath"]>
* <schema key="string">+
- * <property name="<validation-feature-id>" value="true|false"/> *
+ * <property name="<validation-feature-name>" value="true|false"/>
* <on-fail>
* mediator+
* </on-fail>
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
Wed Oct 10 20:15:26 2007
@@ -51,10 +51,10 @@
public static final QName ENDPOINT_ELT = new QName(SYNAPSE_NAMESPACE,
"endpoint");
public static final QName ENTRY_ELT = new QName(SYNAPSE_NAMESPACE,
"localEntry");
public static final QName REGISTRY_ELT = new QName(SYNAPSE_NAMESPACE,
"registry");
- public static final QName STARTUP_ELT = new QName(SYNAPSE_NAMESPACE,
"startup");
+ public static final QName TASK_ELT = new QName(SYNAPSE_NAMESPACE,
"task");
public static final QName PROXY_ELT = new QName(SYNAPSE_NAMESPACE,
"proxy");
public static final String NULL_NAMESPACE = "";
- public static final Object QUARTZ_QNAME =
+ public static final Object QUARTZ_QNAME =
new QName("http://www.opensymphony.com/quartz/JobSchedulingData";,
"quartz");
/** The Trace attribute name, for proxy services, sequences */
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Wed Oct 10 20:15:26 2007
@@ -21,7 +21,9 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.description.InOutAxisOperation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
@@ -31,8 +33,8 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
-import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.mediators.MediatorWorker;
+import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.statistics.StatisticsCollector;
import org.apache.synapse.statistics.StatisticsUtils;
import org.apache.synapse.util.UUIDGenerator;
@@ -191,8 +193,11 @@
org.apache.axis2.context.MessageContext axis2MC
= new org.apache.axis2.context.MessageContext();
axis2MC.setConfigurationContext(this.configContext);
- axis2MC.setServiceContext(new ServiceContext());
-// axis2MC.setOperationContext(new OperationContext());
+
+ ServiceContext svcCtx = new ServiceContext();
+ OperationContext opCtx = new OperationContext(new
InOutAxisOperation(), svcCtx);
+ axis2MC.setServiceContext(svcCtx);
+ axis2MC.setOperationContext(opCtx);
MessageContext mc = new Axis2MessageContext(axis2MC, synapseConfig,
this);
mc.setMessageID(UUIDGenerator.getUUID());
try {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/dispatch/SoapSessionDispatcher.java
Wed Oct 10 20:15:26 2007
@@ -21,11 +21,8 @@
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.om.OMElement;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.util.HashMap;
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/AbstractStartup.java
Wed Oct 10 20:15:26 2007
@@ -27,26 +27,26 @@
public abstract class AbstractStartup implements Startup {
/**
- * Holds the id of a Startup
+ * Holds the name of a Startup
*/
- private String id = null;
+ protected String name = null;
/**
- * This will return the id of the startup
+ * This will return the name of the startup
*
- * @return String representing the id
+ * @return String representing the name
*/
- public String getId() {
- return this.id;
+ public String getName() {
+ return this.name;
}
/**
- * This will set the id of a Startup
+ * This will set the name of a Startup
*
- * @param id
- * String id to be set to the startup
+ * @param name
+ * String name to be set to the startup
*/
- public void setId(String id) {
- this.id = id;
+ public void setName(String name) {
+ this.name = name;
}
}
Copied:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Task.java
(from r583385,
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Job.java)
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Task.java?p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Task.java&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Job.java&r1=583385&r2=583672&rev=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Job.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/Task.java
Wed Oct 10 20:15:26 2007
@@ -20,9 +20,9 @@
package org.apache.synapse.startup;
/**
- * Defines the Job for a SimpleQuarts Startup
+ * Defines the Task for a SimpleQuarts Startup
*/
-public interface Job {
+public interface Task {
/**
* Esecute method will be invoked by the SimpleQuartzStartup
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
Wed Oct 10 20:15:26 2007
@@ -29,7 +29,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.Startup;
import org.apache.synapse.SynapseException;
import org.apache.synapse.startup.AbstractStartup;
import org.quartz.CronTrigger;
@@ -68,7 +67,7 @@
Set xmlProperties = new HashSet();
public QName getTagQName() {
- return SimpleQuartzFactory.JOB;
+ return SimpleQuartzFactory.TASK;
}
public void destroy() {
@@ -103,7 +102,7 @@
trigger.setVolatility(true);
JobDetail jobDetail = new JobDetail();
// Give the job a random name
- jobDetail.setName("Job" + String.valueOf((new
Random()).nextLong()));
+ jobDetail.setName(name);
jobDetail.setGroup("synapse.simple.quartz");
jobDetail.setJobClass(SimpleQuartzJob.class);
JobDataMap jdm = new JobDataMap();
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
Wed Oct 10 20:15:26 2007
@@ -36,7 +36,7 @@
/*
* Namespace = synapse namespace
*
- * <job class="org.my.synapse.job">
+ * <task class="org.my.synapse.Task">
* <property name="stringProp" value="String"/>
* <property name="xmlProp">
* %lt;somexml>config</somexml>
@@ -44,14 +44,13 @@
* <simpletrigger forever="true" count="10" interval="1000"/>
* <!-- forever or count not both -->
* <crontrigger expression="0 * 1 * * ?" />
- * </job>
+ * </task>
*
*/
public class SimpleQuartzFactory implements StartupFactory {
- public final static QName JOB
- = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "job");
+ public final static QName TASK = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "task");
private final static QName SIMPLE
= new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "simpletrigger");
@@ -67,7 +66,7 @@
public Startup createStartup(OMElement el) {
if (log.isDebugEnabled())
log.debug("Creating SimpleQuartz startup");
- if (el.getQName().equals(JOB)) {
+ if (el.getQName().equals(TASK)) {
SimpleQuartz q = new SimpleQuartz();
OMAttribute classAttr = el.getAttribute(new QName("class"));
if (classAttr == null) {
@@ -75,18 +74,18 @@
throw new SynapseException(
"Cannot create Quartz Startup - no class attribute");
}
- // test if we can create the job?
+ // test if we can create the task?
String classname = classAttr.getAttributeValue();
- // if no package specified then prepend
"org.apache.synapse.startup.jobs"
+ // if no package specified then prepend
"org.apache.synapse.startup.tasks"
if (classname.indexOf('.') == -1) {
- classname = "org.apache.synapse.startup.jobs." + classname;
+ classname = "org.apache.synapse.startup.tasks." + classname;
}
try {
getClass().getClassLoader().loadClass(classname).newInstance();
}
catch (Exception e) {
- throw new SynapseException("Failed to load job class " +
classname, e);
+ throw new SynapseException("Failed to load task class " +
classname, e);
}
q.setJobClass(classname);
// next sort out the property children
@@ -101,7 +100,7 @@
} else {
throw new SynapseException(
- "job does not support dynamic properties");
+ "Task does not support dynamic properties");
}
}
@@ -183,7 +182,7 @@
}
public QName getTagQName() {
- return JOB;
+ return TASK;
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzJob.java
Wed Oct 10 20:15:26 2007
@@ -14,36 +14,36 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-public class SimpleQuartzJob implements Job{
+public class SimpleQuartzJob implements Job {
public static final String SYNAPSEENVIRONMENT= "SynapseEnvironment",
CLASSNAME="ClassName", PROPERTIES = "Properties";
private static final Log log = LogFactory.getLog(SimpleQuartzJob.class);
public void execute(JobExecutionContext ctx) throws
JobExecutionException {
- log.debug("executing job "+ctx.getJobDetail().getFullName());
+ log.debug("executing task "+ctx.getJobDetail().getFullName());
JobDataMap jdm = ctx.getMergedJobDataMap();
String jobClassName = (String)jdm.get(CLASSNAME);
if (jobClassName==null) {
throw new JobExecutionException("No "+CLASSNAME+" in
JobDetails");
}
- org.apache.synapse.startup.Job job =null;
+ org.apache.synapse.startup.Task task =null;
try {
- job =
(org.apache.synapse.startup.Job)getClass().getClassLoader().loadClass(jobClassName).newInstance();
+ task =
(org.apache.synapse.startup.Task)getClass().getClassLoader().loadClass(jobClassName).newInstance();
} catch (Exception e) {
- throw new JobExecutionException("Cannot instantiate job
"+jobClassName, e);
+ throw new JobExecutionException("Cannot instantiate
task "+jobClassName, e);
}
Set properties = (Set)jdm.get(PROPERTIES);
Iterator it = properties.iterator();
while (it.hasNext()) {
OMElement prop = (OMElement)it.next();
log.debug("found Property"+prop.toString());
- PropertyHelper.setStaticProperty(prop, job);
+ PropertyHelper.setStaticProperty(prop, task);
}
SynapseEnvironment se =
(SynapseEnvironment)jdm.get("SynapseEnvironment");
- if (job instanceof ManagedLifecycle) {
+ if (task instanceof ManagedLifecycle) {
if (se!=null) {
- ((ManagedLifecycle)job).init(se);
+ ((ManagedLifecycle) task).init(se);
}
}
- job.execute();
+ task.execute();
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java?rev=583672&r1=583671&r2=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzSerializer.java
Wed Oct 10 20:15:26 2007
@@ -45,7 +45,7 @@
OMNamespace nullNS = fac.createOMNamespace("", "");
OMNamespace synNS =
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn");
- OMElement job = fac.createOMElement("job", synNS, parent);
+ OMElement job = fac.createOMElement("task", synNS, parent);
job.addAttribute("class", sq.getJobClass(), nullNS);
if (sq.isSimple()) {
Copied:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
(from r583441,
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/MessageInjector.java)
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java?p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/MessageInjector.java&r1=583441&r2=583672&rev=583672&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/jobs/MessageInjector.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/tasks/MessageInjector.java
Wed Oct 10 20:15:26 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.startup.jobs;
+package org.apache.synapse.startup.tasks;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
@@ -26,13 +26,13 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.startup.Job;
+import org.apache.synapse.startup.Task;
import org.apache.synapse.util.PayloadHelper;
/**
* Injects a Message in to the Synapse environment
*/
-public class MessageInjector implements Job, ManagedLifecycle {
+public class MessageInjector implements Task, ManagedLifecycle {
/**
* Holds the logger for logging purposes
@@ -49,6 +49,8 @@
*/
private String to = null;
+ private String soapAction = null;
+
/**
* Holds the SynapseEnv to which the message will be injected
*/
@@ -85,6 +87,10 @@
to = url;
}
+ public void setSoapAction(String soapAction) {
+ this.soapAction = soapAction;
+ }
+
/**
* This will be invoked by the schedular to inject the message
* in to the SynapseEnvironment
@@ -105,10 +111,13 @@
return;
}
- MessageContext mc = synapseEnvironment.createMessageContext();
- mc.setTo(new EndpointReference(to));
- PayloadHelper.setXMLPayload(mc, message.cloneOMElement());
- synapseEnvironment.injectMessage(mc);
+ MessageContext mc = synapseEnvironment.createMessageContext();
+ mc.setTo(new EndpointReference(to));
+ PayloadHelper.setXMLPayload(mc, message.cloneOMElement());
+ if (soapAction != null) {
+ mc.setSoapAction(soapAction);
+ }
+ synapseEnvironment.injectMessage(mc);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
