Author: rob.stryker(a)jboss.com
Date: 2012-02-24 05:22:41 -0500 (Fri, 24 Feb 2012)
New Revision: 39099
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
Log:
JBIDE-10342 to beta1 branch
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2012-02-24
10:14:22 UTC (rev 39098)
+++
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2012-02-24
10:22:41 UTC (rev 39099)
@@ -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:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-02-24
10:14:22 UTC (rev 39098)
+++
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-02-24
10:22:41 UTC (rev 39099)
@@ -15,11 +15,15 @@
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;
/**
@@ -54,11 +58,25 @@
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);
+ if( LaunchCommandPreferences.listensOnAllHosts(jbossServer.getServer())) {
+ programArguments = ArgsUtil.setArg(programArguments,
+ IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
+ null, "0.0.0.0");
+ }
+
String vmArguments = getDefaultVMArguments(jbossServer, jbossRuntime);
String jar = getJar(jbossServer, jbossRuntime);