Changeset 408 for gssim_ui/branches

Timestamp:

08/18/12 00:20:34 (13 years ago)

Author:

mcichenski

Message:

 

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex

Files:

• app/gssim/gssimstudio/editor/gssim/experiment/ExperimentProperties.as (modified) (4 diffs)
• app/gssim/gssimstudio/editor/views/ExperimentEditor.mxml (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/DatabaseHelper.java (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (3 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/gssim/experiment/ExperimentProperties.as

@@ -52 +52 @@
                         
                          //set default output folder:
-                        properties[statsOutputFolder] = "../../output/experiment_result";
+                        properties[statsOutputFolder] = "../output/experiment_result";
                         //set default values for plugins
                         properties[gridSchedulingPlugin] = null;
@@ -120 +120 @@
                 public function setWorkloadFile(file : String) : void
                 {
-                        properties[workloadFile] = "input/workloads/" + file;
+                        properties[workloadFile] = "$INPUT/" + file;
                         workload = file;
                 }
@@ -126 +126 @@
                 public function setTopologyFile(file : String) : void
                 {
-                        properties[networkTopologyFile] = "input/topologies/" + file;
+                        properties[networkTopologyFile] = "$INPUT/" + file;
                         topology = file;
                 }
@@ -132 +132 @@
                 public function setResourceFile(file : String) : void
                 {
-                        properties[resourceDescriptionFile] = "input/resources/" + file;
+                        properties[resourceDescriptionFile] = "$INPUT/" + file;
                         resources = file;
                 }

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/views/ExperimentEditor.mxml

@@ -98 +98 @@
                                 
                                 parentApplication.service.uploadAndSubmitExperiment
-                                        (propertyFileName, experiment.toString());
+                                        (propertyFileName, experiment.toString(), experiment.workload, experiment.resources, experiment.topology);
                         }
                         

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

@@ -56 +56 @@
          */
         protected String jdOutputLocation = "$OUTPUT_LOCATION";
+        
+        /**
+         * Properties input data location
+         */
+        protected String pInputLocation = "$INPUT";
 }

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

@@ -161 +161 @@
     
     @BlazeDsMethod()
-        public GSSimStudioModel uploadAndSubmitExperiment(String destFileName, String fileContent) throws IOException {
+        public GSSimStudioModel uploadAndSubmitExperiment(String destFileName, String fileContent, String workload, String resources, String topology) throws IOException {
         GSSimStudioModel model = getModel();
         
@@ -168 +168 @@
                 Integer expId = addExperimentToDb(expName, metaexpName);
                 fileContent += "experiment.id="+expId.toString();
+                String uniqueFolderName = "tmp" + String.valueOf(new Date().getTime());
+                fileContent = fileContent.replace(pInputLocation, uniqueFolderName)
                 uploadPropertyFile(destFileName, fileContent);
                 
@@ -250 +252 @@
             String destination = gssimInput + "/" + uniqueFolderName + "/";
             copyFile(gssimInput + "/" + destFileName, destination);
+            if (workload != null && !workload.isEmpty()) {
+                copyFile(gssimInput + "/workloads/" + workload, destination);
+            }
+            if (resources != null && !resources.isEmpty()) {
+                copyFile(gssimInput + "/resources/" + resources, destination);
+            }
+            if (topology != null && !topology.isEmpty()) {
+                copyFile(gssimInput + "/topologies/" + topology, destination);
+            }
                         
                 } catch (SQLException e) {