Author: azeez
Date: Wed Jun 30 12:30:02 2010
New Revision: 959283
URL: http://svn.apache.org/viewvc?rev=959283&view=rev
Log:
Extending AbstractDeployer which implements the cleanup method
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java?rev=959283&r1=959282&r2=959283&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
Wed Jun 30 12:30:02 2010
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.Deployer;
+import org.apache.axis2.deployment.AbstractDeployer;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.description.Parameter;
@@ -39,7 +39,12 @@ import org.apache.synapse.config.Synapse
import org.apache.synapse.core.SynapseEnvironment;
import javax.xml.stream.XMLStreamException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
/**
* Implements the generic logic for the synapse artifact deployment and
provide a deployment framework
@@ -51,7 +56,7 @@ import java.io.*;
*
* @see org.apache.axis2.deployment.Deployer
*/
-public abstract class AbstractSynapseArtifactDeployer implements Deployer {
+public abstract class AbstractSynapseArtifactDeployer extends AbstractDeployer
{
private static final Log log =
LogFactory.getLog(AbstractSynapseArtifactDeployer.class);
protected Log deployerLog;
@@ -183,7 +188,7 @@ public abstract class AbstractSynapseArt
*
* @see
org.apache.synapse.deployers.AbstractSynapseArtifactDeployer#undeploySynapseArtifact(String)
*/
- public void unDeploy(String fileName) throws DeploymentException {
+ public void undeploy(String fileName) throws DeploymentException {
fileName = FilenameUtils.normalize(fileName);
if (log.isDebugEnabled()) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java?rev=959283&r1=959282&r2=959283&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ExtensionDeployer.java
Wed Jun 30 12:30:02 2010
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.deployment.AbstractDeployer;
import org.apache.axis2.deployment.Deployer;
import org.apache.axis2.deployment.DeploymentClassLoader;
import org.apache.axis2.deployment.DeploymentException;
@@ -49,7 +50,7 @@ import org.apache.synapse.config.xml.Sta
* This will support the hot deployment and hot update of Synapse extensions
(mediators
* and startups) at runtime using the Axis2 concepts of deployers.
*/
-public class ExtensionDeployer implements Deployer {
+public class ExtensionDeployer extends AbstractDeployer {
/**
* Holds the log variable for logging purposes
@@ -193,7 +194,7 @@ public class ExtensionDeployer implement
* @param string - filename of the deleted file
* @throws DeploymentException - incase of an error in undeployment
*/
- public void unDeploy(String string) throws DeploymentException {
+ public void undeploy(String string) throws DeploymentException {
// todo: implement the undeployement
}
Modified:
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java?rev=959283&r1=959282&r2=959283&view=diff
==============================================================================
---
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java
(original)
+++
synapse/trunk/java/modules/experimental/src/main/java/org/apache/synapse/experimental/ProxyDeployer.java
Wed Jun 30 12:30:02 2010
@@ -19,32 +19,31 @@
package org.apache.synapse.experimental;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.Deployer;
+import org.apache.axis2.deployment.AbstractDeployer;
import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.ManagedLifecycle;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.xml.ProxyServiceFactory;
-import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.core.axis2.ProxyService;
+
+import javax.xml.stream.XMLStreamException;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
-public class ProxyDeployer implements Deployer {
+public class ProxyDeployer extends AbstractDeployer {
private final Map<String,String> filenameToProxyNameMap = new
HashMap<String,String>();
private ConfigurationContext cfgCtx = null;
@@ -122,7 +121,7 @@ public class ProxyDeployer implements De
public void setExtension(String extension) {
}
- public void unDeploy(String fileName) throws DeploymentException {
+ public void undeploy(String fileName) throws DeploymentException {
String proxyName = filenameToProxyNameMap.get(fileName);
if (proxyName == null) {
throw new DeploymentException("Nothing known about file '" +
fileName + "'");