Author: koen.aers(a)jboss.com Date: 2012-04-27 03:24:22 -0400 (Fri, 27 Apr 2012) New Revision: 40537 Added: trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.m2e.core.prefs Modified: trunk/forge/plugins/org.jboss.tools.forge.core/.classpath trunk/forge/plugins/org.jboss.tools.forge.core/.project trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.jdt.core.prefs trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java Log: JBIDE-11685: Forge doesn't start on windows Modified: trunk/forge/plugins/org.jboss.tools.forge.core/.classpath =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/.classpath 2012-04-27 00:29:16 UTC (rev 40536) +++ trunk/forge/plugins/org.jboss.tools.forge.core/.classpath 2012-04-27 07:24:22 UTC (rev 40537) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/forge/plugins/org.jboss.tools.forge.core/.project =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/.project 2012-04-27 00:29:16 UTC (rev 40536) +++ trunk/forge/plugins/org.jboss.tools.forge.core/.project 2012-04-27 07:24:22 UTC (rev 40537) @@ -20,8 +20,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> Modified: trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.jdt.core.prefs 2012-04-27 00:29:16 UTC (rev 40536) +++ trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.jdt.core.prefs 2012-04-27 07:24:22 UTC (rev 40537) @@ -1,4 +1,3 @@ -#Tue May 31 15:58:07 CEST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 Added: trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.m2e.core.prefs 2012-04-27 07:24:22 UTC (rev 40537) @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Property changes on: trunk/forge/plugins/org.jboss.tools.forge.core/.settings/org.eclipse.m2e.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2012-04-27 00:29:16 UTC (rev 40536) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeEmbeddedRuntime.java 2012-04-27 07:24:22 UTC (rev 40537) @@ -1,5 +1,6 @@ package org.jboss.tools.forge.core.process; +import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; @@ -11,21 +12,33 @@ public static final ForgeRuntime INSTANCE = new ForgeEmbeddedRuntime(); private ForgeEmbeddedRuntime() {} + + private String location = null; @Override public final String getName() { return "embedded"; } - + @Override public String getLocation() { - String result = null; + if (location == null) { + initLocation(); + } + return location; + } + + private void initLocation() { try { - result = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")).getAbsolutePath(); + File file = FileLocator.getBundleFile(Platform.getBundle("org.jboss.tools.forge.runtime")); + for (String str : file.list()) { + if (str.startsWith("forge-distribution-")) { + location = file.getAbsolutePath() + File.separator + str; + } + } } catch (IOException e) { ForgeCorePlugin.log(e); } - return result; } @Override Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2012-04-27 00:29:16 UTC (rev 40536) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeLaunchHelper.java 2012-04-27 07:24:22 UTC (rev 40537) @@ -144,7 +144,7 @@ } private static String getClassPathArgument(String location) { - return "-cp " + encloseWithDoubleQuotesIfNeeded(location + "/jboss-modules.jar"); + return "-cp " + encloseWithDoubleQuotesIfNeeded(location + File.separator + "jboss-modules.jar"); } }