honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix optional default script loading 

Groovy is optional as a dependency in the classpath, make sure we properly detect when its not at the right time to disable it
closes #6582
This commit is contained in:
Shay Banon 2014-06-21 00:17:08 +02:00
parent 812972ab0e
commit 0d66d3779e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/elasticsearch/script/ScriptModule.java
View File

@ -80,21 +80,24 @@ public class ScriptModule extends AbstractModule {
multibinder.addBinding().to(NativeScriptEngineService.class);
try {
settings.getClassLoader().loadClass("groovy.lang.GroovyClassLoader");
multibinder.addBinding().to(GroovyScriptEngineService.class);
} catch (Throwable t) {
Loggers.getLogger(GroovyScriptEngineService.class).debug("failed to load groovy", t);
Loggers.getLogger(ScriptService.class, settings).debug("failed to load groovy", t);
}
try {
settings.getClassLoader().loadClass("org.mvel2.MVEL");
multibinder.addBinding().to(MvelScriptEngineService.class);
} catch (Throwable t) {
Loggers.getLogger(MvelScriptEngineService.class).debug("failed to load mvel", t);
Loggers.getLogger(ScriptService.class, settings).debug("failed to load mvel", t);
}
try {
settings.getClassLoader().loadClass("com.github.mustachejava.Mustache");
multibinder.addBinding().to(MustacheScriptEngineService.class);
} catch (Throwable t) {
Loggers.getLogger(MustacheScriptEngineService.class).debug("failed to load mustache", t);
Loggers.getLogger(ScriptService.class, settings).debug("failed to load mustache", t);
}
for (Class<? extends ScriptEngineService> scriptEngine : scriptEngines) {