Author: heshan
Date: Mon Nov 5 13:18:20 2012
New Revision: 1405784
URL: http://svn.apache.org/viewvc?rev=1405784&view=rev
Log:
Refactoring to javascript logic to seperated .js file.
Added:
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html?rev=1405784&r1=1405783&r2=1405784&view=diff
==============================================================================
---
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html
(original)
+++
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html
Mon Nov 5 13:18:20 2012
@@ -6,6 +6,9 @@
</head>
<body>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"
type="text/javascript"></script>
+<script type="text/javascript" src="x_app_descriptor_save_json.js" ></script>
+
<b> Register Host Description </b><br/>
Application Name *: <input type="text" id="appName1" name="appName"
value="EchoLocal" size="50"><br/>
@@ -33,128 +36,6 @@ Output Type *: <input type="text
<button name="btn2">Save Application</button>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"
type="text/javascript"></script>
-<script>
- var jsonRequest = {};
- var inputCount = 1;
- var outputCount = 1;
-
- function xmlToString(xml) {
- var xmlData = $(xml);
- var xmlString;
- if (window.ActiveXObject) {
- xmlString = xmlData.xml;
- } else {
- var oSerializer = new XMLSerializer();
- xmlString = oSerializer.serializeToString(xmlData[0]);
- }
- console.log(xmlString);
- return xmlString;
- }
-
- $(document).ready(function(){
-
- $("p1").live("click", function(){
- inputCount++;
- $(this).after("<br/>Input Name *:" +
- "<input type="text" id="inputName" +
inputCount + "" name="inputName" + inputCount + ""
size="50"><br/>" +
- "Input Type *:" +
- "<input type="text" id="inputType" +
inputCount + "" name="inputType" + inputCount + ""
size="50"><br/>");
- });
-
- $("p2").live("click", function(){
- outputCount++;
- $(this).after("<br/>Output Name *:" +
- "<input type="text" id="outputName" +
outputCount + "" name="outputName" + outputCount + ""
size="50"><br/>" +
- "Output Type *:" +
- "<input type="text" id="outputType" +
outputCount + "" name="outputType" + outputCount + ""
size="50"><br/>");
- });
-
- $('[name="btn2"]').click(function(){
- var appName = $("#appName1").val();
- var hostName = $("#hostName1").val();
- var serviceName = $("#serviceName1").val();
- var exeuctableLocation = $("#exeuctableLocation1").val();
- var projAccNumber = $("#projAccNumber1").val();
-
- var scratchWorkingDirectory = $("#scratchWorkingDirectory1").val();
- var maxMemory = $("#maxMemory1").val();
- var queueName = $("#queueName1").val();
- var cpuCount = $("#cpuCount1").val();
- var nodeCount = $("#nodeCount1").val();
-
- var inputName1 = $("#inputName1").val();
- var inputType1 = $("#inputType1").val();
- var outputName = $("#outputName1").val();
- var outputType = $("#outputType1").val();
-
- var applicationDescType = "Gram"; // TODO : input
-
- jsonRequest["name"] = appName;
- jsonRequest["projectNumber"] = projAccNumber;
- jsonRequest["jobType"] = "single"; // TODO : input
- jsonRequest["queueName"] = queueName;
- jsonRequest["applicationDescType"] = applicationDescType;
- jsonRequest["executablePath"] = exeuctableLocation;
- jsonRequest["workingDir"] = scratchWorkingDirectory;
- jsonRequest["cpuCount"] = cpuCount;
- jsonRequest["hostdescName"] = hostName;
- jsonRequest["maxMemory"] = maxMemory;
- jsonRequest["maxWallTime"] = "10"; //TODO
- jsonRequest["minMemory"] = "4"; //TODO
- jsonRequest["nodeCount"] = nodeCount;
- jsonRequest["processorsPerNode"] = "3"; //TODO
-
- var inArray = [];
- for(var j=1; j<inputCount+1; j++) {
- var input = {};
- input["dataType"] = "input";
- input["description"] = "empty";
- input["name"] = "name"; //$("#inputName" + j+1).val();
- input["type"] = "type"; //$("#inputType" + j+1).val();
- inArray[j-1] = input;
-
- console.log("input : " + j);
- console.log(JSON.stringify(input));
- }
-
- var outArray = new Array();
- for(j=1; j<outputCount+1; j++) {
- var output = {};
- output["dataType"] = "output";
- output["description"] = "empty";
- output["name"] = "name"; //$("#outputName" + j+1).val();
- output["type"] = "type"; //$("#outputType" + j+1).val();
-// output["name"] = $('#outputName'.concat(j+1)).val();
-// output["type"] = $('#outputType'.concat(j+1)).val();
- outArray[j-1] = output;
- }
-
- var serviceDesc = {};
- serviceDesc["serviceName"] = serviceName;
- serviceDesc["inputParams"] = inArray;
- serviceDesc["outputParams"] = outArray;
- jsonRequest["serviceDescriptor"] = serviceDesc;
- console.log(JSON.stringify(jsonRequest));
-
- $.ajax({
- beforeSend: function(x) {
- if (x && x.overrideMimeType) {
- x.overrideMimeType("application/j-son;charset=UTF-8");
- }
- },
- type: "POST",
- dataType: "json",
- contentType: "application/json;charset=utf-8",
- url:
"http://localhost:7080/airavata-registry-rest-services/registry/api/applicationdescriptor/build/save";,
- data: JSON.stringify(jsonRequest)
- }).done(function( msg ) {
- alert( "Data Saved: " + msg );
- });
-
- });
- });
-</script>
<style>
p { background:#b0c4de; font-weight:bold; cursor:pointer;
Added:
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js?rev=1405784&view=auto
==============================================================================
---
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
(added)
+++
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
Mon Nov 5 13:18:20 2012
@@ -0,0 +1,119 @@
+var jsonRequest = {};
+var inputCount = 1;
+var outputCount = 1;
+
+function xmlToString(xml) {
+ var xmlData = $(xml);
+ var xmlString;
+ if (window.ActiveXObject) {
+ xmlString = xmlData.xml;
+ } else {
+ var oSerializer = new XMLSerializer();
+ xmlString = oSerializer.serializeToString(xmlData[0]);
+ }
+ console.log(xmlString);
+ return xmlString;
+}
+
+$(document).ready(function(){
+
+ $("p1").live("click", function(){
+ inputCount++;
+ $(this).after("<br/>Input Name *:" +
+ "<input type="text" id="inputName" + inputCount +
"" name="inputName" + inputCount + "" size="50"><br/>"
+
+ "Input Type *:" +
+ "<input type="text" id="inputType" + inputCount +
"" name="inputType" + inputCount + ""
size="50"><br/>");
+ });
+
+ $("p2").live("click", function(){
+ outputCount++;
+ $(this).after("<br/>Output Name *:" +
+ "<input type="text" id="outputName" + outputCount +
"" name="outputName" + outputCount + ""
size="50"><br/>" +
+ "Output Type *:" +
+ "<input type="text" id="outputType" + outputCount +
"" name="outputType" + outputCount + ""
size="50"><br/>");
+ });
+
+ $('[name="btn2"]').click(function(){
+ var appName = $("#appName1").val();
+ var hostName = $("#hostName1").val();
+ var serviceName = $("#serviceName1").val();
+ var exeuctableLocation = $("#exeuctableLocation1").val();
+ var projAccNumber = $("#projAccNumber1").val();
+
+ var scratchWorkingDirectory = $("#scratchWorkingDirectory1").val();
+ var maxMemory = $("#maxMemory1").val();
+ var queueName = $("#queueName1").val();
+ var cpuCount = $("#cpuCount1").val();
+ var nodeCount = $("#nodeCount1").val();
+
+ var inputName1 = $("#inputName1").val();
+ var inputType1 = $("#inputType1").val();
+ var outputName = $("#outputName1").val();
+ var outputType = $("#outputType1").val();
+
+ var applicationDescType = "Gram"; // TODO : input
+
+ jsonRequest["name"] = appName;
+ jsonRequest["projectNumber"] = projAccNumber;
+ jsonRequest["jobType"] = "single"; // TODO : input
+ jsonRequest["queueName"] = queueName;
+ jsonRequest["applicationDescType"] = applicationDescType;
+ jsonRequest["executablePath"] = exeuctableLocation;
+ jsonRequest["workingDir"] = scratchWorkingDirectory;
+ jsonRequest["cpuCount"] = cpuCount;
+ jsonRequest["hostdescName"] = hostName;
+ jsonRequest["maxMemory"] = maxMemory;
+ jsonRequest["maxWallTime"] = "10"; //TODO
+ jsonRequest["minMemory"] = "4"; //TODO
+ jsonRequest["nodeCount"] = nodeCount;
+ jsonRequest["processorsPerNode"] = "3"; //TODO
+
+ var inArray = [];
+ for(var j=1; j<inputCount+1; j++) {
+ var input = {};
+ input["dataType"] = "input";
+ input["description"] = "empty";
+ input["name"] = "name"; //$("#inputName" + j+1).val();
+ input["type"] = "type"; //$("#inputType" + j+1).val();
+ inArray[j-1] = input;
+
+ console.log("input : " + j);
+ console.log(JSON.stringify(input));
+ }
+
+ var outArray = new Array();
+ for(j=1; j<outputCount+1; j++) {
+ var output = {};
+ output["dataType"] = "output";
+ output["description"] = "empty";
+ output["name"] = "name"; //$("#outputName" + j+1).val();
+ output["type"] = "type"; //$("#outputType" + j+1).val();
+// output["name"] = $('#outputName'.concat(j+1)).val();
+// output["type"] = $('#outputType'.concat(j+1)).val();
+ outArray[j-1] = output;
+ }
+
+ var serviceDesc = {};
+ serviceDesc["serviceName"] = serviceName;
+ serviceDesc["inputParams"] = inArray;
+ serviceDesc["outputParams"] = outArray;
+ jsonRequest["serviceDescriptor"] = serviceDesc;
+ console.log(JSON.stringify(jsonRequest));
+
+ $.ajax({
+ beforeSend: function(x) {
+ if (x && x.overrideMimeType) {
+ x.overrideMimeType("application/j-son;charset=UTF-8");
+ }
+ },
+ type: "POST",
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ url:
"http://localhost:7080/airavata-registry-rest-services/registry/api/applicationdescriptor/build/save";,
+ data: JSON.stringify(jsonRequest)
+ }).done(function( msg ) {
+ alert( "Data Saved: " + msg );
+ });
+
+ });
+});
\ No newline at end of file
