Author: ruwan
Date: Tue Feb 16 00:48:34 2010
New Revision: 910372
URL: http://svn.apache.org/viewvc?rev=910372&view=rev
Log:
Refactoring the name of the artifact Holder
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/DeployedSynapseArtifactHolder.java
- copied, changed from r909981,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/FileNameToArtifactNameHolder.java
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/FileNameToArtifactNameHolder.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=910372&r1=910371&r2=910372&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
Tue Feb 16 00:48:34 2010
@@ -30,7 +30,7 @@
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.axis2.ProxyService;
-import org.apache.synapse.deployers.FileNameToArtifactNameHolder;
+import org.apache.synapse.deployers.DeployedSynapseArtifactHolder;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.eventing.SynapseEventSource;
import org.apache.synapse.mediators.base.SequenceMediator;
@@ -168,7 +168,7 @@
Entry entry = SynapseXMLConfigurationFactory.defineEntry(
synapseConfig, document);
entry.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), entry.getKey());
} catch (FileNotFoundException ignored) {}
}
@@ -190,7 +190,7 @@
ProxyService proxy =
SynapseXMLConfigurationFactory.defineProxy(
synapseConfig, document);
proxy.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), proxy.getName());
} catch (FileNotFoundException ignored) {}
}
@@ -214,7 +214,7 @@
if (startup instanceof AbstractStartup) {
((AbstractStartup)
startup).setFileName(file.getName());
}
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), startup.getName());
} catch (FileNotFoundException ignored) {}
}
@@ -238,7 +238,7 @@
if (seq instanceof SequenceMediator) {
SequenceMediator sequence = (SequenceMediator) seq;
sequence.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+
DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), sequence.getName());
}
} catch (FileNotFoundException ignored) {}
@@ -261,7 +261,7 @@
Endpoint endpoint =
SynapseXMLConfigurationFactory.defineEndpoint(
synapseConfig, document);
endpoint.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), endpoint.getName());
} catch (FileNotFoundException ignored) {}
}
@@ -283,7 +283,7 @@
SynapseEventSource eventSource =
SynapseXMLConfigurationFactory.
defineEventSource(synapseConfig, document);
eventSource.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), eventSource.getName());
} catch (FileNotFoundException ignored) {}
}
@@ -305,7 +305,7 @@
PriorityExecutor executor = SynapseXMLConfigurationFactory.
defineExecutor(synapseConfig, document);
executor.setFileName(file.getName());
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
file.getAbsolutePath(), executor.getName());
} catch (FileNotFoundException ignored) {}
}
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=910372&r1=910371&r2=910372&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
Tue Feb 16 00:48:34 2010
@@ -145,7 +145,7 @@
}
}
if (artifatcName != null) {
-
FileNameToArtifactNameHolder.getInstance().addArtifact(filename, artifatcName);
+
DeployedSynapseArtifactHolder.getInstance().addArtifact(filename, artifatcName);
}
} finally {
in.close();
@@ -182,7 +182,7 @@
return;
}
- FileNameToArtifactNameHolder holder =
FileNameToArtifactNameHolder.getInstance();
+ DeployedSynapseArtifactHolder holder =
DeployedSynapseArtifactHolder.getInstance();
if (holder.containsFileName(fileName)) {
File undeployingFile = new File(fileName);
// axis2 treats Hot-Update as (Undeployment + deployment), where
synapse needs to differentiate
@@ -304,7 +304,7 @@
backupFile(new File(fileName));
log.info("Restoring the existing artifact into the file : " +
fileName);
restoreSynapseArtifact(updatingArtifacts.get(fileName));
- FileNameToArtifactNameHolder.getInstance().addArtifact(
+ DeployedSynapseArtifactHolder.getInstance().addArtifact(
fileName, updatingArtifacts.get(fileName));
updatingArtifacts.remove(fileName);
}
Copied:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/DeployedSynapseArtifactHolder.java
(from r909981,
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/FileNameToArtifactNameHolder.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/DeployedSynapseArtifactHolder.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/DeployedSynapseArtifactHolder.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/FileNameToArtifactNameHolder.java&r1=909981&r2=910372&rev=910372&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/FileNameToArtifactNameHolder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/DeployedSynapseArtifactHolder.java
Tue Feb 16 00:48:34 2010
@@ -36,29 +36,29 @@
* @see org.apache.synapse.deployers.AbstractSynapseArtifactDeployer
* @see org.apache.synapse.config.xml.MultiXMLConfigurationBuilder
*/
-public class FileNameToArtifactNameHolder {
+public class DeployedSynapseArtifactHolder {
/**
* Keeps track of the deployed artifacts in the synapse environment
*/
private static Map<String, String> fileName2ArtifactName = new
HashMap<String, String>();
- private static FileNameToArtifactNameHolder _instance;
+ private static DeployedSynapseArtifactHolder _instance;
- private static final Log log =
LogFactory.getLog(FileNameToArtifactNameHolder.class);
+ private static final Log log =
LogFactory.getLog(DeployedSynapseArtifactHolder.class);
- private FileNameToArtifactNameHolder() {}
+ private DeployedSynapseArtifactHolder() {}
/**
* Provides the <code>singleton</code> instance of
- * {...@link org.apache.synapse.deployers.FileNameToArtifactNameHolder}
+ * {...@link DeployedSynapseArtifactHolder}
*
- * @return the singleton instance of FileNameToArtifactNameHolder
+ * @return the singleton instance of DeployedSynapseArtifactHolder
*/
- public static FileNameToArtifactNameHolder getInstance() {
+ public static DeployedSynapseArtifactHolder getInstance() {
if (_instance == null) {
- _instance = new FileNameToArtifactNameHolder();
+ _instance = new DeployedSynapseArtifactHolder();
}
return _instance;
}
