groovy work

Author: paul-hammant

booter/pom.xml

@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>1.8.9</version>
+      <version>2.4.16</version>
       <scope>integration-test</scope>
     </dependency>
     <dependency>

script/script-core/src/java/org/picocontainer/script/ScriptedContainerBuilder.java

@@ -96,6 +96,10 @@ public int read() throws IOException {
         return scriptURL.openStream();
     }
 
+    protected final URL getScriptURL() throws IOException{
+        return scriptURL;
+    }
+
     protected final Reader getScriptReader() throws IOException{
         if ( scriptReader != null ){
             return scriptReader;

script/script-groovy/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <version>1.8.9</version>
+      <version>2.4.16</version>
       <exclusions>
 		  <exclusion>
 			  <groupId>junit</groupId>

script/script-groovy/src/java/org/picocontainer/script/groovy/GroovyContainerBuilder.java

@@ -102,8 +102,7 @@ protected void handleBinding(Binding binding) {
     private void createGroovyClass() {
         try {
             GroovyClassLoader loader = new GroovyClassLoader(getClassLoader());
-            InputStream scriptIs = getScriptInputStream();
-            GroovyCodeSource groovyCodeSource = new GroovyCodeSource(scriptIs, "picocontainer.groovy","groovyGeneratedForPicoContainer");
+            GroovyCodeSource groovyCodeSource = new GroovyCodeSource(super.getScriptURL());
             scriptClass = loader.parseClass(groovyCodeSource);
         } catch (CompilationFailedException e) {
             throw new GroovyCompilationException("Compilation Failed '" + e.getMessage() + "'", e);