MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-84141 Starting Groovy Shell throws a NoClassDefFoundError if pom.xml references groovy as dependency

Browse Source
This commit is contained in:
peter
2012-04-11 12:03:43 +02:00
parent 60f455c7ff
commit 0bc97aae2f
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java
+12 -3
View File
@@ -21,6 +21,8 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.PathsList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.config.AbstractConfigUtils;
@@ -46,13 +48,13 @@ public class DefaultGroovyShellRunner extends GroovyShellRunner {
@Override
public JavaParameters createJavaParameters(@NotNull Module module) throws ExecutionException {
JavaParameters res = GroovyScriptRunConfiguration.createJavaParametersWithSdk(module);
DefaultGroovyScriptRunner.configureGenericGroovyRunner(res, module, "groovy.ui.GroovyMain", true);
DefaultGroovyScriptRunner.configureGenericGroovyRunner(res, module, "groovy.ui.GroovyMain", !hasGroovyAll(module));
PathsList list = GroovyScriptRunner.getClassPathFromRootModel(module, true, res, true);
if (list != null) {
res.getClassPath().addAll(list.getPathList());
}
res.getProgramParametersList().addAll("-p", GroovyScriptRunner.getPathInConf("console.txt"));
//javaParameters.getVMParametersList().add("-Xdebug"); javaParameters.getVMParametersList().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5239");
//res.getVMParametersList().add("-Xdebug"); res.getVMParametersList().add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5239");
res.setWorkingDirectory(getWorkingDirectory(module));
return res;
@@ -69,7 +71,7 @@ public class DefaultGroovyShellRunner extends GroovyShellRunner {
public String getTitle(@NotNull Module module) {
String homePath = LibrariesUtil.getGroovyHomePath(module);
boolean bundled = false;
if (homePath == null) {
if (homePath == null || !hasGroovyAll(module)) {
homePath = GroovyUtils.getBundledGroovyJar().getParentFile().getParent();
bundled = true;
}
@@ -77,6 +79,13 @@ public class DefaultGroovyShellRunner extends GroovyShellRunner {
return version == AbstractConfigUtils.UNDEFINED_VERSION ? "" : " (" + (bundled ? "Bundled " : "") + "Groovy " + version + ")";
}
private static boolean hasGroovyAll(Module module) {
GlobalSearchScope scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module);
JavaPsiFacade facade = JavaPsiFacade.getInstance(module.getProject());
return facade.findClass("org.apache.commons.cli.CommandLineParser", scope) != null &&
facade.findClass("groovy.ui.GroovyMain", scope) != null;
}
@NotNull
@Override
public String transformUserInput(@NotNull String userInput) {
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java
+6 -7
View File
@@ -81,21 +81,20 @@ public class DefaultGroovyScriptRunner extends GroovyScriptRunner {
params.getProgramParametersList().addParametersString(configuration.getScriptParameters());
}
public static void configureGenericGroovyRunner(@NotNull JavaParameters params, @NotNull Module module, @NotNull String mainClass, boolean mayUseBundled) {
public static void configureGenericGroovyRunner(@NotNull JavaParameters params, @NotNull Module module, @NotNull String mainClass, boolean useBundled) {
final VirtualFile groovyJar = findGroovyJar(module);
if (groovyJar != null) {
params.getClassPath().add(groovyJar);
} else if (mayUseBundled) {
if (useBundled) {
params.getClassPath().add(GroovyUtils.getBundledGroovyJar());
}
else if (groovyJar != null) {
params.getClassPath().add(groovyJar);
}
setToolsJar(params);
String groovyHome = LibrariesUtil.getGroovyHomePath(module);
String groovyHome = useBundled ? FileUtil.toCanonicalPath(GroovyUtils.getBundledGroovyJar().getParentFile().getParent()) : LibrariesUtil.getGroovyHomePath(module);
if (groovyHome != null) {
groovyHome = FileUtil.toSystemDependentName(groovyHome);
} else if (mayUseBundled) {
groovyHome = FileUtil.toCanonicalPath(GroovyUtils.getBundledGroovyJar().getParentFile().getParent());
}
setGroovyHome(params, groovyHome);