You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/01 12:25:39 UTC
[6/6] git commit: Pointing libs to airavata SDK - AIRAVATA-1274
Pointing libs to airavata SDK - AIRAVATA-1274
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/01f648a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/01f648a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/01f648a5
Branch: refs/heads/master
Commit: 01f648a5c6cf4b95122bac17cb373e01d9341fb7
Parents: 465ca53
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Jul 1 06:25:21 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Jul 1 06:25:21 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 2 +-
.../server/handler/AiravataServerHandler.java | 50 +
.../java/org/apache/airavata/api/Airavata.java | 17009 +++++++++++------
.../src/main/resources/lib/Airavata.cpp | 1518 +-
.../src/main/resources/lib/Airavata.h | 612 +
.../resources/lib/Airavata_server.skeleton.cpp | 20 +
.../src/main/resources/lib/airavataAPI_types.h | 5 +-
.../resources/lib/Airavata/API/Airavata.php | 1120 ++
.../API/AppCatalog/ApplicationCatalogAPI.php | 7306 -------
.../lib/Airavata/API/AppCatalog/Types.php | 22 -
.../Model/Application/Deployment/Types.php | 602 -
.../Model/Application/Interface/Types.php | 633 -
.../airavata-client-properties.ini | 3 +-
samples/php-cli-samples/getAppModule.php | 95 +
samples/php-cli-samples/registerAppModule.php | 102 +
15 files changed, 14421 insertions(+), 14678 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/01f648a5/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index 599de49..4969f15 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -58,7 +58,7 @@ public class AiravataAPIServer implements IServer{
public void StartAiravataServer(Airavata.Processor<Airavata.Iface> airavataAPIServer) throws AiravataSystemException {
try {
AiravataUtils.setExecutionAsServer();
- //RegistryInitUtil.initializeDB();
+ RegistryInitUtil.initializeDB();
final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_PORT,"8930"));
final String serverHost = ServerSettings.getSetting(Constants.API_SERVER_HOST, null);
http://git-wip-us.apache.org/repos/asf/airavata/blob/01f648a5/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index b332cd8..9ec8354 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -34,6 +34,7 @@ import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.airavataAPIConstants;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.error.AiravataErrorType;
import org.apache.airavata.model.error.AiravataSystemException;
@@ -1150,4 +1151,53 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher {
client.terminateExperiment(airavataExperimentId);
}
+ /**
+ * Register a Application Module.
+ *
+ * @param applicationModule Application Module Object created from the datamodel.
+ * @return appModuleId
+ * Returns a server-side generated airavata appModule globally unique identifier.
+ */
+ @Override
+ public String registerAppicationModule(ApplicationModule applicationModule) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ return null;
+ }
+
+ /**
+ * Fetch a Application Module.
+ *
+ * @param appModuleId The identifier for the requested application module
+ * @return applicationModule
+ * Returns a application Module Object.
+ */
+ @Override
+ public ApplicationModule getAppicationModule(String appModuleId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ return null;
+ }
+
+ /**
+ * Update a Application Module.
+ *
+ * @param appModuleId The identifier for the requested application module to be updated.
+ * @param applicationModule Application Module Object created from the datamodel.
+ * @return status
+ * Returns a success/failure of the update.
+ */
+ @Override
+ public boolean updateAppicationModule(String appModuleId, ApplicationModule applicationModule) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ return false;
+ }
+
+ /**
+ * Delete a Application Module.
+ *
+ * @param appModuleId The identifier for the requested application module to be deleted.
+ * @return status
+ * Returns a success/failure of the deletion.
+ */
+ @Override
+ public boolean deleteAppicationModule(String appModuleId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ return false;
+ }
+
}