[jboss-cvs] JBossAS SVN: r108351 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/fungal and 2 other directories.

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

Author: jesper.pedersen
Date: 2010-09-25 10:37:19 -0400 (Sat, 25 Sep 2010)
New Revision: 108351

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
   projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
   projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
   projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployment.java
Log:
[JBJCA-431] Fungal 0.9.0.Beta1

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-09-25 14:00:03 UTC (rev 108350)
+++ projects/jboss-jca/trunk/build.xml	2010-09-25 14:37:19 UTC (rev 108351)
@@ -96,7 +96,7 @@
   <property name="version.dom4j" value="1.6.1"/>
   <property name="version.mockito" value="1.8.5"/>
   <property name="version.eclipse.ecj" value="3.5.1"/>
-  <property name="version.fungal" value="0.8.0"/>
+  <property name="version.fungal" value="0.9.0.Beta1"/>
   <property name="version.h2" value="1.2.143"/>
   <property name="version.hibernate-validator" value="4.1.0.Final"/>
   <property name="version.javassist" value="3.12.0.GA"/>

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java	2010-09-25 14:00:03 UTC (rev 108350)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java	2010-09-25 14:37:19 UTC (rev 108351)
@@ -207,7 +207,7 @@
          try
          {
             FileUtil fu = new FileUtil();
-            fu.recursiveDelete(tmpDirectory);
+            fu.delete(tmpDirectory);
          }
          catch (IOException ioe)
          {

Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java	2010-09-25 14:00:03 UTC (rev 108350)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java	2010-09-25 14:37:19 UTC (rev 108351)
@@ -159,8 +159,11 @@
       }
       else
       {
-         System.out.println(o.toString());
-         t.printStackTrace(System.out);
+         if (o != null)
+            System.out.println(o.toString());
+
+         if (t != null)
+            t.printStackTrace(System.out);
       }
    }
 
@@ -186,7 +189,8 @@
       }
       else
       {
-         System.out.println(o.toString());
+         if (o != null)
+            System.out.println(o.toString());
       }
    }
 
@@ -212,7 +216,8 @@
       }
       else
       {
-         System.out.println(o.toString());
+         if (o != null)
+            System.out.println(o.toString());
       }
    }
 
@@ -261,7 +266,8 @@
       }
       else
       {
-         System.out.println(o.toString());
+         if (o != null)
+            System.out.println(o.toString());
       }
    }
 

Modified: projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
===================================================================
--- projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java	2010-09-25 14:00:03 UTC (rev 108350)
+++ projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java	2010-09-25 14:37:19 UTC (rev 108351)
@@ -132,7 +132,7 @@
          if (tmpDeployment.exists())
          {
             FileUtil fileUtil = new FileUtil();
-            fileUtil.recursiveDelete(tmpDeployment);
+            fileUtil.delete(tmpDeployment);
          }
 
          if (!tmpDeployment.mkdirs())

Modified: projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployment.java
===================================================================
--- projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployment.java	2010-09-25 14:00:03 UTC (rev 108350)
+++ projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployment.java	2010-09-25 14:37:19 UTC (rev 108351)
@@ -126,7 +126,7 @@
          try
          {
             FileUtil fu = new FileUtil();
-            fu.recursiveDelete(tmpDirectory);
+            fu.delete(tmpDirectory);
          }
          catch (IOException ioe)
          {