geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r368066 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core: plugin.xml src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
Date Wed, 11 Jan 2006 17:25:47 GMT
Author: sppatel
Date: Wed Jan 11 09:25:44 2006
New Revision: 368066

URL: http://svn.apache.org/viewcvs?rev=368066&view=rev
Log:
increase timeout value for debug mode

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.xml?rev=368066&r1=368065&r2=368066&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/plugin.xml
Wed Jan 11 09:25:44 2006
@@ -34,7 +34,7 @@
            class="org.apache.geronimo.core.internal.GeronimoServer"
            initialState="stopped"
            supportsRemoteHosts="false"
-           startTimeout="120000"
+           startTimeout="240000"
 	       stopTimeout="30000"
            startBeforePublish="true"
            runtimeTypeId="org.apache.geronimo.generic.runtime.10"

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java?rev=368066&r1=368065&r2=368066&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/internal/GeronimoServerBehaviour.java
Wed Jan 11 09:25:44 2006
@@ -20,7 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.Timer;
 import java.util.TimerTask;
 
 import javax.enterprise.deploy.spi.TargetModuleID;
@@ -52,7 +51,7 @@
 
 public class GeronimoServerBehaviour extends GenericServerBehaviour {
 
-	private static final int MAX_TRIES = 15;
+	private static final int MAX_TRIES = 30;
 
 	private static final int TIMER_TASK_INTERVAL = 30;
 
@@ -62,9 +61,10 @@
 
 	public GeronimoServerBehaviour() {
 		super();
-		/*Timer timer = new Timer(true);
-		timer.schedule(new UpdateServerStateTask(), 0,
-				TIMER_TASK_INTERVAL * 1000);*/
+		/*
+		 * Timer timer = new Timer(true); timer.schedule(new
+		 * UpdateServerStateTask(), 0, TIMER_TASK_INTERVAL * 1000);
+		 */
 	}
 
 	/*
@@ -72,7 +72,7 @@
 	 * 
 	 * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#stop(boolean)
 	 */
-	public synchronized void stop(boolean force) {
+	public void stop(boolean force) {
 
 		if (getKernel() != null) {
 			// lets shutdown the kernel so shutdown messages are displayed in
@@ -126,7 +126,7 @@
 	 * 
 	 * @see org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour#setServerStarted()
 	 */
-	protected synchronized void setServerStarted() {
+	protected void setServerStarted() {
 		for (int tries = MAX_TRIES; tries > 0; tries--) {
 			try {
 				Thread.sleep(5000);
@@ -187,7 +187,7 @@
 		if (deltaKind != NO_CHANGE && module.length == 1) {
 			invokeCommand(deltaKind, module[0]);
 		}
-		
+
 		setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
 
 		Trace.trace(Trace.INFO, "<< publishModule()");
@@ -320,17 +320,23 @@
 					IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
 					existingPrgArgs);
 		}
+
+		Trace.trace(Trace.INFO, "VM_INSTALL_TYPE: " + workingCopy.getAttribute(
+				IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, ""));
+		Trace.trace(Trace.INFO, "VM_INSTALL_NAME: " + workingCopy.getAttribute(
+				IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, ""));
 	}
 
 	/**
 	 * This timer task runs at scheduled intervals to sync the server state if
 	 * the users controls the server instance outside of the eclipse workbench.
 	 * 
-	 * WTP manages the server process, and if the process is dead, the state is updated.
-	 * So the only scenario that needs to be considered is if the server is restarted.
+	 * WTP manages the server process, and if the process is dead, the state is
+	 * updated. So the only scenario that needs to be considered is if the
+	 * server is restarted.
 	 * 
-	 * FIXME When the server is stop the GeronimoServerBehavior instance is destroyed so
-	 * the task never runs to handle this scenario.
+	 * FIXME When the server is stop the GeronimoServerBehavior instance is
+	 * destroyed so the task never runs to handle this scenario.
 	 */
 	private class UpdateServerStateTask extends TimerTask {
 



Mime
View raw message