Author: ruwan
Date: Tue Oct 16 21:35:57 2007
New Revision: 585365
URL: http://svn.apache.org/viewvc?rev=585365&view=rev
Log:
Fixing the serialization issue with tasks
Modified:
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/startup/quartz/SimpleQuartzSerializer.java
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=585365&r1=585364&r2=585365&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
Tue Oct 16 21:35:57 2007
@@ -174,17 +174,8 @@
}
try {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMElement startupElement = fac.createOMElement(
- "startup",
fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "syn"));
- startupElement.addAttribute("name", startup.getName(),
fac.createOMNamespace("", ""));
StartupSerializer ss = (StartupSerializer) cls.newInstance();
- ss.serializeStartup(startupElement, startup);
- if (parent != null) {
- parent.addChild(startupElement);
- }
-
- return startupElement;
+ return ss.serializeStartup(parent, startup);
} catch (InstantiationException e) {
String msg = "Error initializing startup serializer: " + cls;
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=585365&r1=585364&r2=585365&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
Tue Oct 16 21:35:57 2007
@@ -43,16 +43,17 @@
public OMElement serializeStartup(OMElement parent, Startup s) {
if (!(s instanceof SimpleQuartz)) {
- throw new SynapseException("called SimpleQuartzSerializer on some
other " +
+ throw new SynapseException("called TaskSerializer on some other " +
"kind of startup" + s.getClass().getName());
}
SimpleQuartz sq = (SimpleQuartz) s;
- OMElement job = fac.createOMElement("task", synNS, parent);
- job.addAttribute("class", sq.getJobClass(), nullNS);
+ OMElement task = fac.createOMElement("task", synNS, parent);
+ task.addAttribute("name", sq.getName(), nullNS);
+ task.addAttribute("class", sq.getJobClass(), nullNS);
- OMElement el = fac.createOMElement("trigger", synNS, job);
+ OMElement el = fac.createOMElement("trigger", synNS, task);
if (sq.getInterval() == 1 && sq.getCount() == 1) {
el.addAttribute("once", "true", nullNS);
} else if (sq.getCron() != null) {
@@ -69,10 +70,10 @@
for (Object o : sq.getProperties()) {
OMElement prop = (OMElement) o;
- job.addChild(prop.cloneOMElement());
+ task.addChild(prop.cloneOMElement());
}
- return job;
+ return task;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
