geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jawar...@apache.org
Subject svn commit: r953747 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Date Fri, 11 Jun 2010 16:02:05 GMT
Author: jawarner
Date: Fri Jun 11 16:02:05 2010
New Revision: 953747

URL: http://svn.apache.org/viewvc?rev=953747&view=rev
Log:
Revert previous quick fix that didn't actually fix anything and provide more permanent fix
for generating reports for web profile

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=953747&r1=953746&r2=953747&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
Fri Jun 11 16:02:05 2010
@@ -364,16 +364,6 @@ class Controller extends gbuild.system.P
         def targetDir = new File("target/results/$webcontainer").canonicalFile
         log.info "Target dir: $targetDir"
         
-        switch(webcontainer) {
-            case 'tomcat-web' :
-                webcontainer = 'tomcat'
-                break
-                
-            case 'jetty-web' :
-                webcontainer = 'jetty'
-                break
-        }
-        
         separator()
         
         ant.mkdir(dir: targetDir)
@@ -419,22 +409,11 @@ class Controller extends gbuild.system.P
         // Find all of the result archives
         def files
          
-        switch(webcontainer) {
-            case 'tomcat' :
-                files = ant.fileScanner {
-                    fileset(dir: sourceDir) {
-                        include(name: 'tomcat/runtests-results-*.zip')
-                    }
-                }
-                break
-            
-            case 'jetty' :
-                files = ant.fileScanner {
-                    fileset(dir: sourceDir) {
-                        include(name: 'jetty/runtests-results-*.zip')
-                    }
-                }
-                break
+         
+        files = ant.fileScanner {
+            fileset(dir: sourceDir) {
+                include(name: "${webcontainer}/runtests-results-*.zip")
+            }
         }
         
         def archives = []



Mime
View raw message