[izpack-changes] r1492 - in izpack-src/trunk: . src/lib/com/izforge/izpack/event

[noreply at berlios.de]

Author: bartzkau
Date: 2006-07-18 10:06:45 +0200 (Tue, 18 Jul 2006)
New Revision: 1492

Modified:
   izpack-src/trunk/Thanks.txt
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/event/AntAction.java
Log:
Bugfix logfile creation.


Modified: izpack-src/trunk/Thanks.txt
===================================================================
--- izpack-src/trunk/Thanks.txt	2006-07-16 03:16:43 UTC (rev 1491)
+++ izpack-src/trunk/Thanks.txt	2006-07-18 08:06:45 UTC (rev 1492)
@@ -103,4 +103,6 @@
 - Oliver Kiddle: for the patches and fixes
 - Julian Payne: for the patch on WebAccessor
 - Hal Vaughan: for the patches
-- Ryan Shillington: for the patches
\ No newline at end of file
+- Eric Rose: for the patch related to the logfile of AntActions.
+- Ryan Shillington: for the patches
+

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2006-07-16 03:16:43 UTC (rev 1491)
+++ izpack-src/trunk/Versions.txt	2006-07-18 08:06:45 UTC (rev 1492)
@@ -21,6 +21,7 @@
 - Configurable heading panel added to InstallerFrame (Klaus Bartz).
 - Panels counter (text or progressbar) useable in the heading or 
   navigation panel (Klaus Bartz).
+- Fixed logfile for AntActions (Eric Rose).
 - PacksPanels: fixed disk space requirements (Ryan Shillington, via Julien
   Ponge).
 - Compiler fix (Ryan Shillington, via Julien Ponge).

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/event/AntAction.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/event/AntAction.java	2006-07-16 03:16:43 UTC (rev 1491)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/event/AntAction.java	2006-07-18 08:06:45 UTC (rev 1492)
@@ -24,6 +24,8 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -396,8 +398,26 @@
         else if (quiet) msgOutputLevel = 1;
         BuildLogger logger = new DefaultLogger();
         logger.setMessageOutputLevel(msgOutputLevel);
-        logger.setOutputPrintStream(System.out);
-        logger.setErrorPrintStream(System.err);
+        if (logFile != null)
+        {
+            PrintStream printStream;
+            try
+            {
+                printStream = new PrintStream(new FileOutputStream(logFile));
+                logger.setOutputPrintStream(printStream);
+                logger.setErrorPrintStream(printStream);
+            }
+            catch (FileNotFoundException e)
+            {
+                logger.setOutputPrintStream(System.out);
+                logger.setErrorPrintStream(System.err);
+            }
+        }
+        else
+        {
+            logger.setOutputPrintStream(System.out);
+            logger.setErrorPrintStream(System.err);
+        }
         return logger;
     }