Author: veithen
Date: Sun Mar 22 16:25:16 2009
New Revision: 757207
URL: http://svn.apache.org/viewvc?rev=757207&view=rev
Log:
Removed the ManagedLifecycle interface and the default init and destroy
implementations from AbstractMediator.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
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/SendMediator.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/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/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java?rev=757207&r1=757206&r2=757207&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/AbstractMediator.java
Sun Mar 22 16:25:16 2009
@@ -24,14 +24,13 @@
import org.apache.synapse.*;
import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.aspects.AspectConfiguration;
-import org.apache.synapse.core.SynapseEnvironment;
/**
* This is the superclass of all mediators, and defines common logging,
tracing other aspects
* for all mediators who extend from this.
* elements of a mediator class.
*/
-public abstract class AbstractMediator implements Mediator,
AspectConfigurable, ManagedLifecycle {
+public abstract class AbstractMediator implements Mediator, AspectConfigurable
{
/** the standard log for mediators, will assign the logger for the actual
subclass */
protected Log log;
@@ -310,10 +309,4 @@
public AspectConfiguration getAspectConfiguration() {
return aspectConfiguration;
}
-
- public void init(SynapseEnvironment se) {
- }
-
- public void destroy() {
- }
}
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -75,14 +75,12 @@
private String cacheManagerKey = CachingConstants.CACHE_MANAGER; //
default per-host
private static final String CACHE_MANAGER_PREFIX =
"synapse.cache_manager_";
- @Override
public void init(SynapseEnvironment se) {
if (onCacheHitSequence != null) {
onCacheHitSequence.init(se);
}
}
- @Override
public void destroy() {
if (onCacheHitSequence != null) {
onCacheHitSequence.destroy();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?rev=757207&r1=757206&r2=757207&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
Sun Mar 22 16:25:16 2009
@@ -88,14 +88,12 @@
this.endpoint = endpoint;
}
- @Override
public void init(SynapseEnvironment synapseEnvironment) {
if (endpoint instanceof ManagedLifecycle) {
((ManagedLifecycle) endpoint).init(synapseEnvironment);
}
}
- @Override
public void destroy() {
if (endpoint instanceof ManagedLifecycle) {
((ManagedLifecycle) endpoint).destroy();
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -58,7 +58,6 @@
* do the IC lookup here
* @param se the Synapse environment reference
*/
- @Override
public void init(SynapseEnvironment se) {
// do nothing
}
@@ -66,7 +65,6 @@
/**
* Destroys the mediator. If we are using our custom DataSource, then shut
down the connections
*/
- @Override
public void destroy() {
if (this.dataSource instanceof BasicDataSource) {
try {
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -153,7 +153,6 @@
this.targets.add(target);
}
- @Override
public void init(SynapseEnvironment se) {
for (Target target : targets) {
@@ -168,7 +167,6 @@
}
}
- @Override
public void destroy() {
for (Target target : targets) {
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -253,7 +253,6 @@
this.target = target;
}
- @Override
public void init(SynapseEnvironment se) {
if (target != null) {
Endpoint endpoint = target.getEndpoint();
@@ -267,7 +266,6 @@
}
}
- @Override
public void destroy() {
if (target != null) {
Endpoint endpoint = target.getEndpoint();
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -87,7 +87,6 @@
return result;
}
- @Override
public void destroy() {
if (log.isDebugEnabled()) {
log.debug("Destroying class mediator instance for : " +
mediator.getClass());
@@ -97,7 +96,6 @@
}
}
- @Override
public void init(SynapseEnvironment se) {
if (log.isDebugEnabled()) {
log.debug("Initializing class mediator instance for : " +
mediator.getClass());
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -45,7 +45,6 @@
/** The default switch case, if any */
private SwitchCase defaultCase = null;
- @Override
public void init(SynapseEnvironment se) {
for (ManagedLifecycle swCase : cases) {
swCase.init(se);
@@ -55,7 +54,6 @@
}
}
- @Override
public void destroy() {
for (ManagedLifecycle swCase : cases) {
swCase.destroy();
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=757207&r1=757206&r2=757207&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 16:25:16 2009
@@ -162,4 +162,7 @@
MessageContext synCtx = se.createMessageContext();
buildAppContext(synCtx, getLog(synCtx));
}
+
+ public void destroy() {
+ }
}
