GRAILS-11129 - improve class path handling

Now if additional classpath is provided with something like this... grails -classpath /path/to/some/jar run-app That additional classpath will be used when forking a process.
grails · Jun 10, 2014 · a0872f8 · a0872f8
1 parent fe1cb6f
commit a0872f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy b/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
@@ -293,6 +293,10 @@ abstract class ForkedGrailsProcess {
                     GrailsConsole.instance.updateStatus("Running without daemon...")
                 }
                 String classpathString = getBoostrapClasspath(executionContext)
+                String additionalClasspath = System.getProperty('GRAILS_ADDITIONAL_CLASSPATH')
+                if(additionalClasspath) {
+                    classpathString = classpathString + File.pathSeparator + additionalClasspath
+                }
                 List<String> cmd = buildProcessCommand(executionContext, classpathString)
 
                 def processBuilder = new ProcessBuilder()

diff --git a/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/support/GrailsStarter.java b/grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/support/GrailsStarter.java
@@ -87,6 +87,7 @@ public static void rootLoader(String args[]) {
                     exit("classpath parameter needs argument");
                 }
                 lc.addClassPath(args[argsOffset + 1]);
+                System.setProperty("GRAILS_ADDITIONAL_CLASSPATH", args[argsOffset+1]);
                 argsOffset += 2;
             }
             else if (args[argsOffset].equals("--main")) {