Changeset 369 for gssim_ui/branches

Timestamp:

08/10/12 14:18:18 (13 years ago)

Author:

mcichenski

Message:

test for moving files

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor

Files:

• DatabaseHelper.java (modified) (2 diffs)
• GSSimStudio.java (modified) (3 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/DatabaseHelper.java

@@ -31 +31 @@
          */
         protected String apJobDescription = "job_description";
+        /**
+         * Application property for input location
+         */
+        protected String apInputLocation = "input_location";
+        /**
+         * Application property for output location
+         */
+        protected String apOutputLocation = "output_location";
+        /**
+         * Application property for GSSim input files location
+         */
+        protected String apGSSimInput = "gssim_input";
         
         /**
@@ -36 +48 @@
          */
         protected String jdPropertyFile = "$PROPERTY_FILE";
+        /**
+         * Job description token for input location
+         */
+        protected String jdInputLocation = "$INPUT_LOCATION";
+        /**
+         * Job description token for output location
+         */
+        protected String jdOutputLocation = $OUTPUT_LOCATION";
 }

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java

@@ -147 +147 @@
                 uploadPropertyFile(destFileName, fileContent);
                 
+                UUID uuid = UUID.randomUUID();
+                String uniqueFolderName = uuid.toString();
+                
                 String grmsURL = null;
                 String grmsDN = null;
                 String jobDescription = null;
+                String inputLocation = null;
+                String outputLocatin = null;
+                String gssimInput = null;
                 
                 Connection connection = null;
@@ -173 +179 @@
                         else {
                                 jobDescription = list.get(0).getValue();
-                                //replace tokens
-                                jobDescription = jobDescription.replace(jdPropertyFile, "input/" + destFileName);
+                                jobDescription = jobDescription.replace(jdPropertyFile, uniqueFolderName + "/" + destFileName);
                         }
+                        
+                        finder = Finder.getApplicationPropertyFinder(apInputLocation);
+                        list = applicationPropertyDAO.find(finder);
+                        if (list.isEmpty()) ;
+                        else {
+                                inputLocation = list.get(0).getValue();
+                                if (inputLocation.endsWith("/"))
+                                        inputLocation = inputLocation.substring(0,inputLocation.length() - 1);
+                                if (jobDescription != null)
+                                        jobDescription = jobDescription.replace(jdInputLocation, inputLocation);
+                        }
+                        
+                        finder = Finder.getApplicationPropertyFinder(apOutputLocation);
+                        list = applicationPropertyDAO.find(finder);
+                        if (list.isEmpty()) ;
+                        else {
+                                outputLocation = list.get(0).getValue();
+                                if (jobDescription != null)
+                                        jobDescription = jobDescription.replace(jdOutputLocation, outputLocation);
+                        }
+                        
+                        finder = Finder.getApplicationPropertyFinder(apGSSimInput);
+                        list = applicationPropertyDAO.find(finder);
+                        if (list.isEmpty()) ;
+                        else
+                                gssimInput = list.get(0).getValue();
+                        
                 } catch (SQLException e) {
                         ;
@@ -188 +220 @@
                 } finally {
                         closeConnection(connection, null);
-                }       
+                }
+                
+                //move the files to unique subfolder
+                String cmd = new String[2];
+                cmd[0] = "mkdir";
+                cmd[1] = inputLocation + "/" + uniqueFolderName;
+                Runtime.getRuntime().exec(cmd).waitFor();
+                cmd = new String[3];
+                cmd[0] = "cp";
+                cmd[2] = inputLocation + "/" + uniqueFolderName
+                cmd[1] = gssimInput + "/" + destFileName;
+                Runtime.getRuntime().exec(cmd).waitFor();
                 
                 return doSubmitApplication(grmsURL, grmsDN, jobDescription);