[jbosstools-commits] JBoss Tools SVN: r39086 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
Author: rob.stryker(a)jboss.com
Date: 2012-02-24 01:05:38 -0500 (Fri, 24 Feb 2012)
New Revision: 39086
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
Log:
JBIDE-10342 commit to trunk
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2012-02-24
04:35:14 UTC (rev 39085)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2012-02-24
06:05:38 UTC (rev 39086)
@@ -117,4 +117,7 @@
public static final String DESCRIPTOR_CONNECTOR = "META-INF/ra.xml";
//$NON-NLS-1$
public static final String JBOSS_AS = "JBOSS_AS"; //$NON-NLS-1$
public static final String JBOSS_AS_EAP_DIRECTORY = "jboss-as";
//$NON-NLS-1$
+
+ public static final String AS_70_MANAGEMENT_SCRIPT = "jboss-admin.sh";
//$NON-NLS-1$
+ public static final String AS_71_MANAGEMENT_SCRIPT = "jboss-cli.sh";
//$NON-NLS-1$
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-02-24
04:35:14 UTC (rev 39085)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-02-24
06:05:38 UTC (rev 39086)
@@ -15,12 +15,14 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
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;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -56,8 +58,16 @@
protected String getShutdownCommand(JBossServer jbossServer, IJBossServerRuntime
jbossRuntime) throws CoreException {
String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer());
IPath p = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN);
- return p.toString() + "/jboss-admin.sh --connect command=:shutdown";
+ return p.toString() + "/" + getManagementScript(jbossServer) + "
--connect command=:shutdown";
}
+
+ protected String getManagementScript(JBossServer server) {
+ IServerType type = server.getServer().getServerType();
+ if( type.getId().equals(IJBossToolingConstants.SERVER_AS_71) ||
type.getId().equals(IJBossToolingConstants.SERVER_EAP_60)) {
+ return IJBossRuntimeResourceConstants.AS_71_MANAGEMENT_SCRIPT;
+ }
+ return IJBossRuntimeResourceConstants.AS_70_MANAGEMENT_SCRIPT;
+ }
protected String getLaunchCommand(JBossServer jbossServer, IJBossServerRuntime
jbossRuntime) throws CoreException {
String programArguments = getDefaultProgramArguments(jbossServer, jbossRuntime);