diff --git a/lib/groovy/lib/antlr-2.7.7.jar b/lib/groovy/lib/antlr-2.7.7.jar new file mode 100644 index 000000000000..5e5f14b35584 Binary files /dev/null and b/lib/groovy/lib/antlr-2.7.7.jar differ diff --git a/lib/groovy/lib/asm-4.0.jar b/lib/groovy/lib/asm-4.0.jar new file mode 100644 index 000000000000..cca0d9cebf10 Binary files /dev/null and b/lib/groovy/lib/asm-4.0.jar differ diff --git a/lib/groovy/lib/commons-cli-1.2.jar b/lib/groovy/lib/commons-cli-1.2.jar new file mode 100644 index 000000000000..ce4b9fffe40c Binary files /dev/null and b/lib/groovy/lib/commons-cli-1.2.jar differ diff --git a/lib/groovy/lib/groovy-2.0.6.jar b/lib/groovy/lib/groovy-2.0.6.jar new file mode 100644 index 000000000000..910843849be4 Binary files /dev/null and b/lib/groovy/lib/groovy-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-ant-2.0.6.jar b/lib/groovy/lib/groovy-ant-2.0.6.jar new file mode 100644 index 000000000000..a2d204f7c5fa Binary files /dev/null and b/lib/groovy/lib/groovy-ant-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-bsf-2.0.6.jar b/lib/groovy/lib/groovy-bsf-2.0.6.jar new file mode 100644 index 000000000000..10d7c3c3c97d Binary files /dev/null and b/lib/groovy/lib/groovy-bsf-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-console-2.0.6.jar b/lib/groovy/lib/groovy-console-2.0.6.jar new file mode 100644 index 000000000000..0fae580fc34c Binary files /dev/null and b/lib/groovy/lib/groovy-console-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-docgenerator-2.0.6.jar b/lib/groovy/lib/groovy-docgenerator-2.0.6.jar new file mode 100644 index 000000000000..dc3e85021692 Binary files /dev/null and b/lib/groovy/lib/groovy-docgenerator-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-groovysh-2.0.6.jar b/lib/groovy/lib/groovy-groovysh-2.0.6.jar new file mode 100644 index 000000000000..fb6a23f54ea6 Binary files /dev/null and b/lib/groovy/lib/groovy-groovysh-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-jmx-2.0.6.jar b/lib/groovy/lib/groovy-jmx-2.0.6.jar new file mode 100644 index 000000000000..dc073fc3eadc Binary files /dev/null and b/lib/groovy/lib/groovy-jmx-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-json-2.0.6.jar b/lib/groovy/lib/groovy-json-2.0.6.jar new file mode 100644 index 000000000000..daaa839e0e1a Binary files /dev/null and b/lib/groovy/lib/groovy-json-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-jsr223-2.0.6.jar b/lib/groovy/lib/groovy-jsr223-2.0.6.jar new file mode 100644 index 000000000000..e4fc98d655c7 Binary files /dev/null and b/lib/groovy/lib/groovy-jsr223-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-servlet-2.0.6.jar b/lib/groovy/lib/groovy-servlet-2.0.6.jar new file mode 100644 index 000000000000..719785c0d3c1 Binary files /dev/null and b/lib/groovy/lib/groovy-servlet-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-sql-2.0.6.jar b/lib/groovy/lib/groovy-sql-2.0.6.jar new file mode 100644 index 000000000000..ef16c5064240 Binary files /dev/null and b/lib/groovy/lib/groovy-sql-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-swing-2.0.6.jar b/lib/groovy/lib/groovy-swing-2.0.6.jar new file mode 100644 index 000000000000..8783c742689f Binary files /dev/null and b/lib/groovy/lib/groovy-swing-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-templates-2.0.6.jar b/lib/groovy/lib/groovy-templates-2.0.6.jar new file mode 100644 index 000000000000..87398cf82fc8 Binary files /dev/null and b/lib/groovy/lib/groovy-templates-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-test-2.0.6.jar b/lib/groovy/lib/groovy-test-2.0.6.jar new file mode 100644 index 000000000000..a62fa893334e Binary files /dev/null and b/lib/groovy/lib/groovy-test-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-testng-2.0.6.jar b/lib/groovy/lib/groovy-testng-2.0.6.jar new file mode 100644 index 000000000000..7e2ee813057e Binary files /dev/null and b/lib/groovy/lib/groovy-testng-2.0.6.jar differ diff --git a/lib/groovy/lib/groovy-xml-2.0.6.jar b/lib/groovy/lib/groovy-xml-2.0.6.jar new file mode 100644 index 000000000000..dd2f72d74f8e Binary files /dev/null and b/lib/groovy/lib/groovy-xml-2.0.6.jar differ diff --git a/lib/groovy/lib/jansi-1.6.jar b/lib/groovy/lib/jansi-1.6.jar new file mode 100644 index 000000000000..f558b6fdf25b Binary files /dev/null and b/lib/groovy/lib/jansi-1.6.jar differ diff --git a/lib/groovy/lib/jline-1.0.jar b/lib/groovy/lib/jline-1.0.jar new file mode 100644 index 000000000000..d25927961d42 Binary files /dev/null and b/lib/groovy/lib/jline-1.0.jar differ diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java index d1d65927cdde..58b672d1e153 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java @@ -27,9 +27,12 @@ import org.jetbrains.plugins.groovy.config.AbstractConfigUtils; import org.jetbrains.plugins.groovy.config.GroovyConfigUtils; import org.jetbrains.plugins.groovy.runner.DefaultGroovyScriptRunner; import org.jetbrains.plugins.groovy.runner.GroovyScriptRunConfiguration; +import org.jetbrains.plugins.groovy.runner.GroovyScriptRunner; import org.jetbrains.plugins.groovy.util.GroovyUtils; import org.jetbrains.plugins.groovy.util.LibrariesUtil; +import java.io.File; + /** * @author Sergey Evdokimov */ @@ -45,7 +48,19 @@ public class DefaultGroovyShellRunner extends GroovyShellRunner { @Override public JavaParameters createJavaParameters(@NotNull Module module) throws ExecutionException { JavaParameters res = GroovyScriptRunConfiguration.createJavaParametersWithSdk(module); - DefaultGroovyScriptRunner.configureGenericGroovyRunner(res, module, "org.codehaus.groovy.tools.shell.Main", !hasGroovyAll(module), true); + boolean useBundled = !hasGroovyAll(module); + DefaultGroovyScriptRunner.configureGenericGroovyRunner(res, module, "org.codehaus.groovy.tools.shell.Main", false, true); + if (useBundled) { + String parent = GroovyUtils.getBundledGroovyJar().getParent(); + String groovyHome = parent + File.separator + "groovy"; + File libDir = new File(groovyHome + File.separator + "lib"); + assert libDir.isDirectory(); + for (File file : libDir.listFiles()) { + res.getClassPath().add(file); + } + + GroovyScriptRunner.setGroovyHome(res, groovyHome); + } res.setWorkingDirectory(getWorkingDirectory(module)); return res; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java index 02f3bd36be12..5c724c2632f0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java @@ -79,7 +79,7 @@ public abstract class GroovyScriptRunner { } } - protected static void setGroovyHome(JavaParameters params, @NotNull String groovyHome) { + public static void setGroovyHome(JavaParameters params, @NotNull String groovyHome) { params.getVMParametersList().add("-Dgroovy.home=" + groovyHome); if (groovyHome.contains("grails")) { //a bit of a hack params.getVMParametersList().add("-Dgrails.home=" + groovyHome);