airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [41/47] git commit: removed unnecessary files, updated ini file
Date Sat, 12 Jul 2014 04:08:59 GMT
removed unnecessary files, updated ini file


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/00b8aaf0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/00b8aaf0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/00b8aaf0

Branch: refs/heads/master
Commit: 00b8aaf0521ecfc17b0dc4ef53fc30376d4716be
Parents: f891b7d
Author: ixxi-2013 <nadeem.cs.iit@gmail.com>
Authored: Fri Jul 11 11:50:12 2014 +0200
Committer: ixxi-2013 <nadeem.cs.iit@gmail.com>
Committed: Fri Jul 11 11:50:12 2014 +0200

----------------------------------------------------------------------
 .../airavata-client-properties.ini              |     2 -
 .../main/resources/client samples/compile.sh~   |     5 -
 .../resources/client samples/createExperiment   |   Bin 2015358 -> 0 bytes
 .../client samples/createExperiment.cpp         |    21 +-
 .../client samples/createExperiment.cpp~        |   161 -
 .../main/resources/client samples/createProject |   Bin 2007964 -> 0 bytes
 .../resources/client samples/createProject.cpp  |    17 +-
 .../resources/client samples/createProject.cpp~ |   105 -
 .../client samples/getExperimentOutputs         |   Bin 2007971 -> 0 bytes
 .../client samples/getExperimentOutputs.cpp     |    18 +-
 .../client samples/getExperimentOutputs.cpp~    |   108 -
 .../client samples/getExperimentStatus          |   Bin 2007970 -> 0 bytes
 .../client samples/getExperimentStatus.cpp      |    18 +-
 .../client samples/getExperimentStatus.cpp~     |   105 -
 .../resources/client samples/launchExperiment   |   Bin 2007967 -> 0 bytes
 .../client samples/launchExperiment.cpp         |    17 +-
 .../client samples/launchExperiment.cpp~        |   104 -
 .../src/main/resources/lib/Airavata.cpp         | 26734 -----------------
 .../src/main/resources/lib/Airavata.h           | 11188 -------
 .../resources/lib/Airavata_server.skeleton.cpp  |   399 -
 .../resources/lib/ApplicationCatalogAPI.cpp     |  9387 ------
 .../main/resources/lib/ApplicationCatalogAPI.h  |  4069 ---
 .../ApplicationCatalogAPI_server.skeleton.cpp   |   169 -
 .../src/main/resources/lib/Workflow.cpp         |  2497 --
 .../src/main/resources/lib/Workflow.h           |  1154 -
 .../resources/lib/Workflow_server.skeleton.cpp  |    74 -
 .../resources/lib/airavataAPI_constants.cpp     |    19 -
 .../main/resources/lib/airavataAPI_constants.h  |    25 -
 .../main/resources/lib/airavataAPI_types.cpp    |    13 -
 .../src/main/resources/lib/airavataAPI_types.h  |    30 -
 .../lib/airavataDataModel_constants.cpp         |    17 -
 .../resources/lib/airavataDataModel_constants.h |    24 -
 .../resources/lib/airavataDataModel_types.cpp   |    13 -
 .../resources/lib/airavataDataModel_types.h     |    24 -
 .../resources/lib/airavataErrors_constants.cpp  |    17 -
 .../resources/lib/airavataErrors_constants.h    |    24 -
 .../main/resources/lib/airavataErrors_types.cpp |   820 -
 .../main/resources/lib/airavataErrors_types.h   |   509 -
 .../lib/applicationCatalogAPI_constants.cpp     |    19 -
 .../lib/applicationCatalogAPI_constants.h       |    25 -
 .../lib/applicationCatalogAPI_types.cpp         |    13 -
 .../resources/lib/applicationCatalogAPI_types.h |    27 -
 .../applicationCatalogDataModel_constants.cpp   |    19 -
 .../lib/applicationCatalogDataModel_constants.h |    25 -
 .../lib/applicationCatalogDataModel_types.cpp   |  1327 -
 .../lib/applicationCatalogDataModel_types.h     |   713 -
 .../applicationDeploymentModel_constants.cpp    |    19 -
 .../lib/applicationDeploymentModel_constants.h  |    25 -
 .../lib/applicationDeploymentModel_types.cpp    |   497 -
 .../lib/applicationDeploymentModel_types.h      |   275 -
 .../lib/applicationInterfaceModel_constants.cpp |    19 -
 .../lib/applicationInterfaceModel_constants.h   |    25 -
 .../lib/applicationInterfaceModel_types.cpp     |   470 -
 .../lib/applicationInterfaceModel_types.h       |   298 -
 .../lib/computeResourceModel_constants.cpp      |    19 -
 .../lib/computeResourceModel_constants.h        |    25 -
 .../lib/computeResourceModel_types.cpp          |  1515 -
 .../resources/lib/computeResourceModel_types.h  |   842 -
 .../resources/lib/experimentModel_constants.cpp |    23 -
 .../resources/lib/experimentModel_constants.h   |    27 -
 .../resources/lib/experimentModel_types.cpp     |  3339 --
 .../main/resources/lib/experimentModel_types.h  |  2077 --
 .../lib/gatewayProfileModel_constants.cpp       |    19 -
 .../lib/gatewayProfileModel_constants.h         |    25 -
 .../resources/lib/gatewayProfileModel_types.cpp |   293 -
 .../resources/lib/gatewayProfileModel_types.h   |   197 -
 .../gatewayResourceProfileModel_constants.cpp   |    19 -
 .../lib/gatewayResourceProfileModel_constants.h |    25 -
 .../lib/gatewayResourceProfileModel_types.cpp   |   293 -
 .../lib/gatewayResourceProfileModel_types.h     |   197 -
 .../resources/lib/workflowAPI_constants.cpp     |    19 -
 .../main/resources/lib/workflowAPI_constants.h  |    25 -
 .../main/resources/lib/workflowAPI_types.cpp    |    13 -
 .../src/main/resources/lib/workflowAPI_types.h  |    30 -
 .../lib/workflowDataModel_constants.cpp         |    19 -
 .../resources/lib/workflowDataModel_constants.h |    25 -
 .../resources/lib/workflowDataModel_types.cpp   |   108 -
 .../resources/lib/workflowDataModel_types.h     |    82 -
 .../resources/lib/workspaceModel_constants.cpp  |    17 -
 .../resources/lib/workspaceModel_constants.h    |    24 -
 .../main/resources/lib/workspaceModel_types.cpp |   464 -
 .../main/resources/lib/workspaceModel_types.h   |   273 -
 82 files changed, 34 insertions(+), 71683 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/airavata-client-properties.ini
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/airavata-client-properties.ini b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/airavata-client-properties.ini
index 132c3f4..b2e2095 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/airavata-client-properties.ini	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/airavata-client-properties.ini	
@@ -2,5 +2,3 @@
 AIRAVATA_SERVER = "localhost"
 AIRAVATA_PORT = 8930
 AIRAVATA_TIMEOUT = 5000
-APP_CATALOG_SERVER = "gw111.iu.xsede.org"
-APP_CATALOG_PORT = 8931

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/compile.sh~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/compile.sh~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/compile.sh~
deleted file mode 100755
index a4286ee..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/compile.sh~	
+++ /dev/null
@@ -1,5 +0,0 @@
-g++ -Wall -I/home/ixxi-2013/Desktop/airavata-trunk/airavata/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ -L/usr/local/lib -W -Wno-write-strings   -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H  `pkg-config --cflags glib-2.0` createProject.cpp `pkg-config --libs glib-2.0` -lthrift -o createProject
-g++ -Wall -I/home/ixxi-2013/Desktop/airavata-trunk/airavata/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ -L/usr/local/lib -W -Wno-write-strings   -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H  `pkg-config --cflags glib-2.0` createExperiment.cpp `pkg-config --libs glib-2.0` -lthrift -o createExperiment
-g++ -Wall -I/home/ixxi-2013/Desktop/airavata-trunk/airavata/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ -L/usr/local/lib -W -Wno-write-strings   -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H  `pkg-config --cflags glib-2.0` launchExperiment.cpp `pkg-config --libs glib-2.0` -lthrift -o launchExperiment
-g++ -Wall -I/home/ixxi-2013/Desktop/airavata-trunk/airavata/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ -L/usr/local/lib -W -Wno-write-strings   -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H  `pkg-config --cflags glib-2.0` getExperimentStatus.cpp `pkg-config --libs glib-2.0` -lthrift -o getExperimentStatus
-g++ -Wall -I/home/ixxi-2013/Desktop/airavata-trunk/airavata/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ -L/usr/local/lib -W -Wno-write-strings   -DHAVE_INTTYPES_H -DHAVE_NETINET_IN_H  `pkg-config --cflags glib-2.0` getExperimentOutputs.cpp `pkg-config --libs glib-2.0` -lthrift -o getExperimentOutputs

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment
deleted file mode 100755
index 3aba779..0000000
Binary files a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp
index 7a899e7..8d43ddc 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp	
@@ -37,8 +37,8 @@
 
 
 typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
+        gchar *airavata_server;
+        gint airavata_port, airavata_timeout;
 } Settings;
 
 using namespace std;
@@ -48,7 +48,7 @@ using namespace apache::thrift::transport;
 using namespace apache::airavata::api;
 using namespace apache::airavata::model::workspace::experiment;
 
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
+void readConfigFile(char* cfgfile, string& airavata_server, int& airavata_port, int& airavata_timeout) {
 
         Settings *conf;
         GKeyFile *keyfile;
@@ -57,19 +57,14 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
         keyfile = g_key_file_new ();        				
         if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
                 g_error (error->message);
-        } else {
-                
+        } else {                
                 conf = g_slice_new (Settings);
                 conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
                 airavata_server = conf->airavata_server;
                 conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
                 airavata_port = conf->airavata_port;
                 conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
+                airavata_timeout = conf->airavata_timeout;                
         }				
 
 }
@@ -78,11 +73,11 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
 int main(int argc, char **argv)
 {
         
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
+        int airavata_port, airavata_timeout;
+        string airavata_server;
 				char* cfgfile;
 				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
+        readConfigFile(cfgfile, airavata_server, airavata_port, airavata_timeout);				
 				airavata_server.erase(0,1);
 				airavata_server.erase(airavata_server.length()-1,1);			
 			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp~
deleted file mode 100644
index b82e995..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createExperiment.cpp~	
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <glib.h>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-
-#define _WIN32_WINNT 0x501
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TBufferTransports.cpp>
-#include <thrift/transport/TSocket.cpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.tcc>
-#include <thrift/TApplicationException.cpp>
-#include <thrift/transport/TTransportException.cpp>
-#include <thrift/protocol/TProtocolException.h>
-#include "../lib/airavata/Airavata.h"
-#include "../lib/airavata/Airavata.cpp"
-#include "../lib/airavata/airavataDataModel_types.h"
-#include "../lib/airavata/airavataDataModel_types.cpp"
-#include "../lib/airavata/airavataErrors_types.h"
-#include "../lib/airavata/airavataErrors_types.cpp"
-#include "../lib/airavata/experimentModel_types.h"
-#include "../lib/airavata/experimentModel_types.cpp"
-#include "../lib/airavata/workspaceModel_types.h"
-#include "../lib/airavata/workspaceModel_types.cpp"
-#include "../lib/airavata/airavataAPI_types.h"
-#include "../lib/airavata/airavataAPI_types.cpp"
-#include "../lib/airavata/applicationDeploymentModel_types.h"
-#include "../lib/airavata/applicationDeploymentModel_types.cpp"
-#include "../lib/airavata/applicationInterfaceModel_types.h"
-#include "../lib/airavata/applicationInterfaceModel_types.cpp"
-#include "../lib/airavata/gatewayResourceProfileModel_types.h"
-#include "../lib/airavata/gatewayResourceProfileModel_types.cpp"
-#include "../lib/airavata/computeResourceModel_types.h"
-#include "../lib/airavata/computeResourceModel_types.cpp"
-
-
-typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
-} Settings;
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::airavata::api;
-using namespace apache::airavata::model::workspace::experiment;
-
-void readConfigFile(char* cfgfile, char*& airavata_server, char*& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
-
-        Settings *conf;
-        GKeyFile *keyfile;
-        GKeyFileFlags flags;
-        GError *error = NULL;        
-        keyfile = g_key_file_new ();        				
-        if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
-                g_error (error->message);
-        } else {
-                
-                conf = g_slice_new (Settings);
-                conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
-                airavata_server = conf->airavata_server;
-                conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
-                airavata_port = conf->airavata_port;
-                conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
-        }				
-
-}
-
-int main(int argc, char **argv)
-{
-        
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
-				char* cfgfile;
-				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
-				airavata_server.erase(0,1);
-				airavata_server.erase(airavata_server.length()-1,1);			
-			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));
-				socket->setSendTimeout(airavata_timeout);
-  			boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));	
-  			boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-				AiravataClient airavataclient(protocol);
-				transport->open();
-				
-				if(argc !=4){
-					cout << "Usage: ./createExperiment <username> <experiment_name> <project_ID>";
-					return 0;
-				}
-				/* ComputationalResourceScheduling data for Trestles*/
-        ComputationalResourceScheduling cmRST;
-        cmRST.__set_resourceHostId("trestles.sdsc.edu");
-        cmRST.__set_computationalProjectAccount("sds128");
-        cmRST.__set_totalCPUCount(1);
-        cmRST.__set_nodeCount(1);
-        cmRST.__set_numberOfThreads(0);
-        cmRST.__set_queueName("normal");
-        cmRST.__set_wallTimeLimit(15);
-        cmRST.__set_jobStartTime(0);
-        cmRST.__set_totalPhysicalMemory(0);
-
-
-				UserConfigurationData userConfigurationData;
-        userConfigurationData.__set_airavataAutoSchedule(0);
-        userConfigurationData.__set_overrideManualScheduledParams(0);
-        userConfigurationData.__set_computationalResourceScheduling(cmRST);
-       
-				
-				/*Application ID for Trestles */
-        char* appId = "SimpleEcho2";        
-
-				 /* Experiment input and output data. */
-        DataObjectType input;
-        input.__set_key("echo_input");
-        input.__set_value("echo_output=Hello World");
-        input.__set_type(DataType::STRING);
-				std::vector<DataObjectType> exInputs;
-				exInputs.push_back(input);				
-        DataObjectType output;
-        output.__set_key("echo_output");
-        output.__set_value("");
-        output.__set_type(DataType::STRING);
-				std::vector<DataObjectType> exOutputs;
-				exOutputs.push_back(output);
-        
-        
-				char* user = argv[1];
-        char* exp_name = argv[2];
-        char* proj = argv[3];
-
-        Experiment experiment;
-        experiment.__set_projectID(proj);
-        experiment.__set_userName(user);
-        experiment.__set_name(exp_name);
-        experiment.__set_applicationId(appId);
-        experiment.__set_userConfigurationData(userConfigurationData);
-        experiment.__set_experimentInputs(exInputs);
-        experiment.__set_experimentOutputs(exOutputs);
-								
-				string _return = "";
-        airavataclient.createExperiment(_return, experiment);
-
-        if (_return!="")
-        {
-            
-            cout << "Experiment " << _return <<" created! \n    ";
-        }
-        else
-        {
-            cout << "Failed to create experiment. \n";
-        }
-				transport->close();
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject
deleted file mode 100755
index 4bf3bd2..0000000
Binary files a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp
index 8e9125c..b259f58 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp	
@@ -47,7 +47,7 @@ using namespace apache::thrift::protocol;
 using namespace apache::thrift::transport;
 using namespace apache::airavata::api;
 
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
+void readConfigFile(char* cfgfile, string& airavata_server, int& airavata_port, int& airavata_timeout) {
 
         Settings *conf;
         GKeyFile *keyfile;
@@ -56,19 +56,14 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
         keyfile = g_key_file_new ();        				
         if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
                 g_error (error->message);
-        } else {
-                
+        } else {                
                 conf = g_slice_new (Settings);
                 conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
                 airavata_server = conf->airavata_server;
                 conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
                 airavata_port = conf->airavata_port;
                 conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
+                airavata_timeout = conf->airavata_timeout;                
         }				
 
 }
@@ -77,11 +72,11 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
 int main(int argc, char **argv)
 {
         
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
+        int airavata_port, airavata_timeout;
+        string airavata_server;
 				char* cfgfile;
 				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
+        readConfigFile(cfgfile, airavata_server, airavata_port, airavata_timeout);				
 				airavata_server.erase(0,1);
 				airavata_server.erase(airavata_server.length()-1,1);			
 			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp~
deleted file mode 100644
index 6e28622..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/createProject.cpp~	
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <glib.h>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-
-#define _WIN32_WINNT 0x501
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TBufferTransports.cpp>
-#include <thrift/transport/TSocket.cpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.tcc>
-#include <thrift/TApplicationException.cpp>
-#include <thrift/transport/TTransportException.cpp>
-#include <thrift/protocol/TProtocolException.h>
-#include "../lib/airavata/Airavata.h"
-#include "../lib/airavata/Airavata.cpp"
-#include "../lib/airavata/airavataDataModel_types.h"
-#include "../lib/airavata/airavataDataModel_types.cpp"
-#include "../lib/airavata/airavataErrors_types.h"
-#include "../lib/airavata/airavataErrors_types.cpp"
-#include "../lib/airavata/experimentModel_types.h"
-#include "../lib/airavata/experimentModel_types.cpp"
-#include "../lib/airavata/workspaceModel_types.h"
-#include "../lib/airavata/workspaceModel_types.cpp"
-#include "../lib/airavata/airavataAPI_types.h"
-#include "../lib/airavata/airavataAPI_types.cpp"
-#include "../lib/airavata/applicationDeploymentModel_types.h"
-#include "../lib/airavata/applicationDeploymentModel_types.cpp"
-#include "../lib/airavata/applicationInterfaceModel_types.h"
-#include "../lib/airavata/applicationInterfaceModel_types.cpp"
-#include "../lib/airavata/gatewayResourceProfileModel_types.h"
-#include "../lib/airavata/gatewayResourceProfileModel_types.cpp"
-#include "../lib/airavata/computeResourceModel_types.h"
-#include "../lib/airavata/computeResourceModel_types.cpp"
-
-
-typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
-} Settings;
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::airavata::api;
-
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
-
-        Settings *conf;
-        GKeyFile *keyfile;
-        GKeyFileFlags flags;
-        GError *error = NULL;        
-        keyfile = g_key_file_new ();        				
-        if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
-                g_error (error->message);
-        } else {
-                
-                conf = g_slice_new (Settings);
-                conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
-                airavata_server = conf->airavata_server;
-                conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
-                airavata_port = conf->airavata_port;
-                conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
-        }				
-
-}
-
-
-int main(int argc, char **argv)
-{
-        
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
-				char* cfgfile;
-				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
-				airavata_server.erase(0,1);
-				airavata_server.erase(airavata_server.length()-1,1);			
-			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));
-				socket->setSendTimeout(airavata_timeout);
-  			boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));	
-  			boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-				AiravataClient airavataclient(protocol);
-				transport->open();
-				
-				apache::airavata::model::workspace::Project project;
-				if(argc !=3){
-					cout << "Usage: ./createProject [owner] [name]";
-					return 0;
-				}
-				project.owner=argv[1];
-				project.name=argv[2];
-				std::string _return;
-				airavataclient.createProject(_return,project);
-				cout << _return << "\n";
-				transport->close();
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs
deleted file mode 100755
index 8d16b5f..0000000
Binary files a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp
index 0264a0c..9a279ec 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp	
@@ -48,7 +48,7 @@ using namespace apache::thrift::transport;
 using namespace apache::airavata::api;
 using namespace apache::airavata::model::workspace::experiment;
 
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
+void readConfigFile(char* cfgfile, string& airavata_server, int& airavata_port, int& airavata_timeout) {
 
         Settings *conf;
         GKeyFile *keyfile;
@@ -57,31 +57,27 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
         keyfile = g_key_file_new ();        				
         if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
                 g_error (error->message);
-        } else {
-                
+        } else {                
                 conf = g_slice_new (Settings);
                 conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
                 airavata_server = conf->airavata_server;
                 conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
                 airavata_port = conf->airavata_port;
                 conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
+                airavata_timeout = conf->airavata_timeout;                
         }				
 
 }
 
+
 int main(int argc, char **argv)
 {
         
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
+        int airavata_port, airavata_timeout;
+        string airavata_server;
 				char* cfgfile;
 				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
+        readConfigFile(cfgfile, airavata_server, airavata_port, airavata_timeout);				
 				airavata_server.erase(0,1);
 				airavata_server.erase(airavata_server.length()-1,1);			
 			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp~
deleted file mode 100644
index 6b6eab7..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentOutputs.cpp~	
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <glib.h>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-
-#define _WIN32_WINNT 0x501
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TBufferTransports.cpp>
-#include <thrift/transport/TSocket.cpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.tcc>
-#include <thrift/TApplicationException.cpp>
-#include <thrift/transport/TTransportException.cpp>
-#include <thrift/protocol/TProtocolException.h>
-#include "../lib/airavata/Airavata.h"
-#include "../lib/airavata/Airavata.cpp"
-#include "../lib/airavata/airavataDataModel_types.h"
-#include "../lib/airavata/airavataDataModel_types.cpp"
-#include "../lib/airavata/airavataErrors_types.h"
-#include "../lib/airavata/airavataErrors_types.cpp"
-#include "../lib/airavata/experimentModel_types.h"
-#include "../lib/airavata/experimentModel_types.cpp"
-#include "../lib/airavata/workspaceModel_types.h"
-#include "../lib/airavata/workspaceModel_types.cpp"
-#include "../lib/airavata/airavataAPI_types.h"
-#include "../lib/airavata/airavataAPI_types.cpp"
-#include "../lib/airavata/applicationDeploymentModel_types.h"
-#include "../lib/airavata/applicationDeploymentModel_types.cpp"
-#include "../lib/airavata/applicationInterfaceModel_types.h"
-#include "../lib/airavata/applicationInterfaceModel_types.cpp"
-#include "../lib/airavata/gatewayResourceProfileModel_types.h"
-#include "../lib/airavata/gatewayResourceProfileModel_types.cpp"
-#include "../lib/airavata/computeResourceModel_types.h"
-#include "../lib/airavata/computeResourceModel_types.cpp"
-
-
-typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
-} Settings;
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::airavata::api;
-using namespace apache::airavata::model::workspace::experiment;
-
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
-
-        Settings *conf;
-        GKeyFile *keyfile;
-        GKeyFileFlags flags;
-        GError *error = NULL;        
-        keyfile = g_key_file_new ();        				
-        if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
-                g_error (error->message);
-        } else {
-                
-                conf = g_slice_new (Settings);
-                conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
-                airavata_server = conf->airavata_server;
-                conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
-                airavata_port = conf->airavata_port;
-                conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
-        }				
-
-}
-
-int main(int argc, char **argv)
-{
-        
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
-				char* cfgfile;
-				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
-				airavata_server.erase(0,1);
-				airavata_server.erase(airavata_server.length()-1,1);			
-			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));
-				socket->setSendTimeout(airavata_timeout);
-  			boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));	
-  			boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-				AiravataClient airavataclient(protocol);
-				transport->open();
-				
-				
-				if(argc !=2){
-					cout << "Usage: ./getExperimentOutputs <experimentID>";
-					return 0;
-				}
-				char* expId = argv[1];			
-				std::vector<DataObjectType> _return;
-   			airavataclient.getExperimentOutputs(_return, expId);
-				int i;
-				for(i=0; i<_return.size();i++){
-					cout << _return[i].value;
-				}
-				transport->close();
-				
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus
deleted file mode 100755
index cff68b0..0000000
Binary files a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp
index 75c44ee..611ddac 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp	
@@ -48,7 +48,7 @@ using namespace apache::thrift::transport;
 using namespace apache::airavata::api;
 using namespace apache::airavata::model::workspace::experiment;
 
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
+void readConfigFile(char* cfgfile, string& airavata_server, int& airavata_port, int& airavata_timeout) {
 
         Settings *conf;
         GKeyFile *keyfile;
@@ -57,31 +57,27 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
         keyfile = g_key_file_new ();        				
         if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
                 g_error (error->message);
-        } else {
-                
+        } else {                
                 conf = g_slice_new (Settings);
                 conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
                 airavata_server = conf->airavata_server;
                 conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
                 airavata_port = conf->airavata_port;
                 conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
+                airavata_timeout = conf->airavata_timeout;                
         }				
 
 }
 
+
 int main(int argc, char **argv)
 {
         
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
+        int airavata_port, airavata_timeout;
+        string airavata_server;
 				char* cfgfile;
 				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
+        readConfigFile(cfgfile, airavata_server, airavata_port, airavata_timeout);				
 				airavata_server.erase(0,1);
 				airavata_server.erase(airavata_server.length()-1,1);			
 			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp~
deleted file mode 100644
index 39b15a4..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/getExperimentStatus.cpp~	
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <glib.h>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-
-#define _WIN32_WINNT 0x501
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TBufferTransports.cpp>
-#include <thrift/transport/TSocket.cpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.tcc>
-#include <thrift/TApplicationException.cpp>
-#include <thrift/transport/TTransportException.cpp>
-#include <thrift/protocol/TProtocolException.h>
-#include "../lib/airavata/Airavata.h"
-#include "../lib/airavata/Airavata.cpp"
-#include "../lib/airavata/airavataDataModel_types.h"
-#include "../lib/airavata/airavataDataModel_types.cpp"
-#include "../lib/airavata/airavataErrors_types.h"
-#include "../lib/airavata/airavataErrors_types.cpp"
-#include "../lib/airavata/experimentModel_types.h"
-#include "../lib/airavata/experimentModel_types.cpp"
-#include "../lib/airavata/workspaceModel_types.h"
-#include "../lib/airavata/workspaceModel_types.cpp"
-#include "../lib/airavata/airavataAPI_types.h"
-#include "../lib/airavata/airavataAPI_types.cpp"
-#include "../lib/airavata/applicationDeploymentModel_types.h"
-#include "../lib/airavata/applicationDeploymentModel_types.cpp"
-#include "../lib/airavata/applicationInterfaceModel_types.h"
-#include "../lib/airavata/applicationInterfaceModel_types.cpp"
-#include "../lib/airavata/gatewayResourceProfileModel_types.h"
-#include "../lib/airavata/gatewayResourceProfileModel_types.cpp"
-#include "../lib/airavata/computeResourceModel_types.h"
-#include "../lib/airavata/computeResourceModel_types.cpp"
-
-
-typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
-} Settings;
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::airavata::api;
-using namespace apache::airavata::model::workspace::experiment;
-
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
-
-        Settings *conf;
-        GKeyFile *keyfile;
-        GKeyFileFlags flags;
-        GError *error = NULL;        
-        keyfile = g_key_file_new ();        				
-        if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
-                g_error (error->message);
-        } else {
-                
-                conf = g_slice_new (Settings);
-                conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
-                airavata_server = conf->airavata_server;
-                conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
-                airavata_port = conf->airavata_port;
-                conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
-        }				
-
-}
-
-int main(int argc, char **argv)
-{
-        
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
-				char* cfgfile;
-				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
-				airavata_server.erase(0,1);
-				airavata_server.erase(airavata_server.length()-1,1);			
-			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));
-				socket->setSendTimeout(airavata_timeout);
-  			boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));	
-  			boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-				AiravataClient airavataclient(protocol);
-				transport->open();
-				
-				
-				if(argc !=2){
-					cout << "Usage: ./getExperimentStatus <experimentID>";
-					return 0;
-				}
-				char* expId = argv[1];			
-				ExperimentStatus _return;		
-   			airavataclient.getExperimentStatus(_return, expId);
-   			cout << _return.experimentState;
-				transport->close();
-				
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment
deleted file mode 100755
index 05d75e0..0000000
Binary files a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp
index d3b8337..8c26881 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp	
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp	
@@ -47,7 +47,7 @@ using namespace apache::thrift::protocol;
 using namespace apache::thrift::transport;
 using namespace apache::airavata::api;
 
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
+void readConfigFile(char* cfgfile, string& airavata_server, int& airavata_port, int& airavata_timeout) {
 
         Settings *conf;
         GKeyFile *keyfile;
@@ -56,19 +56,14 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
         keyfile = g_key_file_new ();        				
         if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
                 g_error (error->message);
-        } else {
-                
+        } else {                
                 conf = g_slice_new (Settings);
                 conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
                 airavata_server = conf->airavata_server;
                 conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
                 airavata_port = conf->airavata_port;
                 conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
+                airavata_timeout = conf->airavata_timeout;                
         }				
 
 }
@@ -77,11 +72,11 @@ void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_
 int main(int argc, char **argv)
 {
         
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
+        int airavata_port, airavata_timeout;
+        string airavata_server;
 				char* cfgfile;
 				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
+        readConfigFile(cfgfile, airavata_server, airavata_port, airavata_timeout);				
 				airavata_server.erase(0,1);
 				airavata_server.erase(airavata_server.length()-1,1);			
 			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));

http://git-wip-us.apache.org/repos/asf/airavata/blob/00b8aaf0/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp~
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp~ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp~
deleted file mode 100644
index a7a7551..0000000
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/client samples/launchExperiment.cpp~	
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <glib.h>
-#include <iostream>
-#include <stdint.h>
-#include <sys/time.h>
-
-#define _WIN32_WINNT 0x501
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TBufferTransports.cpp>
-#include <thrift/transport/TSocket.cpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.tcc>
-#include <thrift/TApplicationException.cpp>
-#include <thrift/transport/TTransportException.cpp>
-#include <thrift/protocol/TProtocolException.h>
-#include "../lib/airavata/Airavata.h"
-#include "../lib/airavata/Airavata.cpp"
-#include "../lib/airavata/airavataDataModel_types.h"
-#include "../lib/airavata/airavataDataModel_types.cpp"
-#include "../lib/airavata/airavataErrors_types.h"
-#include "../lib/airavata/airavataErrors_types.cpp"
-#include "../lib/airavata/experimentModel_types.h"
-#include "../lib/airavata/experimentModel_types.cpp"
-#include "../lib/airavata/workspaceModel_types.h"
-#include "../lib/airavata/workspaceModel_types.cpp"
-#include "../lib/airavata/airavataAPI_types.h"
-#include "../lib/airavata/airavataAPI_types.cpp"
-#include "../lib/airavata/applicationDeploymentModel_types.h"
-#include "../lib/airavata/applicationDeploymentModel_types.cpp"
-#include "../lib/airavata/applicationInterfaceModel_types.h"
-#include "../lib/airavata/applicationInterfaceModel_types.cpp"
-#include "../lib/airavata/gatewayResourceProfileModel_types.h"
-#include "../lib/airavata/gatewayResourceProfileModel_types.cpp"
-#include "../lib/airavata/computeResourceModel_types.h"
-#include "../lib/airavata/computeResourceModel_types.cpp"
-
-
-typedef struct {
-        gchar *airavata_server, *app_catalog_server;
-        gint airavata_port, app_catalog_port, airavata_timeout;
-} Settings;
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::airavata::api;
-
-void readConfigFile(char* cfgfile, string& airavata_server, string& app_catalog_server, int& airavata_port, int& app_catalog_port, int& airavata_timeout) {
-
-        Settings *conf;
-        GKeyFile *keyfile;
-        GKeyFileFlags flags;
-        GError *error = NULL;        
-        keyfile = g_key_file_new ();        				
-        if (!g_key_file_load_from_file (keyfile, cfgfile, flags, &error)) {
-                g_error (error->message);
-        } else {
-                
-                conf = g_slice_new (Settings);
-                conf->airavata_server    = g_key_file_get_string(keyfile, "airavata", "AIRAVATA_SERVER", NULL);
-                airavata_server = conf->airavata_server;
-                conf->airavata_port      = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_PORT", NULL);
-                airavata_port = conf->airavata_port;
-                conf->airavata_timeout  = g_key_file_get_integer(keyfile, "airavata", "AIRAVATA_TIMEOUT", NULL);
-                airavata_timeout = conf->airavata_timeout;
-                conf->app_catalog_server  = g_key_file_get_string(keyfile, "airavata", "APP_CATALOG_SERVER", NULL);
-                app_catalog_server = conf->app_catalog_server;
-                conf->app_catalog_port      = g_key_file_get_integer(keyfile, "airavata", "APP_CATALOG_PORT", NULL);
-                app_catalog_port = conf->app_catalog_port;
-        }				
-
-}
-
-
-int main(int argc, char **argv)
-{
-        
-        int airavata_port, app_catalog_port, airavata_timeout;
-        string airavata_server, app_catalog_server;
-				char* cfgfile;
-				cfgfile = "./airavata-client-properties.ini";
-        readConfigFile(cfgfile, airavata_server, app_catalog_server, airavata_port, app_catalog_port, airavata_timeout);				
-				airavata_server.erase(0,1);
-				airavata_server.erase(airavata_server.length()-1,1);			
-			  boost::shared_ptr<TSocket> socket(new TSocket(airavata_server, airavata_port));
-				socket->setSendTimeout(airavata_timeout);
-  			boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));	
-  			boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-				AiravataClient airavataclient(protocol);
-				transport->open();
-				
-				
-				if(argc !=2){
-					cout << "Usage: ./launchExperiment [experiment ID]";
-					return 0;
-				}
-				char* expId = argv[1];					
-   			airavataclient.launchExperiment(expId, "airavataToken");
-   			cout << "Experiment " << expId << " is launched.\n";
-				transport->close();
-				
-}


Mime
View raw message