You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/11/05 17:00:59 UTC
svn commit: r1405854 - in /airavata/sandbox/client-api-demo/src/main/webapp:
./ js/ jsp/
Author: heshan
Date: Mon Nov 5 16:00:57 2012
New Revision: 1405854
URL: http://svn.apache.org/viewvc?rev=1405854&view=rev
Log:
Restructred code.
Added:
airavata/sandbox/client-api-demo/src/main/webapp/index.html
airavata/sandbox/client-api-demo/src/main/webapp/js/
airavata/sandbox/client-api-demo/src/main/webapp/js/x_app_descriptor_save_json.js
- copied unchanged from r1405839, airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_save_json.js
- copied, changed from r1405840, airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.js
airavata/sandbox/client-api-demo/src/main/webapp/jsp/
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_app.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_app.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_app_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_app_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_workflow_init.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_init.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_workflow_list.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_list.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_workflow_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/execute_workflow_run.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_run.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/index.jsp
- copied, changed from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/index.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/monitor_experiment.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/monitor_experiment.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/monitor_experiment_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/monitor_experiment_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/register_app.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/register_app.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/register_app_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/register_app_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/register_host.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/register_host.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/register_host_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/register_host_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/server_info.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/server_info.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/server_info_result.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/server_info_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/jsp/temp.jsp
- copied unchanged from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/temp.jsp
Removed:
airavata/sandbox/client-api-demo/src/main/webapp/execute_app.jsp
airavata/sandbox/client-api-demo/src/main/webapp/execute_app_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_init.jsp
airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_list.jsp
airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/execute_workflow_run.jsp
airavata/sandbox/client-api-demo/src/main/webapp/index.jsp
airavata/sandbox/client-api-demo/src/main/webapp/monitor_experiment.jsp
airavata/sandbox/client-api-demo/src/main/webapp/monitor_experiment_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/register_app.jsp
airavata/sandbox/client-api-demo/src/main/webapp/register_app_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/register_host.jsp
airavata/sandbox/client-api-demo/src/main/webapp/register_host_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/server_info.jsp
airavata/sandbox/client-api-demo/src/main/webapp/server_info_result.jsp
airavata/sandbox/client-api-demo/src/main/webapp/temp.jsp
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.js
airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.js
Modified:
airavata/sandbox/client-api-demo/src/main/webapp/x_app_descriptor_save_json.html
airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.html
Added: 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=1405854&view=auto
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/index.html (added)
+++ airavata/sandbox/client-api-demo/src/main/webapp/index.html Mon Nov 5 16:00:57 2012
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <title>Airavata Demo</title>
+</head>
+
+ <body>
+ <h1>Airavata API Demo</h1>
+
+ <br/>
+ <h4><a href="x_host_descriptor_view_json.html">View Host Descriptors - Jason</a></h4>
+ <h4><a href="x_app_descriptor_view_json.html">View App Descriptors - Jason</a></h4>
+
+ <br/>
+ <h4><a href="x_host_descriptor_save_json.html">Save Host Descriptor - jason</a></h4>
+ <h4><a href="x_app_descriptor_save_json.html">Save App Descriptor - Jason</a></h4>
+ <br/>
+
+ <h4><a href="x_host_descriptor_save.html">Save Host Descriptor</a></h4>
+ <h4><a href="x_app_descriptor_save.html">Save App Descriptor</a></h4>
+
+ <h4><a href="x_host_display.html">Registry Service Test Get</a></h4>
+ <h4><a href="x_host_save.html">Registry Service Test Post</a></h4>
+
+ </body>
+</html>
\ No newline at end of file
Copied: airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_save_json.js (from r1405840, airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.js)
URL: http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_save_json.js?p2=airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_save_json.js&p1=airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.js&r1=1405840&r2=1405854&rev=1405854&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.js (original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/js/x_host_descriptor_save_json.js Mon Nov 5 16:00:57 2012
@@ -30,10 +30,10 @@ $(document).ready(function(){
var hostName = $("#hostName1").val();
var hostAddress = $("#hostAddress1").val();
var hostEndpoint = $("#hostEndpoint1").val();
- alert(hostEndpoint);
- alert(hostEndpoint);
- alert("hostEndpoint null :" + hostEndpoint == null);
- alert("hostEndpoint empty :" + hostEndpoint == "");
+// alert(hostEndpoint);
+// alert(hostEndpoint);
+// alert("hostEndpoint null :" + hostEndpoint == null);
+// alert("hostEndpoint empty :" + hostEndpoint == "");
var gatekeeperEndpoint = $("#gatekeeperEndpoint1").val();
var xml = $('<type:hostDescription xmlns:type="http://schemas.airavata.apache.org/gfac/type"><type:hostName>' + hostName + '</type:hostName><type:hostAddress>' + hostAddress + '</type:hostAddress></type:hostDescription>');
@@ -47,9 +47,9 @@ $(document).ready(function(){
}
console.log(xmlString);
- alert(hostName);
- alert(hostAddress);
- alert(xmlString);
+// alert(hostName);
+// alert(hostAddress);
+// alert(xmlString);
if (("" == hostEndpoint) || ("" == gatekeeperEndpoint)) {
alert("if Case");
Copied: airavata/sandbox/client-api-demo/src/main/webapp/jsp/index.jsp (from r1405775, airavata/sandbox/client-api-demo/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/jsp/index.jsp?p2=airavata/sandbox/client-api-demo/src/main/webapp/jsp/index.jsp&p1=airavata/sandbox/client-api-demo/src/main/webapp/index.jsp&r1=1405775&r2=1405854&rev=1405854&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/index.jsp (original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/jsp/index.jsp Mon Nov 5 16:00:57 2012
@@ -15,18 +15,18 @@
<%--<h4><a href="./register_app.jsp">Register an Application</a></h4>--%>
<%--<h4><a href="./execute_app.jsp">Execute an Application</a></h4>--%>
<br>
- <h4><a href="./x_host_descriptor_view_json.html">View Host Descriptors - Jason</a></h4>
- <h4><a href="./x_app_descriptor_view_json.html">View App Descriptors - Jason</a></h4>
+ <h4><a href="../x_host_descriptor_view_json.html">View Host Descriptors - Jason</a></h4>
+ <h4><a href="../x_app_descriptor_view_json.html">View App Descriptors - Jason</a></h4>
<br/>
- <h4><a href="./x_host_descriptor_save_json.html">Save Host Descriptor - jason</a></h4>
- <h4><a href="./x_app_descriptor_save_json.html">Save App Descriptor - Jason</a></h4>
+ <h4><a href="../x_host_descriptor_save_json.html">Save Host Descriptor - jason</a></h4>
+ <h4><a href="../x_app_descriptor_save_json.html">Save App Descriptor - Jason</a></h4>
</br>
- <h4><a href="./x_host_descriptor_save.html">Save Host Descriptor</a></h4>
- <h4><a href="./x_app_descriptor_save.html">Save App Descriptor</a></h4>
+ <h4><a href="../x_host_descriptor_save.html">Save Host Descriptor</a></h4>
+ <h4><a href="../x_app_descriptor_save.html">Save App Descriptor</a></h4>
- <h4><a href="./x_host_display.html">Registry Service Test Get</a></h4>
- <h4><a href="./x_host_save.html">Registry Service Test Post</a></h4>
+ <h4><a href="../x_host_display.html">Registry Service Test Get</a></h4>
+ <h4><a href="../x_host_save.html">Registry Service Test Post</a></h4>
</body>
</html>
\ No newline at end of file
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=1405854&r1=1405853&r2=1405854&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 16:00:57 2012
@@ -7,7 +7,7 @@
<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>
+<script type="text/javascript" src="js/x_app_descriptor_save_json.js" ></script>
<b> Register Host Description </b><br/>
Modified: airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.html
URL: http://svn.apache.org/viewvc/airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.html?rev=1405854&r1=1405853&r2=1405854&view=diff
==============================================================================
--- airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.html (original)
+++ airavata/sandbox/client-api-demo/src/main/webapp/x_host_descriptor_save_json.html Mon Nov 5 16:00:57 2012
@@ -7,7 +7,7 @@
<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_host_descriptor_save_json.js" ></script>
+<script type="text/javascript" src="js/x_host_descriptor_save_json.js" ></script>
<b> Register Host Description </b>
<br/>