[Ogoglio-commits] SF.net SVN: ogoglio: [656] maven/trunk/ogoglio-appdev/src/main/java/com/ ogoglio/appdev/migrate/MigrationSupport.java

[<tre...@us...>]

Revision: 656
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=656&view=rev
Author:   trevorolio
Date:     2007-12-31 15:15:54 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
Fixed the rotted verification email setup.  Requires the following additions:

To TOMCAT/conf/server.xml add
<Resource name="mailSession" auth="Container" type="javax.mail.Session" mail.smtp.host="localhost" />
<Environment name="mailDirectory" value="/tmp/" type="java.lang.String"/>

To ~/.m2/settings.xml add
<ogoglio.mailDirectory>
   /tmp/
</ogoglio.mailDirectory>

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java	2007-12-31 23:15:48 UTC (rev 655)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/migrate/MigrationSupport.java	2007-12-31 23:15:54 UTC (rev 656)
@@ -195,21 +195,35 @@
             Log.error("Aborted destroying data after failure to upgrade");
             return false;
         }
+
         ps.loadPropertySet(PropStorage.BASIC_PROPS);
         String dir = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.mediaDirectory");
         if (dir == null) {
             Log.error("Can't find a property ogoglio.mediaDirectory to cleanse media store");
             return false;
         }
-        File store = new File(dir);
-        if ((!store.exists()) || (!store.canWrite())) {
+        if(!destroyFiles(new File(dir))){
             Log.error("Media directory doesn't exist or can't be changed:" + dir);
             return false;
         }
+
+        dir = ps.getKeyFromSet(PropStorage.BASIC_PROPS, "ogoglio.mailDirectory");
+        if (dir != null) {
+            destroyFiles(new File(dir));
+        }
+
+        return true;
+    }
+    
+    private boolean destroyFiles(File store){
+        if ((!store.exists()) || (!store.canWrite())) {
+            return false;
+        }
         File[] children = store.listFiles();
         for (int i = 0; i < children.length; ++i) {
             if (children[i].delete() != true) {
-                Log.error("Failed to delete media file:" + children[i].getAbsolutePath());
+                Log.error("Failed to delete file:" + children[i].getAbsolutePath());
+                return false;
             }
         }
         return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.