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/03/11 11:11:58 UTC
svn commit: r921770 -
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/
Author: ruwan
Date: Thu Mar 11 10:11:58 2010
New Revision: 921770
URL: http://svn.apache.org/viewvc?rev=921770&view=rev
Log:
Fixing the deployment
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/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
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -84,6 +84,11 @@ public abstract class AbstractSynapseArt
*/
public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
+ String filename = deploymentFileData.getAbsolutePath();
+ if (log.isDebugEnabled()) {
+ log.debug("Deployment of the synapse artifact from file : " + filename + " : STARTED");
+ }
+
if (ServerManager.getInstance().getServerState() != ServerState.STARTED) {
// synapse server has not yet being started
if (log.isDebugEnabled()) {
@@ -94,10 +99,11 @@ public abstract class AbstractSynapseArt
return;
}
- String filename = deploymentFileData.getAbsolutePath();
-
// check whether this is triggered by a restore, if it is a restore we do not want to deploy it again
if (deploymentStore.isRestoredFile(filename)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Restored artifact detected with filename : " + filename);
+ }
// only one deployment trigger can happen after a restore and hence remove it from restoredFiles
// at the first hit, allowing the further deployments/updates to take place as usual
deploymentStore.removeRestoredFile(filename);
@@ -113,6 +119,10 @@ public abstract class AbstractSynapseArt
StAXUtils.createXMLStreamReader(in)).getDocumentElement();
String artifatcName = null;
if (deploymentStore.isUpdatingArtifact(filename)) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("Updating artifact detected with filename : " + filename);
+ }
// this is an hot-update case
String existingArtifactName
= deploymentStore.getUpdatingArtifactWithFileName(filename);
@@ -156,6 +166,10 @@ public abstract class AbstractSynapseArt
handleDeploymentError("Deployment of synapse artifact failed. Error parsing "
+ filename + " : " + ex.getMessage(), ex, filename);
}
+
+ if (log.isDebugEnabled()) {
+ log.debug("Deployment of the synapse artifact from file : " + filename + " : COMPLETED");
+ }
}
/**
@@ -170,8 +184,16 @@ public abstract class AbstractSynapseArt
*/
public void unDeploy(String fileName) throws DeploymentException {
+ if (log.isDebugEnabled()) {
+ log.debug("UnDeployment of the synapse artifact from file : " + fileName + " : STARTED");
+ }
+
// We want to eliminate the undeployment when we are backing up these files
if (deploymentStore.isBackedUpArtifact(fileName)) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("BackedUp artifact detected with filename : " + fileName);
+ }
// only one undeployment trigger can happen after a backup and hence remove it from backedUpFiles
// at the first hit, allowing the further undeploymentsto take place as usual
deploymentStore.removeBackedUpArtifact(fileName);
@@ -184,6 +206,9 @@ public abstract class AbstractSynapseArt
// the Hot-Update from the above two, since it needs some validations for a real undeployment.
// also this makes sure a zero downtime of the synapse artifacts which are being Hot-deployed
if (undeployingFile.exists()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Marking artifact as updating from file : " + fileName);
+ }
// if the file exists, which means it has been updated and is a Hot-Update case
deploymentStore.addUpdatingArtifact(
fileName, deploymentStore.getArtifactNameForFile(fileName));
@@ -206,6 +231,11 @@ public abstract class AbstractSynapseArt
log.error(msg);
throw new DeploymentException(msg);
}
+
+ if (log.isDebugEnabled()) {
+ log.debug("UnDeployment of the synapse artifact from file : "
+ + fileName + " : COMPLETED");
+ }
}
// We do not support dynamically setting the directory nor the extension
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -49,7 +49,7 @@ public class EndpointDeployer extends Ab
try {
Endpoint ep = EndpointFactory.getEndpointFromElement(artifactConfig, false);
if (ep != null) {
- ep.setFileName(fileName);
+ ep.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("Endpoint named '" + ep.getName()
+ "' has been built from the file " + fileName);
@@ -88,7 +88,7 @@ public class EndpointDeployer extends Ab
try {
Endpoint ep = EndpointFactory.getEndpointFromElement(artifactConfig, false);
if (ep != null) {
- ep.setFileName(fileName);
+ ep.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("Endpoint named '" + ep.getName()
+ "' has been built from the file " + fileName);
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -49,7 +49,7 @@ public class EventSourceDeployer extends
try {
SynapseEventSource es = EventSourceFactory.createEventSource(artifactConfig);
if (es != null) {
- es.setFileName(fileName);
+ es.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("EventSource named '" + es.getName()
+ "' has been built from the file " + fileName);
@@ -88,7 +88,7 @@ public class EventSourceDeployer extends
try {
SynapseEventSource es = EventSourceFactory.createEventSource(artifactConfig);
if (es != null) {
- es.setFileName(fileName);
+ es.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("EventSource named '" + es.getName()
+ "' has been built from the file " + fileName);
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -49,7 +49,7 @@ public class LocalEntryDeployer extends
try {
Entry e = EntryFactory.createEntry(artifactConfig);
if (e != null) {
- e.setFileName(fileName);
+ e.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("LocalEntry with key '" + e.getKey()
+ "' has been built from the file " + fileName);
@@ -84,7 +84,7 @@ public class LocalEntryDeployer extends
try {
Entry e = EntryFactory.createEntry(artifactConfig);
if (e != null) {
- e.setFileName(fileName);
+ e.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("LocalEntry with key '" + e.getKey()
+ "' has been built from the file " + fileName);
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -50,7 +50,7 @@ public class ProxyServiceDeployer extend
try {
ProxyService proxy = ProxyServiceFactory.createProxy(artifactConfig);
if (proxy != null) {
- proxy.setFileName(fileName);
+ proxy.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("ProxyService named '" + proxy.getName()
+ "' has been built from the file " + fileName);
@@ -95,7 +95,7 @@ public class ProxyServiceDeployer extend
try {
ProxyService proxy = ProxyServiceFactory.createProxy(artifactConfig);
if (proxy != null) {
- proxy.setFileName(fileName);
+ proxy.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("ProxyService named '" + proxy.getName()
+ "' has been built from the file " + fileName);
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -52,7 +52,7 @@ public class SequenceDeployer extends Ab
Mediator m = MediatorFactoryFinder.getInstance().getMediator(artifactConfig);
if (m instanceof SequenceMediator) {
SequenceMediator seq = (SequenceMediator) m;
- seq.setFileName((new File(fileName).getName()));
+ seq.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("Sequence named '" + seq.getName()
+ "' has been built from the file " + fileName);
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=921770&r1=921769&r2=921770&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 Thu Mar 11 10:11:58 2010
@@ -88,6 +88,9 @@ public final class SynapseArtifactDeploy
public void addArtifact(String fileName, String artifactName) {
if (!fileName2ArtifactName.containsKey(fileName)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Added deployment artifact with file : " + fileName);
+ }
fileName2ArtifactName.put(fileName, artifactName);
} else {
log.error("An artifact has already been loaded from the file : " + fileName);
@@ -120,6 +123,9 @@ public final class SynapseArtifactDeploy
* @param fileName name of the file of which the artifact required to be removed
*/
public void removeArtifactWithFileName(String fileName) {
+ if (log.isDebugEnabled()) {
+ log.debug("Removing deployment artifact with file : " + fileName);
+ }
fileName2ArtifactName.remove(fileName);
}
@@ -130,6 +136,9 @@ public final class SynapseArtifactDeploy
* @param artifactName name of the actual artifact being updated
*/
public void addUpdatingArtifact(String fileName, String artifactName) {
+ if (log.isDebugEnabled()) {
+ log.debug("Added updating file : " + fileName);
+ }
updatingArtifacts.put(fileName, artifactName);
}
@@ -159,6 +168,9 @@ public final class SynapseArtifactDeploy
* @param fileName name of the file of the artifact to be removed from the updating artifacts
*/
public void removeUpdatingArtifact(String fileName) {
+ if (log.isDebugEnabled()) {
+ log.debug("Removing the updating file : " + fileName);
+ }
updatingArtifacts.remove(fileName);
}
@@ -169,6 +181,9 @@ public final class SynapseArtifactDeploy
*/
public void addRestoredArtifact(String fileName) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Added restored file : " + (new File(fileName)).getCanonicalPath());
+ }
restoredFiles.add((new File(fileName)).getCanonicalPath());
} catch (IOException ignore) {}
}
@@ -194,6 +209,9 @@ public final class SynapseArtifactDeploy
*/
public void removeRestoredFile(String fileName) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Removing restored file : " + (new File(fileName)).getCanonicalPath());
+ }
restoredFiles.remove((new File(fileName)).getCanonicalPath());
} catch (IOException ignore) {}
}
@@ -205,6 +223,9 @@ public final class SynapseArtifactDeploy
*/
public void addBackedUpArtifact(String fileName) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Added backup file : " + (new File(fileName)).getCanonicalPath());
+ }
backedUpFiles.add((new File(fileName)).getCanonicalPath());
} catch (IOException ignore) {}
}
@@ -229,6 +250,9 @@ public final class SynapseArtifactDeploy
*/
public void removeBackedUpArtifact(String fileName) {
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Removing backup file : " + (new File(fileName)).getCanonicalPath());
+ }
backedUpFiles.remove((new File(fileName)).getCanonicalPath());
} catch (IOException ignore) {}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java?rev=921770&r1=921769&r2=921770&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/TaskDeployer.java Thu Mar 11 10:11:58 2010
@@ -47,7 +47,7 @@ public class TaskDeployer extends Abstra
try {
Startup st = StartupFinder.getInstance().getStartup(artifactConfig);
- st.setFileName((new File(fileName).getName()));
+ st.setFileName((new File(fileName)).getName());
if (log.isDebugEnabled()) {
log.debug("StartupTask named '" + st.getName()
+ "' has been built from the file " + fileName);