[jboss-svn-commits] JBoss Portal SVN: r5251 - in trunk: common/src/main/org/jboss/portal/common/ant tools/lib

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

Author: julien at jboss.com
Date: 2006-09-25 17:46:12 -0400 (Mon, 25 Sep 2006)
New Revision: 5251

Modified:
   trunk/common/src/main/org/jboss/portal/common/ant/Explode.java
   trunk/common/src/main/org/jboss/portal/common/ant/Implode.java
   trunk/tools/lib/explode.jar
Log:
implode/explode cannot use Tools

Modified: trunk/common/src/main/org/jboss/portal/common/ant/Explode.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/ant/Explode.java	2006-09-25 21:27:23 UTC (rev 5250)
+++ trunk/common/src/main/org/jboss/portal/common/ant/Explode.java	2006-09-25 21:46:12 UTC (rev 5251)
@@ -23,15 +23,21 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
-import org.jboss.portal.common.util.Tools;
 
-import java.io.*;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.io.OutputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
 
 /**
  * Ant task that explode an archive.
@@ -116,7 +122,7 @@
       ZipInputStream zip = null;
       try
       {
-         zip = new ZipInputStream(Tools.safeBufferedWrapper(new FileInputStream(file)));
+         zip = new ZipInputStream(new BufferedInputStream(new FileInputStream(file)));
          log("Process archive " + name);
          explode(this, name, zip, todir, this.exclude);
       }
@@ -212,7 +218,7 @@
                OutputStream out = null;
                try
                {
-                  out = Tools.safeBufferedWrapper(new FileOutputStream(fic));
+                  out = new BufferedOutputStream(new FileOutputStream(fic));
                   for(int size = zip.read(buffer); size != -1; size = zip.read(buffer))
                   {
                      out.write(buffer, 0, size);

Modified: trunk/common/src/main/org/jboss/portal/common/ant/Implode.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/ant/Implode.java	2006-09-25 21:27:23 UTC (rev 5250)
+++ trunk/common/src/main/org/jboss/portal/common/ant/Implode.java	2006-09-25 21:46:12 UTC (rev 5251)
@@ -23,7 +23,6 @@
 
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import org.jboss.portal.common.util.Tools;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -35,10 +34,10 @@
 import java.io.IOException;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
 import java.io.OutputStream;
-import java.io.BufferedInputStream;
 import java.io.InputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedInputStream;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -101,7 +100,7 @@
       try
       {
          byte[] bytes = implode(dir);
-         out = Tools.safeBufferedWrapper(new FileOutputStream(tofile));
+         out = new BufferedOutputStream(new FileOutputStream(tofile));
          out.write(bytes);
       }
       catch (IOException e)
@@ -141,7 +140,7 @@
          InputStream in = null;
          try
          {
-            in = Tools.safeBufferedWrapper(new FileInputStream(f));
+            in = new BufferedInputStream(new FileInputStream(f));
             byte[] bytes = new byte[1024];
 
             //

Modified: trunk/tools/lib/explode.jar
===================================================================
(Binary files differ)