geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r506889 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild: config/projects/Geronimo_CTS/Controller.groovy system/library/Library.groovy system/library/LibraryManager.groovy
Date Tue, 13 Feb 2007 06:59:17 GMT
Author: jdillon
Date: Mon Feb 12 22:59:16 2007
New Revision: 506889

URL: http://svn.apache.org/viewvc?view=rev&rev=506889
Log:
Dropped getLibraryAsCopy, instead allow copy() to take any object and convert that to a file

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/system/library/Library.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.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?view=diff&rev=506889&r1=506888&r2=506889
==============================================================================
--- 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
Mon Feb 12 22:59:16 2007
@@ -203,8 +203,8 @@
         // Fetch the required libraries and make copies (prevent unwanted side-effects)
         def baseURL = 'https://gbuild.org/repos/libraries'
         
-        LibraryManager.getLibraryAsCopy(baseURL, 'j2ee14-tck', '1.4.1b', 'target/tck')
-        LibraryManager.getLibraryAsCopy(baseURL, 'j2ee14-ri', '1.4.1-b05', 'target/ri')
+        LibraryManager.getLibrary(baseURL, 'j2ee14-tck', '1.4.1b').copy('target/tck')
+        LibraryManager.getLibrary(baseURL, 'j2ee14-ri', '1.4.1-b05').copy('target/ri')
         
         //
         // TODO: Need to update Maven's settings.xml to pick up these locations, or perhaps

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy?view=diff&rev=506889&r1=506888&r2=506889
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
Mon Feb 12 22:59:16 2007
@@ -211,8 +211,10 @@
     /**
      * Make a copy of the library somewhere.
      */
-    Library copy(File targetDir, String perms) {
-        assert targetDir
+    Library copy(targetPath, String perms) {
+        assert targetPath
+        
+        def targetDir = new File(targetPath).canonicalFile
         
         log.info "Copying library to: $targetDir; w/perms: $perms"
         
@@ -245,8 +247,8 @@
     /**
      * Make a read-write copy of the library somewhere.
      */
-    Library copy(File dir) {
-        return copy(dir, 'u+rw')
+    Library copy(targetPath) {
+        return copy(targetPath, 'u+rw')
     }
 }
 

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy?view=diff&rev=506889&r1=506888&r2=506889
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/LibraryManager.groovy
Mon Feb 12 22:59:16 2007
@@ -78,15 +78,5 @@
         
         return lib
     }
-    
-    static Library getLibraryAsCopy(String baseURL, String name, version, String targetPath)
{
-        assert targetPath
-        
-        def lib = getLibrary(baseURL, name, version)
-        
-        def targetDir = new File(targetPath).canonicalFile
-        
-        return lib.copy(targetDir)
-    }
 }
 



Mime
View raw message