You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/10/05 21:24:55 UTC

svn commit: r453325 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java

Author: sppatel
Date: Thu Oct  5 12:24:54 2006
New Revision: 453325

URL: http://svn.apache.org/viewvc?view=rev&rev=453325
Log:
additional trace

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?view=diff&rev=453325&r1=453324&r2=453325
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Thu Oct  5 12:24:54 2006
@@ -399,8 +399,7 @@
 	protected void doAdded(IModule module, String configId) throws Exception {
 		Trace.trace(Trace.INFO, ">> doAdded() " + module.toString());
 		
-		//use the correct configId, second from the .metadata, then from the plan
-		configId = configId != null ? configId : DeploymentUtils.getLastKnownConfigurationId(module, getServer());
+		configId = getLastKnowConfigurationId(module, configId);
 		if (configId == null) {
 			IStatus status = distribute(module);
 			if (!status.isOK()) {
@@ -431,8 +430,7 @@
 	protected void doChanged(IModule module, String configId) throws Exception {
 		Trace.trace(Trace.INFO, ">> doChanged() " + module.toString());
 		
-		//use the correct configId, second from the .metadata, then from the plan
-		configId = configId != null ? configId : DeploymentUtils.getLastKnownConfigurationId(module, getServer());
+		configId = getLastKnowConfigurationId(module, configId);
 		if(configId != null) {
 			String moduleConfigId = getConfigId(module);
 			if(moduleConfigId.equals(configId)) {
@@ -451,6 +449,13 @@
 		}
 
 		Trace.trace(Trace.INFO, "<< doChanged() " + module.toString());
+	}
+
+	private String getLastKnowConfigurationId(IModule module, String configId) throws CoreException {
+		//use the correct configId, second from the .metadata, then from the plan
+		configId = configId != null ? configId : DeploymentUtils.getLastKnownConfigurationId(module, getServer());
+		Trace.trace(Trace.INFO, "Config ID to be processed: " + configId);
+		return configId;
 	}
 
 	protected void doRemoved(IModule module) throws Exception {