Author: veithen
Date: Sun Mar 22 15:41:51 2009
New Revision: 757203
URL: http://svn.apache.org/viewvc?rev=757203&view=rev
Log:
Reverted r753144 (remove ManagedLifecycle from mediators that extends
AbstractMediator) as discussed here: http://markmail.org/thread/o6aatg7w35fzd77a
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
Sun Mar 22 15:41:51 2009
@@ -24,6 +24,7 @@
import org.apache.axis2.clustering.context.Replicator;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.saaj.util.SAAJUtil;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseLog;
@@ -57,7 +58,7 @@
*
* @see org.apache.synapse.Mediator
*/
-public class CacheMediator extends AbstractMediator {
+public class CacheMediator extends AbstractMediator implements
ManagedLifecycle {
private String id = null;
private String scope = CachingConstants.SCOPE_PER_HOST;// global
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
Sun Mar 22 15:41:51 2009
@@ -23,14 +23,15 @@
import org.apache.axiom.om.OMNode;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseLog;
@@ -50,7 +51,7 @@
* <target xpath="expression" | key="string"/>
* </callout>
*/
-public class CalloutMediator extends AbstractMediator {
+public class CalloutMediator extends AbstractMediator implements
ManagedLifecycle {
private ServiceClient sc = null;
private String serviceURL = null;
@@ -178,7 +179,6 @@
return null;
}
- @Override
public void init(SynapseEnvironment synEnv) {
try {
ConfigurationContext cfgCtx
@@ -193,7 +193,6 @@
}
}
- @Override
public void destroy() {
try {
sc.cleanup();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
Sun Mar 22 15:41:51 2009
@@ -21,6 +21,7 @@
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseLog;
@@ -33,15 +34,13 @@
import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.sql.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.sql.Date;
+import java.util.*;
/**
* This abstract DB mediator will perform common DB connection pooling etc.
for all DB mediators
*/
-public abstract class AbstractDBMediator extends AbstractMediator {
+public abstract class AbstractDBMediator extends AbstractMediator implements
ManagedLifecycle {
/** Hold JDBC properties */
protected final Map dataSourceProps = new HashMap();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/aggregator/AggregateMediator.java
Sun Mar 22 15:41:51 2009
@@ -23,6 +23,7 @@
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
@@ -47,7 +48,7 @@
* so that aggregations that never would complete could be timed out and
cleared from memory and
* any fault conditions handled
*/
-public class AggregateMediator extends AbstractMediator {
+public class AggregateMediator extends AbstractMediator implements
ManagedLifecycle {
private static final Log log = LogFactory.getLog(AggregateMediator.class);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
Sun Mar 22 15:41:51 2009
@@ -19,23 +19,23 @@
package org.apache.synapse.mediators.eip.splitter;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.OperationContext;
-import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.SynapseLog;
-import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.util.MessageHelper;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.mediators.eip.EIPConstants;
import org.apache.synapse.mediators.eip.Target;
-import org.apache.synapse.util.MessageHelper;
+import org.apache.synapse.mediators.eip.EIPConstants;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.OperationContext;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import java.util.Iterator;
/**
* This mediator will clone the message into multiple messages and mediate as
specified in the
@@ -43,7 +43,7 @@
* specifies an Action and/or To address to be set to the cloned message. The
number of cloned
* messages created is the number of targets specified
*/
-public class CloneMediator extends AbstractMediator {
+public class CloneMediator extends AbstractMediator implements
ManagedLifecycle {
/**
* Continue processing the parent message or not?
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
Sun Mar 22 15:41:51 2009
@@ -28,9 +28,9 @@
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.eip.EIPConstants;
import org.apache.synapse.mediators.eip.EIPUtils;
@@ -47,7 +47,7 @@
* each resulting element. This is very much similar to the clone mediator, and
* hands over the newly created messages to a target for processing
*/
-public class IterateMediator extends AbstractMediator {
+public class IterateMediator extends AbstractMediator implements
ManagedLifecycle {
/** Continue mediation on the parent message or not? */
private boolean continueParent = false;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/ext/ClassMediator.java
Sun Mar 22 15:41:51 2009
@@ -19,7 +19,11 @@
package org.apache.synapse.mediators.ext;
-import org.apache.synapse.*;
+import org.apache.synapse.ManagedLifecycle;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseLog;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
@@ -37,7 +41,7 @@
*
* @see Mediator
*/
-public class ClassMediator extends AbstractMediator {
+public class ClassMediator extends AbstractMediator implements
ManagedLifecycle {
/** The reference to the actual class that implments the Mediator
interface */
private Mediator mediator = null;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
Sun Mar 22 15:41:51 2009
@@ -36,7 +36,7 @@
* the given list of cases. This is actually a list of sequences, and
depending on the
* selected case, the selected sequence gets executed.
*/
-public class SwitchMediator extends AbstractMediator {
+public class SwitchMediator extends AbstractMediator implements
ManagedLifecycle {
/** The XPath expression specifying the source element to apply the switch
case expressions against */
private SynapseXPath source = null;
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
Sun Mar 22 15:41:51 2009
@@ -1,20 +1,21 @@
package org.apache.synapse.mediators.eip;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axis2.AxisFault;
+import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axis2.AxisFault;
-import java.util.ArrayList;
import java.util.List;
+import java.util.ArrayList;
/**
* Created by IntelliJ IDEA. User: ruwan Date: Oct 3, 2007 Time: 7:26:09 AM To
change this template
* use File | Settings | File Templates.
*/
-public class SplitTestHelperMediator extends AbstractMediator {
+public class SplitTestHelperMediator extends AbstractMediator implements
ManagedLifecycle {
private List mediatedContext = new ArrayList();
int msgcount;
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
Sun Mar 22 15:41:51 2009
@@ -20,6 +20,8 @@
package org.apache.synapse.mediators.ext;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
@@ -28,7 +30,7 @@
* use a static member variable just to test this.. This class is not nice..
:-)
* but does what is expected... :-(
*/
-public class ClassMediatorTestMediator extends AbstractMediator {
+public class ClassMediatorTestMediator extends AbstractMediator implements
ManagedLifecycle {
public static boolean invoked = false;
public static boolean initialized = false;
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
Sun Mar 22 15:41:51 2009
@@ -19,14 +19,15 @@
package org.apache.synapse.mediators.spring;
-import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseLog;
-import org.apache.synapse.config.Entry;
-import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.synapse.config.SynapseConfigUtils;
+import org.apache.synapse.config.Entry;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@@ -40,7 +41,7 @@
* refers to a Spring bean name, and also either a Spring configuration
defined to Synapse
* or an inlined Spring configuration.
*/
-public class SpringMediator extends AbstractMediator {
+public class SpringMediator extends AbstractMediator implements
ManagedLifecycle {
/**
* The Spring bean ref to be used
Modified:
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java?rev=757203&r1=757202&r2=757203&view=diff
==============================================================================
---
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
(original)
+++
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
Sun Mar 22 15:41:51 2009
@@ -19,20 +19,20 @@
package org.apache.synapse.mediators.throttle;
import org.apache.axiom.om.OMElement;
-import org.apache.axis2.clustering.ClusterManager;
-import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.context.Replicator;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.neethi.PolicyEngine;
import org.apache.synapse.ManagedLifecycle;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
+import org.apache.synapse.transport.nhttp.NhttpConstants;
import org.apache.synapse.config.Entry;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.transport.nhttp.NhttpConstants;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.clustering.context.Replicator;
+import org.apache.axis2.clustering.ClusteringFault;
+import org.apache.axis2.clustering.ClusterManager;
import org.wso2.throttle.*;
@@ -42,7 +42,7 @@
* Only support IP based throttling- Throotling can manage per IP using the
throttle policy
*/
-public class ThrottleMediator extends AbstractMediator {
+public class ThrottleMediator extends AbstractMediator implements
ManagedLifecycle {
/* The key for getting the throttling policy - key refers to a/an
[registry] entry */
private String policyKey = null;
