Changeset 4554 for trunk/client

Timestamp:

Apr 28, 2014, 1:54:37 PM (9 years ago)

Author:

Fredrik Levander

Message:

Refs #776. Moving some settings to configuration file.

Location:

trunk/client/servlet

Files:

• conf/connection.properties.in (modified) (1 diff)
• src/org/proteios/action/file/PublishFiles.java (modified) (9 diffs)

trunk/client/servlet/conf/connection.properties.in

@@ -66 +66 @@
 alternate.location.target.2 =
 
+#
+# Settings for SRM client. Used to publish files on Swestore
+# Path to script for creating proxy:
+# create proxy = /usr/share/tomcat6/create_proxy.sh
+create.proxy = /usr/share/tomcat/create_proxy.sh
+#
+# srm-set-permissions command. 
+# command in path:
+srm.set.permissions = srm-set-permissions  
+# alternative:
+# srm.set.permissions = /opt/d-cache/srm/bin/srm-set-permissions
+
+
+
+

trunk/client/servlet/src/org/proteios/action/file/PublishFiles.java

@@ -1 +1 @@
 /*
- Copyright (C) 2012 Fredrik Levander
+ Copyright (C) 2012-2014 Fredrik Levander
 
  This file is part of Proteios.
@@ -22 +22 @@
 package org.proteios.action.file;
 
+import org.proteios.ConnectionPropertiesFile;
 import org.proteios.Context;
 import org.proteios.ContextEnabled;
@@ -45 +46 @@
 
 /**
- * This action will change the access rights of the underlying files, which are currently assumed to be on the Swestore storage
+ * This action will change the access rights of the underlying files, which are
+ * currently assumed to be on the Swestore storage
  * 
  * @author fredrik
@@ -55 +57 @@
   String initsh = "/usr/share/tomcat6/create_proxy.sh";
   String SRMcommand = "/opt/d-cache/srm/bin/srm-set-permissions";
-  static String httpsstart = "https://srm.swegrid.se";
-  static String srmstart = "srm://srm.swegrid.se";
 
 
@@ -77 +77 @@
       return;
     }
+    ConnectionPropertiesFile pf = new ConnectionPropertiesFile();
+    if (pf.getProperty("srm.set.permissions") != null)
+      SRMcommand = pf.getProperty("srm.set.permissions");
+    if (pf.getProperty("create.proxy") != null)
+      initsh = pf.getProperty("create.proxy");
     java.io.File test = new java.io.File(initsh);
     if (!test.canRead())
@@ -88 +93 @@
         if (!test.canRead())
         {
-          throw new ActionException("Cannot execute script for proxy generation. create_proxy.sh not found or not readable");
+          throw new ActionException(
+            "Cannot execute script for proxy generation. create_proxy.sh not found or not readable");
         }
       }
@@ -106 +112 @@
       while ((line = reader.readLine()) != null)
       {
-        log.warn("Proxy generation output:"+line);
+        log.warn("Proxy generation output:" + line);
         if (line.contains("No such file") || line.contains("Error"))
         {
-          throw new ActionException("Error in proxy generation:"+line);
+          throw new ActionException(
+            "Error in proxy generation:" + line);
         }
       }
@@ -142 +149 @@
           pb1.command(commandarray);
           Process proc = pb1.start();
-          reader = new BufferedReader(new InputStreamReader(proc
-            .getInputStream()));
+          reader = new BufferedReader(new InputStreamReader(
+            proc.getInputStream()));
           while ((line = reader.readLine()) != null)
           {
-            log.error("SRM client output"+line);
+            log.error("SRM client output:" + line);
+            if (line.contains("No such file") || line.contains("Error"))
+            {
+              throw new ActionException(
+              "Error issuing srm-set-permissions:" + line);
+            }
           }
           proc.waitFor();
@@ -240 +252 @@
   {
     String retval = uri.replace("http://", "https://");
-    return retval.replace(httpsstart, srmstart);
+    return retval.replace("https://srm.swegrid.se", "srm://srm.swegrid.se");
   }