[jboss-cvs] JBossAS SVN: r70200 - in projects/ejb3/trunk/installer: src/main/java/org/jboss/ejb3/installer and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-02-28 00:20:25 -0500 (Thu, 28 Feb 2008)
New Revision: 70200

Modified:
   projects/ejb3/trunk/installer/pom.xml
   projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
Log:
Don't write your own recursive function when JDK does it for you, dummy.

Modified: projects/ejb3/trunk/installer/pom.xml
===================================================================
--- projects/ejb3/trunk/installer/pom.xml	2008-02-28 04:44:19 UTC (rev 70199)
+++ projects/ejb3/trunk/installer/pom.xml	2008-02-28 05:20:25 UTC (rev 70200)
@@ -39,11 +39,14 @@
 
   <!-- Dependencies -->
   <dependencies>
+  
+    <!-- Ant Contrib -->
     <dependency>
       <groupId>ant-contrib</groupId>
       <artifactId>ant-contrib</artifactId>
       <version>${version.ant-contrib:ant-contrib}</version>
     </dependency>
+    
   </dependencies>
 
 </project>
\ No newline at end of file

Modified: projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
===================================================================
--- projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-02-28 04:44:19 UTC (rev 70199)
+++ projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-02-28 05:20:25 UTC (rev 70200)
@@ -476,20 +476,18 @@
     */
    private void mkdirAndParents(File directory)
    {
-      // If parent doesn't exist
-      if (!directory.getParentFile().exists())
+      try
       {
-         // Create the parent
-         this.mkdirAndParents(directory.getParentFile());
+         if (!directory.mkdirs())
+         {
+            throw new IOException("Could not make directory " + directory.toString());
+         }
       }
-
-      // If this directory doesn't exist
-      if (!directory.exists())
+      catch (IOException e)
       {
-         // Make the directory
-         directory.mkdir();
-         this.getPrintStream().println("Created Directory " + directory.getAbsolutePath());
+         throw new RuntimeException(e);
       }
+
    }
 
    /**
@@ -525,7 +523,7 @@
          // Uncomment to log for debugging
          //this.getPrintStream().println(file.getAbsolutePath() + " Removed.");
       }
-      else if(removed)
+      else if (removed)
       {
          // Removed a file, do nothing (too verbose to log here)
       }