[jbosstools-commits] JBoss Tools SVN: r32309 - in branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.

Author: rob.stryker(a)jboss.com Date: 2011-06-23 07:39:43 -0400 (Thu, 23 Jun 2011) New Revision: 32309 Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java Log: JBIDE-9236 - 6.1 starting errors for 3.2.2 m2 Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-06-23 02:44:40 UTC (rev 32308) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-06-23 11:39:43 UTC (rev 32309) @@ -29,7 +29,11 @@ import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.LIB; import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.NATIVE; import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.SERVER; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants.LOGGING_PROPERTIES; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.FILE_COLON; +import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.LOGGING_CONFIG_PROP; +import java.io.File; import java.util.HashMap; import org.eclipse.core.runtime.IPath; @@ -44,6 +48,8 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -91,6 +97,9 @@ } public String getDefaultRunVMArgs() { + File sysJar = new File(getRuntime().getLocation().toFile(), JBossServerType.AS.getSystemJarPath()); + String version = new ServerBeanLoader().getFullServerVersion(sysJar); + String name = getRuntime().getName(); String ret = QUOTE + SYSPROP + PROGRAM_NAME_ARG + EQ + "JBossTools: " + name + QUOTE + SPACE; //$NON-NLS-1$ @@ -116,6 +125,10 @@ ret += SYSPROP + JAVA_LIB_PATH + EQ + QUOTE + getRuntime().getLocation().append(BIN).append(NATIVE) + QUOTE + SPACE; + if( version.startsWith(IJBossToolingConstants.V6_1)) { + ret += SYSPROP + LOGGING_CONFIG_PROP + EQ + QUOTE + FILE_COLON + + getRuntime().getLocation().append(BIN).append(LOGGING_PROPERTIES) + QUOTE + SPACE; + } return ret; } Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2011-06-23 02:44:40 UTC (rev 32308) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeConstants.java 2011-06-23 11:39:43 UTC (rev 32309) @@ -16,6 +16,8 @@ public static final String SYSPROP = "-D";//$NON-NLS-1$ public static final String EQ = "="; //$NON-NLS-1$ public static final String QUOTE = "\""; //$NON-NLS-1$ + public static final String FILE_COLON = "file:"; //$NON-NLS-1$ + public static final String JBOSS_SERVER_HOME_DIR = "jboss.server.home.dir"; //$NON-NLS-1$ public static final String JBOSS_SERVER_HOME_URL = "jboss.server.base.url"; //$NON-NLS-1$ public static final String JBOSS_SERVER_BASE_DIR = "jboss.server.base.dir"; //$NON-NLS-1$ @@ -23,7 +25,7 @@ public static final String JBOSS_HOME_DIR = "jboss.home.dir"; //$NON-NLS-1$ public static final String ENDORSED_DIRS = "java.endorsed.dirs"; //$NON-NLS-1$ public static final String JAVA_LIB_PATH = "java.library.path"; //$NON-NLS-1$ - + public static final String LOGGING_CONFIG_PROP = "logging.configuration"; //$NON-NLS-1$ public static final String SHUTDOWN_SERVER_ARG = "-s";//$NON-NLS-1$ public static final String SHUTDOWN_USER_ARG = "-u";//$NON-NLS-1$ public static final String SHUTDOWN_PASS_ARG = "-p";//$NON-NLS-1$ Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-06-23 02:44:40 UTC (rev 32308) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-06-23 11:39:43 UTC (rev 32309) @@ -41,7 +41,7 @@ public static final String START_JAR = "run.jar"; //$NON-NLS-1$ public static final String TOOLS_JAR = "tools.jar"; //$NON-NLS-1$ public static final String JBOSS_MODULES_JAR = "jboss-modules.jar"; //$NON-NLS-1$ - + public static final String LOGGING_PROPERTIES = "logging.properties"; //$NON-NLS-1$ public static final String JSF_LIB = "jsf-libs"; //$NON-NLS-1$ public static final String JBOSSWEB_TOMCAT55_SAR = "jbossweb-tomcat55.sar"; //$NON-NLS-1$ public static final String JBOSSWEB_SAR = "jbossweb.sar"; //$NON-NLS-1$ Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-23 02:44:40 UTC (rev 32308) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-23 11:39:43 UTC (rev 32309) @@ -50,6 +50,7 @@ public static final String V5_0 = "5.0"; //$NON-NLS-1$ public static final String V5_1 = "5.1"; //$NON-NLS-1$ public static final String V6_0 = "6.0"; //$NON-NLS-1$ + public static final String V6_1 = "6.1"; //$NON-NLS-1$ public static final String V7_0 = "7.0"; //$NON-NLS-1$