[jbosstools-commits] JBoss Tools SVN: r22694 - branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2010-06-09 04:09:19 -0400 (Wed, 09 Jun 2010)
New Revision: 22694

Modified:
   branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
Log:
JBIDE-6297 - 3.1.2 branch

Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java	2010-06-09 08:04:51 UTC (rev 22693)
+++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java	2010-06-09 08:09:19 UTC (rev 22694)
@@ -35,6 +35,7 @@
 import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
 import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
 import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
 
 
 public class StopLaunchConfiguration extends AbstractJBossLaunchConfigType {
@@ -99,8 +100,17 @@
 
 	public static String getDefaultArgs(JBossServer jbs) throws CoreException {
 		IJBossRuntimeConstants c = new IJBossRuntimeConstants() {};
+		IJBossToolingConstants tc = new IJBossToolingConstants() {};
+		
+		String runtimeTypeId = jbs.getRuntime().getRuntime().getRuntimeType().getId();
+		String serverUrl;
+		if (runtimeTypeId.equals(tc.AS_60)){
+			serverUrl = "service:jmx:rmi:///jndi/rmi://" + jbs.getHost() + ":" + 1090 + "/jmxrmi"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		} else {
+			serverUrl = jbs.getHost() + ":" + jbs.getJNDIPort(); //$NON-NLS-1$
+		}
 		String args = c.SHUTDOWN_STOP_ARG + c.SPACE;
-		args += c.SHUTDOWN_SERVER_ARG + c.SPACE + jbs.getHost() + ":" + jbs.getJNDIPort() + c.SPACE; //$NON-NLS-1$
+		args += c.SHUTDOWN_SERVER_ARG + c.SPACE + serverUrl + c.SPACE;
 		if( jbs.getUsername() != null && !jbs.getUsername().equals(""))  //$NON-NLS-1$
 			args += c.SHUTDOWN_USER_ARG + c.SPACE + jbs.getUsername() + c.SPACE;
 		if( jbs.getPassword() != null && !jbs.getUsername().equals(""))  //$NON-NLS-1$