geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
Subject Re: svn commit: r1096951 [6/6] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/ framework/assemblies/geronimo-framework/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/ framework/buildsupport/car-maven-plu...
Date Sat, 20 Aug 2011 00:27:08 GMT
I'm not sure how this got removed, but this is in what turned into the 3.0-osgi branch, not
current trunk.  I guess I should investigate since I've been working with that code some more....

david jencks

On Aug 19, 2011, at 4:50 PM, David Blevins wrote:

> David,
> 
> Any info on why this was removed?  Guessing it was just a side effect of a merge.
> 
> (related jira https://issues.apache.org/jira/browse/GERONIMO-5888)
> 
> 
> -David
> 
> On Apr 26, 2011, at 4:19 PM, djencks@apache.org wrote:
> 
>> Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1096951&r1=1096950&r2=1096951&view=diff
>> ==============================================================================
>> --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
(original)
>> +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java
Tue Apr 26 23:18:49 2011
>> @@ -30,7 +30,6 @@ import java.io.OutputStream;
>> import java.io.OutputStreamWriter;
>> import java.net.MalformedURLException;
>> import java.net.URL;
>> -import java.util.ArrayList;
>> import java.util.Collection;
>> import java.util.Collections;
>> import java.util.Enumeration;
>> @@ -38,7 +37,6 @@ import java.util.HashMap;
>> import java.util.LinkedHashMap;
>> import java.util.LinkedHashSet;
>> import java.util.LinkedList;
>> -import java.util.List;
>> import java.util.Map;
>> import java.util.Set;
>> import java.util.jar.JarFile;
>> @@ -83,7 +81,6 @@ public class FileUtils {
>>        File tempDir = File.createTempFile("geronimo-fileutils", ".tmpdir");
>>        tempDir.delete();
>>        tempDir.mkdirs();
>> -        deleteOnExit(tempDir);
>>        return tempDir;
>>    }
>> 
>> @@ -412,37 +409,4 @@ public class FileUtils {
>> 
>>    private FileUtils() {
>>    }
>> -
>> -    // Shutdown hook for recurssive delete on tmp directories
>> -    static final List<String> delete = new ArrayList<String>();
>> -
>> -    static {
>> -        Runtime.getRuntime().addShutdownHook(new Thread(){
>> -            @Override
>> -            public void run() {
>> -                delete();
>> -            }
>> -        });
>> -    }
>> -
>> -    private static void deleteOnExit(File file) {
>> -        delete.add(file.getAbsolutePath());
>> -    }
>> -
>> -    private static void delete() {
>> -        for (String path : delete) {
>> -            delete(new File(path));
>> -        }
>> -    }
>> -
>> -    private static void delete(File file) {
>> -        if (file.isDirectory()) {
>> -            for (File f : file.listFiles()) {
>> -                delete(f);
>> -            }
>> -        }
>> -
>> -        file.delete();
>> -    }
>> -
>> }
>> 
> 


Mime
View raw message