airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1417155 - in /airavata/trunk/modules: rest/client/src/main/java/org/apache/airavata/rest/ rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ rest/service/ rest/webapp/ xbaya-gui/src/main/java/org/apache/airavata/xbaya/
Date Tue, 04 Dec 2012 20:28:03 GMT
Author: chathuri
Date: Tue Dec  4 20:28:02 2012
New Revision: 1417155

URL: http://svn.apache.org/viewvc?rev=1417155&view=rev
Log:
change service context and port

Modified:
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
    airavata/trunk/modules/rest/service/README.txt
    airavata/trunk/modules/rest/webapp/pom.xml
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java?rev=1417155&r1=1417154&r2=1417155&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java Tue
Dec  4 20:28:02 2012
@@ -44,7 +44,7 @@ public class Test {
     public static void configurationResourceClientTest(){
         //configuration resource test
         ConfigurationResourceClient configurationResourceClient = new ConfigurationResourceClient("admin",
-                "http://localhost:9080/airavata-services/", new PasswordCallbackImpl("admin",
"admin"));
+                "http://localhost:8080/airavata-registry/", new PasswordCallbackImpl("admin",
"admin"));
 
 //        System.out.println("###############getConfiguration###############");
 //        Object configuration = configurationResourceClient.getConfiguration("gfac.url");

Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java?rev=1417155&r1=1417154&r2=1417155&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
(original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
Tue Dec  4 20:28:02 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.rest.mapping
 
 public class ResourcePathConstants {
 
-    public static final String BASE_URL = "http://localhost:9080/airavata-services/api";
+    public static final String BASE_URL = "http://localhost:8080/airavata-registry/api";
 
     public final class ConfigResourcePathConstants {
         public static final String CONFIGURATION_REGISTRY_RESOURCE = "/congfigregistry/";

Modified: airavata/trunk/modules/rest/service/README.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/README.txt?rev=1417155&r1=1417154&r2=1417155&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/README.txt (original)
+++ airavata/trunk/modules/rest/service/README.txt Tue Dec  4 20:28:02 2012
@@ -9,102 +9,102 @@ To test
 * for simple methods you can use curl for testing.
 
 **************For Configuration releated methods********************
-   curl -v 'http://localhost:9080/airavata-services/registry/api/configuration?key=key1'
-   curl -v 'http://localhost:9080/airavata-services/registry/api/configurationlist?key=key1'
-   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value4&date=2012-09-21
04:09:56" http://localhost:9080/airavata-services/registry/api/save/configuration
-   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value5&date=2012-09-23
04:09:56" http://localhost:9080/airavata-services/registry/api/update/configuration
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/allconfiguration?key=key1
-   curl --request DELETE 'http://localhost:9080/airavata-services/registry/api/delete/configuration?key=key2&value=value2'
-   curl --request GET http://localhost:9080/airavata-services/registry/api/gfac/urilist
-   curl --request GET http://localhost:9080/airavata-services/registry/api/workflowinterpreter/urilist
-   curl --request GET http://localhost:9080/airavata-services/registry/api/eventingservice/uri
-   curl --request GET http://localhost:9080/airavata-services/registry/api/messagebox/uri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2"
http://localhost:9080/airavata-services/registry/api/add/gfacuri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2"
http://localhost:9080/airavata-services/registry/api/add/workflowinterpreteruri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/EventingService2"
http://localhost:9080/airavata-services/registry/api/add/eventinguri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2"
http://localhost:9080/airavata-services/registry/api/add/msgboxuri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2&date=2012-10-18
00:00:00" http://localhost:9080/airavata-services/registry/api/add/gfacuri/date
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2&date=2012-10-18
00:00:00" http://localhost:9080/airavata-services/registry/api/add/workflowinterpreteruri/date
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2&date=2012-10-18
00:00:00" http://localhost:9080/airavata-services/registry/api/add/msgboxuri/date
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/gfacuri?uri=http://192.168.17.1:8080/axis2/services/GFacService2
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/allgfacuris
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/workflowinterpreteruri?uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/allworkflowinterpreteruris
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/eventinguri
-   curl --request DELETE http://localhost:9080/airavata-services/registry/api/delete/msgboxuri
+   curl -v 'http://localhost:8080/airavata-registry/registry/api/configuration?key=key1'
+   curl -v 'http://localhost:8080/airavata-registry/registry/api/configurationlist?key=key1'
+   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value4&date=2012-09-21
04:09:56" http://localhost:8080/airavata-registry/registry/api/save/configuration
+   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value5&date=2012-09-23
04:09:56" http://localhost:8080/airavata-registry/registry/api/update/configuration
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allconfiguration?key=key1
+   curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/configuration?key=key2&value=value2'
+   curl --request GET http://localhost:8080/airavata-registry/registry/api/gfac/urilist
+   curl --request GET http://localhost:8080/airavata-registry/registry/api/workflowinterpreter/urilist
+   curl --request GET http://localhost:8080/airavata-registry/registry/api/eventingservice/uri
+   curl --request GET http://localhost:8080/airavata-registry/registry/api/messagebox/uri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2"
http://localhost:8080/airavata-registry/registry/api/add/gfacuri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2"
http://localhost:8080/airavata-registry/registry/api/add/workflowinterpreteruri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/EventingService2"
http://localhost:8080/airavata-registry/registry/api/add/eventinguri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2"
http://localhost:8080/airavata-registry/registry/api/add/msgboxuri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2&date=2012-10-18
00:00:00" http://localhost:8080/airavata-registry/registry/api/add/gfacuri/date
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2&date=2012-10-18
00:00:00" http://localhost:8080/airavata-registry/registry/api/add/workflowinterpreteruri/date
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2&date=2012-10-18
00:00:00" http://localhost:8080/airavata-registry/registry/api/add/msgboxuri/date
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/gfacuri?uri=http://192.168.17.1:8080/axis2/services/GFacService2
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allgfacuris
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/workflowinterpreteruri?uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allworkflowinterpreteruris
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/eventinguri
+   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/msgboxuri
 
 ************For descriptiors*********************************
     ############## Host descriptrors ##########################
 
-    curl --request GET http://localhost:9080/airavata-services/registry/api/hostdescriptor/exist?descriptorName=ember
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1",
"hostAddress":"testHostAddress" }' http://localhost:9080/airavata-services/registry/api/hostdescriptor/save
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1",
"hostAddress":"testHostAddress2" }' http://localhost:9080/airavata-services/registry/api/hostdescriptor/update
-    curl --request GET http://localhost:9080/airavata-services/registry/api/host/description?hostName=testHost1
-    curl --request DELETE http://localhost:9080/airavata-services/registry/api/hostdescriptor/delete?hostName=testHost1
-    curl --request GET http://localhost:9080/airavata-services/registry/api/get/hostdescriptors
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/hostdescriptor/exist?descriptorName=ember
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1",
"hostAddress":"testHostAddress" }' http://localhost:8080/airavata-registry/registry/api/hostdescriptor/save
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1",
"hostAddress":"testHostAddress2" }' http://localhost:8080/airavata-registry/registry/api/hostdescriptor/update
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/host/description?hostName=testHost1
+    curl --request DELETE http://localhost:8080/airavata-registry/registry/api/hostdescriptor/delete?hostName=testHost1
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/get/hostdescriptors
 
     ############## Service descriptrors ##########################
-    curl --request GET http://localhost:9080/airavata-services/registry/api/servicedescriptor/exist?descriptorName=echo
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService1",
"description":"test description","inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}'
http://localhost:9080/airavata-services/registry/api/servicedescriptor/save
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService2",
"description":"test description2","inputParams":{"dataType":"input", "description":"myinput2","name":"myinput2","type":"String"},"outputParams":{"dataType":"output","description":"myoutput2","name":"myoutput2","type":"String"}}'
http://localhost:9080/airavata-services/registry/api/servicedescriptor/update
-    curl --request GET http://localhost:9080/airavata-services/registry/api/servicedescriptor/description?serviceName=echo1
-    curl --request DELETE http://localhost:9080/airavata-services/registry/api/servicedescriptor/delete?serviceName=echo1
-    curl --request GET http://localhost:9080/airavata-services/registry/api/get/servicedescriptors
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/servicedescriptor/exist?descriptorName=echo
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService1",
"description":"test description","inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}'
http://localhost:8080/airavata-registry/registry/api/servicedescriptor/save
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService2",
"description":"test description2","inputParams":{"dataType":"input", "description":"myinput2","name":"myinput2","type":"String"},"outputParams":{"dataType":"output","description":"myoutput2","name":"myoutput2","type":"String"}}'
http://localhost:8080/airavata-registry/registry/api/servicedescriptor/update
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/servicedescriptor/description?serviceName=echo1
+    curl --request DELETE http://localhost:8080/airavata-registry/registry/api/servicedescriptor/delete?serviceName=echo1
+    curl --request GET http://localhost:8080/airavata-registry/registry/api/get/servicedescriptors
 
     ############## Application descriptrors ##########################
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/applicationdescriptor/exist?serviceName=echo&hostName=LocalHost&descriptorName=LocalHost_application'
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1",
"hostdescName":"LocalHost", "executablePath":"cccc", "workingDir":"dddd" , "serviceDescriptor":{"inputParams":{"dataType":"input",
"description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}}'
http://localhost:9080/airavata-services/registry/api/applicationdescriptor/build/save
-     curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1",
"hostdescName":"LocalHost", "executablePath":"cccc111", "workingDir":"dddd1111" , "serviceDescriptor":{"inputParams":{"dataType":"input",
"description":"myinput11","name":"myinput11","type":"String"},"outputParams":{"dataType":"output","description":"myoutput11","name":"myoutput11","type":"String"}}}'
http://localhost:9080/airavata-services/registry/api/applicationdescriptor/update
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/applicationdescriptor/description?serviceName=echo&hostName=LocalHost&applicationName=LocalHost_application2'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/applicationdescriptors/alldescriptors/host/service?serviceName=echo&hostName=LocalHost'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/applicationdescriptor/alldescriptors/service?serviceName=echo'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/applicationdescriptor/alldescriptors'
-    curl --request DELETE 'http://localhost:9080/airavata-services/registry/api/applicationdescriptor/delete?serviceName=echo&hostName=LocalHost&appName=LocalHost_application2'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/exist?serviceName=echo&hostName=LocalHost&descriptorName=LocalHost_application'
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1",
"hostdescName":"LocalHost", "executablePath":"cccc", "workingDir":"dddd" , "serviceDescriptor":{"inputParams":{"dataType":"input",
"description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}}'
http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/build/save
+     curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1",
"hostdescName":"LocalHost", "executablePath":"cccc111", "workingDir":"dddd1111" , "serviceDescriptor":{"inputParams":{"dataType":"input",
"description":"myinput11","name":"myinput11","type":"String"},"outputParams":{"dataType":"output","description":"myoutput11","name":"myoutput11","type":"String"}}}'
http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/update
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/description?serviceName=echo&hostName=LocalHost&applicationName=LocalHost_application2'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptors/alldescriptors/host/service?serviceName=echo&hostName=LocalHost'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/alldescriptors/service?serviceName=echo'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/alldescriptors'
+    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/delete?serviceName=echo&hostName=LocalHost&appName=LocalHost_application2'
 
 ************ Project Registry *********************************
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/project/exist?projectName=default'
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-services/registry/api/add/project
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-services/registry/api/update/project
-    curl --request DELETE 'http://localhost:9080/airavata-services/registry/api/delete/project?projectName=project1'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/project?projectName=project1'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/projects'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/project/exist?projectName=default'
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:8080/airavata-registry/registry/api/add/project
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:8080/airavata-registry/registry/api/update/project
+    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/project?projectName=project1'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/project?projectName=project1'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/projects'
 
 ************* Experiments *************************************
-    curl --request DELETE 'http://localhost:9080/airavata-services/registry/api/delete/experiment?experimentId=eb9e67cf-6fe3-46f1-b50b-7b42936d347d
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiments/all'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiments/project?projectName=default'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiments/date?fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiments/project/date?projectName=default&fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1&experimentID=testexpID1&submittedDate=2012-10-18
00:00:00' http://localhost:9080/airavata-services/registry/api/add/experiment
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/experiment/exist?experimentId=testexpID1'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/experiment/notexist/create?experimentId=testExpID2&createIfNotPresent=true'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&user=abc' http://localhost:9080/airavata-services/registry/api/update/experiment
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiment/executionuser?experimentId=testExpID2'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiment/name?experimentId=testExpID2'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&experimentName=ddscsddsss111'
http://localhost:9080/airavata-services/registry/api/update/experimentname
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experimentmetadata?experimentId=testExpID2'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&metadata=aaaaaaa'
http://localhost:9080/airavata-services/registry/api/update/experimentmetadata
+    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/experiment?experimentId=eb9e67cf-6fe3-46f1-b50b-7b42936d347d
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/all'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/project?projectName=default'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/date?fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/project/date?projectName=default&fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1&experimentID=testexpID1&submittedDate=2012-10-18
00:00:00' http://localhost:8080/airavata-registry/registry/api/add/experiment
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/experiment/exist?experimentId=testexpID1'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/experiment/notexist/create?experimentId=testExpID2&createIfNotPresent=true'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&user=abc' http://localhost:8080/airavata-registry/registry/api/update/experiment
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/executionuser?experimentId=testExpID2'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/name?experimentId=testExpID2'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&experimentName=ddscsddsss111'
http://localhost:8080/airavata-registry/registry/api/update/experimentname
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentmetadata?experimentId=testExpID2'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&metadata=aaaaaaa'
http://localhost:8080/airavata-registry/registry/api/update/experimentmetadata
 
 ************* Workflow Execution *************************************
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/workflowtemplatename?workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
-    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c&templateName=wftemplate1'
http://localhost:9080/airavata-services/registry/api/update/workflowinstancetemplatename
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experimentworkflowinstances?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/workflowinstance/exist/check?instanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/workflowinstance/exist/create?instanceId=testWFInstanceID&createIfNotPresent=true'
-    curl -H "Accept: text/plain" -X POST -d 'instanceId=testWFInstanceID&executionStatus=FINISHED'
http://localhost:9080/airavata-services/registry/api/update/workflowinstancestatus/instanceid
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testWFInstanceID&workflowInstanceId=testWFInstanceID&executionStatus=STARTED&statusUpdateTime=2012-10-23
00:00:00' http://localhost:9080/airavata-services/registry/api/update/workflowinstancestatus/experimentid
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/workflowinstancestatus?instanceId=testWFInstanceID'
-    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testInputdata'
http://localhost:9080/airavata-services/registry/api/update/workflownodeinput
-    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testOutputdata'
http://localhost:9080/airavata-services/registry/api/update/workflownodeoutput
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflowtemplatename?workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
+    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c&templateName=wftemplate1'
http://localhost:8080/airavata-registry/registry/api/update/workflowinstancetemplatename
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentworkflowinstances?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/workflowinstance/exist/check?instanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/workflowinstance/exist/create?instanceId=testWFInstanceID&createIfNotPresent=true'
+    curl -H "Accept: text/plain" -X POST -d 'instanceId=testWFInstanceID&executionStatus=FINISHED'
http://localhost:8080/airavata-registry/registry/api/update/workflowinstancestatus/instanceid
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testWFInstanceID&workflowInstanceId=testWFInstanceID&executionStatus=STARTED&statusUpdateTime=2012-10-23
00:00:00' http://localhost:8080/airavata-registry/registry/api/update/workflowinstancestatus/experimentid
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflowinstancestatus?instanceId=testWFInstanceID'
+    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testInputdata'
http://localhost:8080/airavata-registry/registry/api/update/workflownodeinput
+    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testOutputdata'
http://localhost:8080/airavata-registry/registry/api/update/workflownodeoutput
 
 
 ****************** Experiment Data *************************************
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiment?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experimentId/user?username=admin'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/experiment/user?username=admin'
-    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius&executionStatus=STARTED'
http://localhost:9080/airavata-services/registry/api/update/workflownode/status
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/workflownode/status?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
-    curl --request GET 'http://localhost:9080/airavata-services/registry/api/get/workflownode/starttime?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentId/user?username=admin'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/user?username=admin'
+    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius&executionStatus=STARTED'
http://localhost:8080/airavata-registry/registry/api/update/workflownode/status
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflownode/status?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
+    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflownode/starttime?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
 
 
 

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1417155&r1=1417154&r2=1417155&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Tue Dec  4 20:28:02 2012
@@ -51,7 +51,7 @@
 								<artifactId>airavata-rest-service-webapp</artifactId>
 								<type>war</type>
 								<properties>
-									<context>/airavata-services</context>
+									<context>/airavata-registry</context>
 								</properties>
 							</deployable>
 						</deployables>

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1417155&r1=1417154&r2=1417155&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
Tue Dec  4 20:28:02 2012
@@ -181,7 +181,7 @@ public class XBayaConstants {
     public static final String STREAM_SERVER = "http://pagodatree.cs.indiana.edu:8081/axis2/services/StreamService?wsdl";
 
     public static final String STATIC_LABEL = "STATIC";
-    public static final URI REGISTRY_URL = URI.create("http://localhost:9080/airavata-services/api");
+    public static final URI REGISTRY_URL = URI.create("http://localhost:8080/airavata-registry/api");
     public static final String DEFAULT_GATEWAY = "default";
     public static final String REGISTRY_USERNAME = "admin";
     public static final String REGISTRY_PASSPHRASE = "admin";



Mime
View raw message