Author: adietish Date: 2011-07-18 16:06:52 -0400 (Mon, 18 Jul 2011) New Revision: 33028 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RegExUtils.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java Log: [JBIDE-9215] translating paths to rse home dir Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RegExUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RegExUtils.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RegExUtils.java 2011-07-18 20:06:52 UTC (rev 33028) @@ -0,0 +1,16 @@ +package org.jboss.ide.eclipse.as.core.util; + +public class RegExUtils { + + public static String escapeRegex(String value) { + StringBuilder builder = new StringBuilder(); + for(char character : value.toCharArray()) { + if ('/' == character) { + builder.append('\\'); + } + builder.append(character); + } + return builder.toString(); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RegExUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-18 20:06:00 UTC (rev 33027) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-18 20:06:52 UTC (rev 33028) @@ -13,23 +13,23 @@ package org.jboss.ide.eclipse.as.rse.core; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; 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.JBossServerBehaviorUtils; import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; +import org.jboss.ide.eclipse.as.core.util.RegExUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate { @@ -75,37 +75,45 @@ private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException { /* - * -server -Xms64m -Xmx512m -XX:MaxPermSize=256m - * -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true - * -Dsun.rmi.dgc.client.gcInterval=3600000 - * -Dsun.rmi.dgc.server.gcInterval=3600000 - * -Dorg.jboss.boot.log.file=/home - * /adietish/jboss-runtimes/jboss-7.0.0.CR1/standalone/log/boot.log - * -Dlogging - * .configuration=file:/home/adietish/jboss-runtimes/jboss-7.0.0 - * .CR1/standalone/configuration/logging.properties -jar - * /home/adietish/jboss-runtimes/jboss-7.0.0.CR1/jboss-modules.jar - * (!!!!!!!!!MISSING) -mp - * /home/adietish/jboss-runtimes/jboss-7.0.0.CR1/modules -logmodule - * org.jboss.logmanager -jaxpmodule javax.xml.jaxp-provider - * org.jboss.as.standalone - * -Djboss.home.dir=/home/adietish/jboss-runtimes/jboss-7.0.0.CR1 - */ + * -server + * -Xms64m + * -Xmx512m + * -XX:MaxPermSize=256m + * -Djava.net.preferIPv4Stack=true + * -Dorg.jboss.resolver.warning=true + * -Dsun.rmi.dgc.client.gcInterval=3600000 + * -Dsun.rmi.dgc.server.gcInterval=3600000 + * -Djboss.modules.system.pkgs=org.jboss.byteman + * -Dorg.jboss.boot.log.file=/home/adietish/jboss-runtimes/jboss-as-web-7.0.0.Final/standalone/log/boot.log + * -Dlogging.configuration=file:/home/adietish/jboss-runtimes/jboss-as-web-7.0.0.Final/standalone/configuration/logging.properties + * -jar /home/adietish/jboss-runtimes/jboss-as-web-7.0.0.Final/jboss-modules.jar + * -mp /home/adietish/jboss-runtimes/jboss-as-web-7.0.0.Final/modules -logmodule org.jboss.logmanager + * -jaxpmodule javax.xml.jaxp-provider + * org.jboss.as.standalone + * -Djboss.home.dir=/home/adietish/jboss-runtimes/jboss-as-web-7.0.0.Final + */ + String serverId = JBossLaunchConfigProperties.getServerId(config); JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId); - String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer()); - String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$ - String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$ + String currentArgs = JBossLaunchConfigProperties.getProgramArguments(config); + String rseArgs = replaceLocalPath(currentArgs, jbossServer); + String currentVMArgs = JBossLaunchConfigProperties.getVMArguments(config); + String rseVMArgs = replaceLocalPath(currentVMArgs, jbossServer); String jarArg = LaunchConfigUtils.classpathUserClassesToString(config); - + String rseJarArg = replaceLocalPath(jarArg, jbossServer); + String cmd = "java " - + currentVMArgs - + " -classpath " - + new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append( - IJBossRuntimeResourceConstants.START_JAR).toString() - + " -jar " + jarArg + " " - + IJBossRuntimeConstants.SPACE + currentArgs + + rseVMArgs + + " -jar " + rseJarArg + " " + + IJBossRuntimeConstants.SPACE + rseArgs + "&"; return cmd; } + + private String replaceLocalPath(String value, JBossServer jbossServer) throws CoreException { + IPath localHome = ServerUtil.getServerHomePath(jbossServer); + String localHomeRegex = RegExUtils.escapeRegex(localHome.toOSString()); + String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer()); + return value.replaceAll(localHomeRegex, rseHome); + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2011-07-18 20:06:00 UTC (rev 33027) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2011-07-18 20:06:52 UTC (rev 33028) @@ -21,10 +21,12 @@ private String defaultLaunchCommand; private String defaultStopCommand; + private String rseHome; public RSELaunchConfigurator(String defaultLaunchCommand, String defaultStopCommand) throws CoreException { this.defaultLaunchCommand = defaultLaunchCommand; this.defaultStopCommand = defaultStopCommand; + this.rseHome = rseHome; } @Override