Author: heshan
Date: Mon Nov 19 19:57:17 2012
New Revision: 1411377
URL: http://svn.apache.org/viewvc?rev=1411377&view=rev
Log:
Update to monitoring workflows.
Update to deleting HostDescriptor.
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/index.html
airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_edit_json.js
airavata/sandbox/client-api-demo/src/main/webapp/js/x_workflow_monitor.js
airavata/sandbox/client-api-demo/src/main/webapp/x_workflow_monitor.html
Modified: airavata/sandbox/client-api-demo/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/index.html?rev=1411377&r1=1411376&r2=1411377&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/index.html (original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/index.html Mon Nov 19
19:57:17 2012
@@ -41,16 +41,18 @@
<div class="span3">
<div class="well sidebar-nav">
<ul class="nav nav-list">
- <li class="nav-header">View
JSON</li>
+ <li class="nav-header">View
Descriptors</li>
<li><a
href="x_host_descriptor_view_json.html">View Host Descriptors</a></li>
<li><a
href="x_app_descriptor_view_json.html">View App Descriptors</a></li>
- <li class="nav-header">Save
JSON</li>
+ <li class="nav-header">Save
Descriptors</li>
<li><a
href="x_host_descriptor_save_json.html">Save Host Descriptors</a></li>
<li><a
href="x_app_descriptor_save_json.html">Save App Descriptors</a></li>
- <li class="nav-header">Edit JSON</li>
+ <li class="nav-header">Edit Descriptors</li>
<li><a href="x_host_descriptor_edit_json.html">Edit
Host Descriptors</a></li>
<!--<li><a href="x_app_descriptor_save_json.html">Save
App Descriptors</a></li>-->
- <li
class="nav-header">Others</li>
+ <li class="nav-header">Monitor</li>
+ <li><a href="x_workflow_monitor.html">Workflow
Monitor</a></li>
+ <li class="nav-header">Others</li>
<!--<li><a
href="html/x_host_descriptor_save.html">Save Host Descriptors</a></li>-->
<!--<li><a
href="html/x_app_descriptor_save.html">Save App Descriptors</a></li>-->
<!--<li><a
href="html/x_host_display.html">Registry Service Test Get</a></li>-->
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_edit_json.js
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_edit_json.js?rev=1411377&r1=1411376&r2=1411377&view=diff
==============================================================================
---
airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_edit_json.js
(original)
+++
airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_edit_json.js
Mon Nov 19 19:57:17 2012
@@ -83,20 +83,11 @@ function initButtons() {
var hostName = $("#hostName1").val();
var deleteUrl =
"http://localhost:7080/airavata-rest-services/registry/api/descriptors/hostdescriptor/delete";;
alert("Delete button clicked!");
+ alert("hostname : " + hostName);
$.ajax({
- beforeSend: function(x) {
- if (x && x.overrideMimeType) {
- x.overrideMimeType("application/j-son;charset=UTF-8");
- }
- },
type: "DELETE",
-// dataType: "json",
- contentType: "application/json;charset=utf-8",
- url: deleteUrl,
- data: {
- "hostName": hostName
- }
+ url: deleteUrl + "?hostname=" + hostName
}).done(function( msg ) {
alert( "Host Deleted: " + msg );
});
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/js/x_workflow_monitor.js
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/js/x_workflow_monitor.js?rev=1411377&r1=1411376&r2=1411377&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/js/x_workflow_monitor.js
(original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/js/x_workflow_monitor.js
Mon Nov 19 19:57:17 2012
@@ -28,16 +28,16 @@ $(document).ready(function(){
}
},
type: "GET",
-// dataType: "json",
+ dataType: "json",
data : {user : "admin"},
contentType: "application/json;charset=utf-8",
- url:
"http://localhost:7080/airavata-registry-rest-services/registry/api/provenanceregistry/get/experimentId/user";,
+ url:
"http://localhost:7080/airavata-rest-services/registry/api/provenanceregistry/get/experimentId/user";,
error: function(ajaxrequest, ajaxOptions, thrownError){
alert(thrownError);
}
}).done(function(msg) {
- $("#jason-text").html(JSON.stringify(msg));
+ $("#json-text").html(JSON.stringify(msg));
});
});
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/x_workflow_monitor.html
URL:
http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/x_workflow_monitor.html?rev=1411377&r1=1411376&r2=1411377&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/x_workflow_monitor.html
(original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/x_workflow_monitor.html
Mon Nov 19 19:57:17 2012
@@ -33,7 +33,7 @@
<table id="display"></table>
-<textarea id="jason-text" rows="50" cols="150" placeholder="Experiment List">
+<textarea id="json-text" rows="5" cols="150" placeholder="Experiment List">
</textarea>
</body>
