Author: ruwan
Date: Mon Jan 14 00:41:18 2008
New Revision: 611740
URL: http://svn.apache.org/viewvc?rev=611740&view=rev
Log:
Fixing the aggregate Factory and the Serializers as per asnkha's modifications
to the mediator
Modified:
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
Modified:
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java?rev=611740&r1=611739&r2=611740&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorFactory.java
Mon Jan 14 00:41:18 2008
@@ -34,16 +34,13 @@
/**
* <aggregate>
- * <corelateOn expression="XPATH-expression"/>
- * <completeCondition timeout="time-in-seconds">
- * <messageCount min="int-min" max="int-max"/>
+ * <corelateOn expression="XPATH-expression"/>?
+ * <completeCondition [timeout="time-in-seconds"]>?
+ * <messageCount min="int-min" max="int-max"/>?
* </completeCondition>
- * <onComplete expression="XPATH-expression" sequence="sequence-ref">
+ * <onComplete expression="XPATH-expression" [sequence="sequence-ref"]>
* (mediator +)?
* </onComplete>
- * <invalidate sequence="sequence-ref" timeout="time-in-seconds">
- * (mediator +)?
- * </invalidate>
* </aggregate>
*/
public class AggregateMediatorFactory extends AbstractMediatorFactory {
Modified:
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java?rev=611740&r1=611739&r2=611740&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
Mon Jan 14 00:41:18 2008
@@ -27,16 +27,13 @@
/**
* <aggregate>
- * <corelateOn expression="XPATH-expression"/>
- * <completeCondition timeout="time-in-seconds">
- * <messageCount min="int-min" max="int-max"/>
+ * <corelateOn expression="XPATH-expression"/>?
+ * <completeCondition [timeout="time-in-seconds"]>?
+ * <messageCount min="int-min" max="int-max"/>?
* </completeCondition>
- * <onComplete expression="XPATH-expression" sequence="sequence-ref">
+ * <onComplete expression="XPATH-expression" [sequence="sequence-ref"]>
* (mediator +)?
* </onComplete>
- * <invalidate sequence="sequence-ref" timeout="time-in-seconds">
- * (mediator +)?
- * </invalidate>
* </aggregate>
*/
public class AggregateMediatorSerializer extends AbstractMediatorSerializer {
@@ -61,7 +58,7 @@
OMElement completeCond = fac.createOMElement("completeCondition",
synNS);
if (mediator.getCompletionTimeoutMillis() != 0) {
- completeCond.addAttribute("timeout",
Long.toString(mediator.getCompletionTimeoutMillis()), nullNS);
+ completeCond.addAttribute("timeout",
Long.toString(mediator.getCompletionTimeoutMillis() / 1000), nullNS);
}
OMElement messageCount = fac.createOMElement("messageCount", synNS);
if (mediator.getMinMessagesToComplete() != 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
