WebSVN – XServices – Diff – /xservices/trunk/src/java/net/brutex/xservices/ws/ArchiveService.java

  *   distributed under the License is distributed on an "AS IS" BASIS,
  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
 package net.brutex.xservices.ws;
 import java.io.File;
 import java.util.Map;
     public static final String WS_OPERATION_GZIP = "gzip";
     public static final String WS_OPERATION_GZIP_ARCHIVE = "gzipFromArchive";
     public static final String WS_OPERATION_UNZIP = "unzip";
     public static final String WS_OPERATION_GUNZIP = "gunzip";
     public static final String WS_OPERATION_BUNZIP2 = "bunzip2";
     public static final String WS_PARAM_SOURCEFILE = "source";
     public static final String WS_PARAM_SOURCEFILE_STRING = "srcfile";
     public static final String WS_PARAM_SOURCEURL = "srcurl";
     public static final String WS_PARAM_SOURCEARCHIVE = "archivesource";
     public static final String WS_PARAM_DESTFILE = "destfile";
     public static final String WS_PARAM_DESTDIR = "destdir";
     public static final String WS_PARAM_ENCODING = "encoding";
-    public static final String WS_PARAM_OVERWRITE= "overwrite";
+    public static final String WS_PARAM_OVERWRITE = "overwrite";
-    @WebMethod(operationName = WS_OPERATION_BZIP2, action=WS_OPERATION_BZIP2)
+    @WebMethod(operationName = WS_OPERATION_BZIP2, action = WS_OPERATION_BZIP2)
             @WebParam(name = WS_PARAM_DESTFILE) String file) {
         return bzip(src, new File(file));
+    }
-    @WebMethod(operationName = WS_OPERATION_GZIP, action=WS_OPERATION_GZIP)
+    @WebMethod(operationName = WS_OPERATION_GZIP, action = WS_OPERATION_GZIP)
-    public String gzip(@WebParam(name = WS_PARAM_SOURCEFILE) FileResource src,
+    public ReturnCode gzip(@WebParam(name = WS_PARAM_SOURCEFILE) FileResource src,
             @WebParam(name = WS_PARAM_DESTFILE) String file) {
         return gzip(src, new File(file));
+    }
-    @WebMethod(operationName = WS_OPERATION_GZIP_ARCHIVE, action=WS_OPERATION_GZIP_ARCHIVE)
+    @WebMethod(operationName = WS_OPERATION_GZIP_ARCHIVE, action = WS_OPERATION_GZIP_ARCHIVE)
-    public String gzipFromArchive(@WebParam(name = WS_PARAM_SOURCEARCHIVE) ArchiveResource src,
+    public ReturnCode gzipFromArchive(@WebParam(name = WS_PARAM_SOURCEARCHIVE) ArchiveResource src,
             @WebParam(name = WS_PARAM_DESTFILE) String file) {
         return gzip(src, new File(file));
     }
-    @WebMethod(operationName = WS_OPERATION_GUNZIP, action=WS_OPERATION_GUNZIP)
+    @WebMethod(operationName = WS_OPERATION_GUNZIP, action = WS_OPERATION_GUNZIP)
-    public String gunzip(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
+    public ReturnCode gunzip(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest) {
         File target = null;
         if (!dest.equals("") && dest != null) {
             target = new File(dest);
+        }
         return GUnzip(new FileResource(FileResource.Type.FILE, src), target);
+    }
     @WebMethod(operationName = WS_OPERATION_BUNZIP2)
-    public String bunzip2(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
+    public ReturnCode bunzip2(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest) {
         File target = null;
         if (!dest.equals("") && dest != null) {
             target = new File(dest);
         }
         return BUnzip2(new FileResource(FileResource.Type.FILE, src), target);
+    }
     @WebMethod(operationName = "gunzipFromURL")
-    public String gunzipFromURL(@WebParam(name = WS_PARAM_SOURCEURL) String src,
+    public ReturnCode gunzipFromURL(@WebParam(name = WS_PARAM_SOURCEURL) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest) {
         File target = null;
         if (!dest.equals("") && dest != null) {
             target = new File(dest);
+        }
         return GUnzip(new FileResource(FileResource.Type.URL, src), target);
+    }
     @WebMethod(operationName = "bunzip2FromURL")
-    public String bunzip2FromURL(@WebParam(name = WS_PARAM_SOURCEURL) String src,
+    public ReturnCode bunzip2FromURL(@WebParam(name = WS_PARAM_SOURCEURL) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest) {
         File target = null;
         if (!dest.equals("") && dest != null) {
             target = new File(dest);
+        }
         return BUnzip2(new FileResource(FileResource.Type.URL, src), target);
+    }
+        }
         return zip(src, new File(file), encoding, !overwrite, level);
+    }
     @WebMethod(operationName = "zipFromArchive")
-    public String zipFromArchive(@WebParam(name = WS_PARAM_SOURCEARCHIVE) ArchiveResource src,
+    public ReturnCode zipFromArchive(@WebParam(name = WS_PARAM_SOURCEARCHIVE) ArchiveResource src,
             @WebParam(name = WS_PARAM_DESTFILE) String file,
             @WebParam(name = WS_PARAM_OVERWRITE) boolean update,
             @WebParam(name = WS_PARAM_ENCODING) String encoding,
             @WebParam(name = "compresslevel") int level) {
         return zip(src, new File(file), encoding, !update, level);
-    }
+    }
     @WebMethod(operationName = "unzip")
-    public String unzip(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
+    public ReturnCode unzip(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest,
             @WebParam(name = WS_PARAM_OVERWRITE) boolean overwrite,
             @WebParam(name = WS_PARAM_ENCODING) String encoding) {
         return unzip(new File(src), new File(dest), overwrite, encoding);
     }
     @WebMethod(operationName = "unrar")
-    public String unrar(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
+    public ReturnCode unrar(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest) {
         return unrar(new File(src), new File(dest));
+    }
     @WebMethod(operationName = "untar")
-    public String untar(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
+    public ReturnCode untar(@WebParam(name = WS_PARAM_SOURCEFILE_STRING) String src,
             @WebParam(name = WS_PARAM_DESTDIR) String dest,
         bzip.setTaskName("BZip2");
         RunTask runner = new RunTask(bzip);
         bzip.setSrcResource(src.getAntResource(bzip.getProject()));
         bzip.setDestfile(dst);
-        Map<String, String> result = runner.postTask();
-        return new ReturnCode(0,result.get("System.stdOut"),result.get("System.stdErr"));
+        return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String gzip(ResourceInterface src, File dst) {
+    private ReturnCode gzip(ResourceInterface src, File dst) {
         if (dst.exists() && dst.isFile()) {
             dst.delete();
+        }
         GZip gzip = new GZip();
         gzip.setTaskName("GZip");
         RunTask runner = new RunTask(gzip);
-        gzip.addConfigured(src.getAntResource(gzip.getProject()));
-        gzip.setDestfile(dst);
+        gzip.addConfigured(src.getAntResource(gzip.getProject()));
-        Map<String, String> result = runner.postTask();
+        gzip.setDestfile(dst);
-        return "complete";
-    }
         return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String zip(ResourceInterface src, File dst, String encoding, boolean update, int compresslevel) {
+    private ReturnCode zip(ResourceInterface src, File dst, String encoding, boolean update, int compresslevel) {
         Zip zip = new Zip();
         zip.setTaskName("Zip");
         RunTask runner = new RunTask(zip);
         zip.add(src.getAntResource(zip.getProject()));
         zip.setDestFile(dst);
         if (encoding != null && !encoding.equals("")) {
             zip.setEncoding(encoding);
-        }
-        zip.setUpdate(update);
+        }
-        zip.setLevel(compresslevel);
+        zip.setUpdate(update);
-        Map<String, String> result = runner.postTask();
+        zip.setLevel(compresslevel);
-        return "complete";
+        return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String GUnzip(ResourceInterface src, File dst) {
+    private ReturnCode GUnzip(ResourceInterface src, File dst) {
         GUnzip uz = new GUnzip();
         uz.setTaskName("GUnzip");
         RunTask runner = new RunTask(uz);
-        uz.setSrcResource(src.getAntResource(uz.getProject()));
-        if (dst != null) {
+        uz.setSrcResource(src.getAntResource(uz.getProject()));
-            uz.setDest(dst);
+        if (dst != null) {
             uz.setDest(dst);
-        Map<String, String> result = runner.postTask();
+        }
-        return "complete";
+        return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String BUnzip2(ResourceInterface src, File dst) {
+    private ReturnCode BUnzip2(ResourceInterface src, File dst) {
         BUnzip2 uz = new BUnzip2();
         uz.setTaskName("BUnzip2");
-        RunTask runner = new RunTask(uz);
-        uz.setSrcResource(src.getAntResource(uz.getProject()));
+        RunTask runner = new RunTask(uz);
-        if (dst != null) {
+        uz.setSrcResource(src.getAntResource(uz.getProject()));
-            uz.setDest(dst);
+        if (dst != null) {
-        }
+            uz.setDest(dst);
         Map<String, String> result = runner.postTask();
-        return "complete";
+        return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String unzip(File src, File dest, boolean overwrite, String encoding) {
+    private ReturnCode unzip(File src, File dest, boolean overwrite, String encoding) {
         Expand unzip = new Expand();
         unzip.setTaskName("UnZip");
         RunTask runner = new RunTask(unzip);
-        unzip.setSrc(src);
-        unzip.setDest(dest);
-        unzip.setOverwrite(overwrite);
+        unzip.setSrc(src);
-        if (encoding != null && !encoding.equals("")) {
+        unzip.setDest(dest);
-            unzip.setEncoding(encoding);
+        unzip.setOverwrite(overwrite);
-        }
+        if (encoding != null && !encoding.equals("")) {
             unzip.setEncoding(encoding);
         Map<String, String> result = runner.postTask();
-        return "complete";
+        return runner.postTask();
+    }
     @WebMethod(exclude = true)
-    private String untar(File src, File dest, boolean overwrite, Untar.UntarCompressionMethod compression) {
+    private ReturnCode untar(File src, File dest, boolean overwrite, Untar.UntarCompressionMethod compression) {
-        Untar unzip = new Untar();
-        unzip.setTaskName("Untar");
+        Untar unzip = new Untar();
-        RunTask runner = new RunTask(unzip);
+        unzip.setTaskName("Untar");
-        unzip.setSrc(src);
+        RunTask runner = new RunTask(unzip);
-        unzip.setDest(dest);
+        unzip.setSrc(src);
-        unzip.setOverwrite(overwrite);
+        unzip.setDest(dest);
-        unzip.setCompression(compression);
+        unzip.setOverwrite(overwrite);
-        Map<String, String> result = runner.postTask();
+        unzip.setCompression(compression);
-        return "complete";
+        return runner.postTask();
+    }
-    @WebMethod(exclude = true)
-    private String unrar(File src, File dst) {
+    @WebMethod(exclude = true)
-        UnRarTask unrar = new UnRarTask();
-        unrar.setTaskName("UnRar");
-        RunTask runner = new RunTask(unrar);
+    private ReturnCode unrar(File src, File dst) {

Subversion Repositories XServices

(root)/xservices/trunk/src/java/net/brutex/xservices/ws/ArchiveService.java @ 147 – Rev 11 → 12