geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jawar...@apache.org
Subject svn commit: r948839 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS: Controller.groovy report/ReportGenerator.groovy
Date Thu, 27 May 2010 13:55:25 GMT
Author: jawarner
Date: Thu May 27 13:55:25 2010
New Revision: 948839

URL: http://svn.apache.org/viewvc?rev=948839&view=rev
Log:
Update report generation methods to handle the web profile.

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.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=948839&r1=948838&r2=948839&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
Thu May 27 13:55:25 2010
@@ -397,6 +397,7 @@ class Controller extends gbuild.system.P
     
     def generateReport = {
         def webcontainer = params.require('webcontainer')
+        def javaeeLevel = params.require('javaee.level')
     
         def sourceDir = new File("target/results").canonicalFile
         log.info "Source dir: $sourceDir"
@@ -439,7 +440,7 @@ class Controller extends gbuild.system.P
         
         separator()
         
-        new ReportGenerator(archives, targetDir).generate()
+        new ReportGenerator(archives, targetDir, javaeeLevel).generate()
         
         separator()
     }

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy?rev=948839&r1=948838&r2=948839&view=diff
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy
Thu May 27 13:55:25 2010
@@ -47,9 +47,12 @@ class ReportGenerator extends LogSupport
     
     File targetDir
     
-    def ReportGenerator(List archives, File targetDir) {
+    String webLevel
+    
+    def ReportGenerator(List archives, File targetDir, String javaeeLevel) {
         this.archives = archives
         this.targetDir = targetDir
+        this.javaeeLevel = javaeeLevel
         
         assert archives.size() > 0
         
@@ -162,7 +165,14 @@ class ReportGenerator extends LogSupport
         
         // Load the iterations.xml configuration so we can use that for rendering
         def iterConfigurator = new IterationConfigurator()
-        iterConfigurator.configFile = 'tck-testsuite/iterations.xml'
+        if (javaeeLevel.equals('web')) {
+            iterConfigurator.configFile = 'tck-testsuite/iterations-web.xml'
+        }
+        
+        if (javaeeLevel.equals('full')) {
+            iterConfigurator.configFile = 'tck-testsuite/iterations.xml'
+        }
+        
         def iterConfig = iterConfigurator.loadConfig()
         
         archives.each { archive ->



Mime
View raw message