You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/02/27 05:19:29 UTC
svn commit: r916909 -
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/
Author: ruwan
Date: Sat Feb 27 04:19:27 2010
New Revision: 916909
URL: http://svn.apache.org/viewvc?rev=916909&view=rev
Log:
Fixing deployment issues
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java Sat Feb 27 04:19:27 2010
@@ -22,10 +22,14 @@
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.ServerManager;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.endpoints.EndpointFactory;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.endpoints.Endpoint;
+import java.io.File;
+
/**
* Handles the <code>Endpoint</code> deployment and undeployment tasks
*
@@ -163,7 +167,11 @@
= getSynapseConfiguration().getDefinedEndpoints().get(artifactName);
OMElement epElem = EndpointSerializer.getElementFromEndpoint(ep);
if (ep.getFileName() != null) {
- writeToFile(epElem, ep.getFileName());
+ String fileName = ServerManager.getInstance()
+ .getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator + MultiXMLConfigurationBuilder.ENDPOINTS_DIR
+ + File.separator + ep.getFileName();
+ writeToFile(epElem, fileName);
if (log.isDebugEnabled()) {
log.debug("Restoring the Endpoint with name : "
+ artifactName + " : Completed");
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java Sat Feb 27 04:19:27 2010
@@ -22,10 +22,14 @@
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.ServerManager;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.eventing.EventSourceFactory;
import org.apache.synapse.config.xml.eventing.EventSourceSerializer;
import org.apache.synapse.eventing.SynapseEventSource;
+import java.io.File;
+
/**
* Handles the <code>EventSource</code> deployment and undeployment tasks
*
@@ -157,7 +161,11 @@
= getSynapseConfiguration().getEventSource(artifactName);
OMElement esElem = EventSourceSerializer.serializeEventSource(null, es);
if (es.getFileName() != null) {
- writeToFile(esElem, es.getFileName());
+ String fileName = ServerManager.getInstance()
+ .getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator + MultiXMLConfigurationBuilder.EVENTS_DIR
+ + File.separator + es.getFileName();
+ writeToFile(esElem, fileName);
if (log.isDebugEnabled()) {
log.debug("Restoring the EventSource with name : " + artifactName + " : Completed");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/LocalEntryDeployer.java Sat Feb 27 04:19:27 2010
@@ -22,9 +22,13 @@
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.ServerManager;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.EntryFactory;
import org.apache.synapse.config.xml.EntrySerializer;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
+
+import java.io.File;
/**
* Handles the <code>LocalEntry</code> deployment and undeployment tasks
@@ -147,7 +151,11 @@
Entry e = getSynapseConfiguration().getDefinedEntries().get(artifactName);
OMElement entryElem = EntrySerializer.serializeEntry(e, null);
if (e.getFileName() != null) {
- writeToFile(entryElem, e.getFileName());
+ String fileName = ServerManager.getInstance()
+ .getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator + MultiXMLConfigurationBuilder.LOCAL_ENTRY_DIR
+ + File.separator + e.getFileName();
+ writeToFile(entryElem, fileName);
if (log.isDebugEnabled()) {
log.debug("Restoring the LocalEntry with name : " + artifactName + " : Completed");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/ProxyServiceDeployer.java Sat Feb 27 04:19:27 2010
@@ -23,10 +23,14 @@
import org.apache.axis2.deployment.DeploymentException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.ServerManager;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.config.xml.ProxyServiceFactory;
import org.apache.synapse.config.xml.ProxyServiceSerializer;
import org.apache.synapse.core.axis2.ProxyService;
+import java.io.File;
+
/**
* Handles the <code>ProxyService</code> deployment and undeployment tasks
*
@@ -173,7 +177,11 @@
= getSynapseConfiguration().getProxyService(artifactName);
OMElement proxyElem = ProxyServiceSerializer.serializeProxy(null, proxy);
if (proxy.getFileName() != null) {
- writeToFile(proxyElem, proxy.getFileName());
+ String fileName = ServerManager.getInstance()
+ .getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator + MultiXMLConfigurationBuilder.PROXY_SERVICES_DIR
+ + File.separator + proxy.getFileName();
+ writeToFile(proxyElem, fileName);
if (log.isDebugEnabled()) {
log.debug("Restoring the ProxyService with name : "
+ artifactName + " : Completed");
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SequenceDeployer.java Sat Feb 27 04:19:27 2010
@@ -23,11 +23,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
+import org.apache.synapse.ServerManager;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.xml.MediatorSerializerFinder;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
import org.apache.synapse.mediators.base.SequenceMediator;
+import java.io.File;
+
/**
* Handles the <code>Sequence</code> deployment and undeployment tasks
*
@@ -48,7 +52,7 @@
Mediator m = MediatorFactoryFinder.getInstance().getMediator(artifactConfig);
if (m instanceof SequenceMediator) {
SequenceMediator seq = (SequenceMediator) m;
- seq.setFileName(fileName);
+ seq.setFileName((new File(fileName).getName()));
if (log.isDebugEnabled()) {
log.debug("Sequence named '" + seq.getName()
+ "' has been built from the file " + fileName);
@@ -94,7 +98,7 @@
handleSynapseArtifactDeploymentError(
existingArtifactName + " sequence cannot be renamed");
}
- seq.setFileName(fileName);
+ seq.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("Sequence named '" + seq.getName()
+ "' has been built from the file " + fileName);
@@ -180,7 +184,11 @@
OMElement seqElem = MediatorSerializerFinder.getInstance().getSerializer(seq).
serializeMediator(null, seq);
if (seq.getFileName() != null) {
- writeToFile(seqElem, seq.getFileName());
+ String fileName = ServerManager.getInstance()
+ .getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator + MultiXMLConfigurationBuilder.SEQUENCES_DIR
+ + File.separator + seq.getFileName();
+ writeToFile(seqElem, fileName);
if (log.isDebugEnabled()) {
log.debug("Restoring the Sequence with name : " + artifactName + " : Completed");
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java?rev=916909&r1=916908&r2=916909&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/SynapseArtifactDeploymentStore.java Sat Feb 27 04:19:27 2010
@@ -22,6 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.io.File;
+import java.io.IOException;
import java.util.*;
/**
@@ -38,10 +40,20 @@
public final class SynapseArtifactDeploymentStore {
/** Keeps track of the deployed artifacts in the synapse environment */
- private static Map<String, String> fileName2ArtifactName = new HashMap<String, String>();
+ private static Map<String, String> fileName2ArtifactName
+ = new TreeMap<String, String>(new Comparator<String>() {
+ public int compare(String o1, String o2) {
+ return (new File(o1)).compareTo(new File(o2));
+ }
+ });
/** Keeps track of the updating artifacts in the synapse environment in a particular instance */
- private Map<String, String> updatingArtifacts = new HashMap<String, String>();
+ private Map<String, String> updatingArtifacts
+ = new TreeMap<String, String>(new Comparator<String>() {
+ public int compare(String o1, String o2) {
+ return (new File(o1)).compareTo(new File(o2));
+ }
+ });
/** Keeps track of the restored artifacts in the synapse environment in a particular instance */
private List<String> restoredFiles = new ArrayList<String>();
@@ -156,7 +168,9 @@
* @param fileName name of the file of the artifact which is being restored
*/
public void addRestoredArtifact(String fileName) {
- restoredFiles.add(fileName);
+ try {
+ restoredFiles.add((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
}
/**
@@ -167,7 +181,10 @@
* <code>false</code> otherwise
*/
public boolean isRestoredFile(String fileName) {
- return restoredFiles.contains(fileName);
+ try {
+ return restoredFiles.contains((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
+ return false;
}
/**
@@ -176,7 +193,9 @@
* @param fileName name of the file of the artifact to be removed
*/
public void removeRestoredFile(String fileName) {
- restoredFiles.remove(fileName);
+ try {
+ restoredFiles.remove((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
}
/**
@@ -185,7 +204,9 @@
* @param fileName name of the file of the artifact to be added into the backedUp artifacts
*/
public void addBackedUpArtifact(String fileName) {
- backedUpFiles.add(fileName);
+ try {
+ backedUpFiles.add((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
}
/**
@@ -195,7 +216,10 @@
* @return boolean <code>true</code> if the artifact is being backed up, <code>false</code> otherwise
*/
public boolean isBackedUpArtifact(String fileName) {
- return backedUpFiles.contains(fileName);
+ try {
+ return backedUpFiles.contains((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
+ return false;
}
/**
@@ -204,6 +228,8 @@
* @param fileName name of the file of the artifact to be removed
*/
public void removeBackedUpArtifact(String fileName) {
- backedUpFiles.remove(fileName);
+ try {
+ backedUpFiles.remove((new File(fileName)).getCanonicalPath());
+ } catch (IOException ignore) {}
}
}