ServletModule exception cleanup + different error templates for admin + open postings...

[mir.git] / source / mir / misc / Helper.java

diff --git a/source/mir/misc/Helper.java b/source/mir/misc/Helper.java
index bbfb842..9dda35c 100755 (executable)
--- a/source/mir/misc/Helper.java
+++ b/source/mir/misc/Helper.java
@@ -1,7 +1,41 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mir.misc;
 
 import java.io.IOException;
 
+import mir.config.MirPropertiesConfiguration;
+import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
+
 /**
  * Title:        Indy
  * Description:  This class provides some satic help methods
@@ -17,13 +51,26 @@ public class Helper {
    * rsync the webrepository
    * needs a rsyncscript
    * returns the exit-code
+        * returns 255 if rsync should not be used
    */
   public static int rsync(){
-    Process p;
+    MirPropertiesConfiguration configuration = null;
+    try {
+      configuration = MirPropertiesConfiguration.instance();
+    } catch (PropertiesConfigExc e) {
+      e.printStackTrace();
+      return 255;
+    }
+    
+               if(!configuration.getString("Rsync").toLowerCase().equals("yes")){
+                       return 255;
+               }
+               
+         Process p;
     int returnValue = -1;
     try {
       Runtime run = Runtime.getRuntime();
-      p = run.exec(Configuration.getProperty("Sync.Script.Path"));
+      p = run.exec(configuration.getString("Rsync.Script.Path"));
       returnValue = p.waitFor();
     } catch (IOException e) {
       return returnValue;
@@ -32,4 +79,4 @@ public class Helper {
     }
     return returnValue;
   }
-}
\ No newline at end of file
+}