svn commit: r948505 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy

[ja...@apache.org]

Author: jawarner
Date: Wed May 26 17:18:58 2010
New Revision: 948505

URL: http://svn.apache.org/viewvc?rev=948505&view=rev
Log:
Update runtests method to handle both javaee5 and javaee6

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?rev=948505&r1=948504&r2=948505&view=diff
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy Wed May 26 17:18:58 2010
@@ -178,13 +178,32 @@ class Controller extends gbuild.system.P
             
             // Refresh the server installation for sanity
             args << '--refresh'
-        }    
+        }   
         
-        def javaeeCtsHome = params.require('javaee5.cts.home')
-        args << "-Djavaee5.cts.home=$javaeeCtsHome"
+        if (params.get('javaee5.cts.home') != null) {
+            def javaeeCtsHome = params.get('javaee5.cts.home')
+            args << "-Djavaee5.cts.home=$javaeeCtsHome"
+        }
+        
+        if (params.get('javaee5.ri.home') != null) {
+            def javaeeRiHome = params.get('javaee5.ri.home')
+            args << "-Djavaee5.ri.home=$javaeeRiHome"
+        }
+        
+        if (params.get('javaee6.cts.home') != null) {
+            def javaeeCtsHome = params.get('javaee6.cts.home')
+            args << "-Djavaee6.cts.home=$javaeeCtsHome"
+        }
+        
+        if (params.get('javaee6.ri.home') != null) {
+            def javaeeRiHome = params.get('javaee6.ri.home')
+            args << "-Djavaee6.ri.home=$javaeeRiHome"
+        }
         
-        def javaeeRiHome = params.require('javaee5.ri.home')
-        args << "-Djavaee5.ri.home=$javaeeRiHome"
+        if (params.get('javaee.level') != null) {
+            def javaeeLevel = params.get('javaee.level')
+            args << "-Djavaee.level=$javaeeLevel"
+        }
         
         def localRepo = params.require('maven.repo.local')
         args << "-Dmaven.repo.local=$localRepo"