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 2015/12/15 05:44:18 UTC
[6/6] airavata git commit: Organizing thrift files into directories -
AIRAVATA-1882
Organizing thrift files into directories - AIRAVATA-1882
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6c5e9954
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c5e9954
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c5e9954
Branch: refs/heads/master
Commit: 6c5e9954ab0a6ee3448500ccfd1a6181990aa87e
Parents: 9ef67cd
Author: smarru <sm...@apache.org>
Authored: Mon Dec 14 23:44:05 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Mon Dec 14 23:44:05 2015 -0500
----------------------------------------------------------------------
.../resources/lib/airavata/airavata_api_types.h | 8 +-
.../lib/airavata/experiment_model_types.h | 2 +-
.../lib/airavata/process_model_types.h | 2 +-
.../resources/lib/airavata/task_model_types.h | 2 +-
.../resources/lib/apache/airavata/api/ttypes.py | 8 +-
.../apache/airavata/model/experiment/ttypes.py | 2 +-
.../lib/apache/airavata/model/process/ttypes.py | 2 +-
.../lib/apache/airavata/model/task/ttypes.py | 2 +-
.../credentialStoreCPI.thrift | 66 -
.../credentialStoreDataModel.thrift | 61 -
.../credentialStoreErrors.thrift | 32 -
.../cs-thrift-descriptions/generate-cs-stubs.sh | 129 -
.../apache/airavata/gfac/cpi/GfacService.java | 2 +-
.../airavata/gfac/cpi/gfac_cpiConstants.java | 57 +
.../gfac/cpi/gfac_cpi_serviceConstants.java | 57 -
.../airavata/gfac/server/GfacServerHandler.java | 4 +-
.../orchestrator/cpi/OrchestratorService.java | 4 +-
.../cpi/orchestrator_cpiConstants.java | 57 +
.../cpi/orchestrator_cpi_serviceConstants.java | 57 -
.../server/OrchestratorServerHandler.java | 4 +-
.../airavata-api/airavata_api.thrift | 2366 ------------------
.../airavata-api/airavata_commons.thrift | 54 -
.../airavata-api/airavata_data_models.thrift | 47 -
.../airavata-api/airavata_errors.thrift | 172 --
.../airavata-api/app_catalog_models.thrift | 25 -
.../application_deployment_model.thrift | 153 --
.../application_interface_model.thrift | 56 -
.../airavata-api/application_io_models.thrift | 118 -
.../airavata-api/compute_resource_model.thrift | 345 ---
.../airavata-api/data_movement_models.thrift | 154 --
.../airavata-api/experiment_model.thrift | 127 -
.../gateway_resource_profile_model.thrift | 100 -
.../airavata-api/job_model.thrift | 42 -
.../airavata-api/messaging_events.thrift | 147 --
.../airavata-api/process_model.thrift | 64 -
.../airavata-api/replica_catalog_models.thrift | 62 -
.../airavata-api/scheduling_model.thrift | 41 -
.../airavata-api/security_model.thrift | 35 -
.../airavata-api/status_models.thrift | 109 -
.../airavata-api/storage_resource_model.thrift | 52 -
.../airavata-api/task_model.thrift | 109 -
.../airavata-api/workflow_api.thrift | 82 -
.../airavata-api/workflow_data_model.thrift | 43 -
.../airavata-api/workspace_model.thrift | 63 -
.../airavata-apis/airavata_api.thrift | 2366 ++++++++++++++++++
.../airavata-apis/airavata_commons.thrift | 54 +
.../airavata-apis/airavata_errors.thrift | 172 ++
.../airavata-apis/messaging_events.thrift | 147 ++
.../airavata-apis/security_model.thrift | 35 +
.../airavata-apis/workflow_api.thrift | 82 +
.../component-cpis/credential-store-cpi.thrift | 66 +
.../credential-store-data-models.thrift | 61 +
.../credential-store-errors.thrift | 32 +
.../component-cpis/generate-cpi-stubs.sh | 197 ++
.../component-cpis/gfac-cpi.thrift | 57 +
.../component-cpis/orchestrator-cpi.thrift | 80 +
.../data-models/airavata_data_models.thrift | 47 +
.../app_catalog_models.thrift | 22 +
.../application_deployment_model.thrift | 153 ++
.../application_interface_model.thrift | 56 +
.../application_io_models.thrift | 118 +
.../replica_catalog_models.thrift | 62 +
.../experiment_model.thrift | 127 +
.../experiment-catalog-models/job_model.thrift | 42 +
.../process_model.thrift | 64 +
.../scheduling_model.thrift | 41 +
.../status_models.thrift | 109 +
.../experiment-catalog-models/task_model.thrift | 109 +
.../workspace_model.thrift | 63 +
.../compute_resource_model.thrift | 345 +++
.../data_movement_models.thrift | 154 ++
.../gateway_resource_profile_model.thrift | 100 +
.../resource_catalog_models.thrift | 23 +
.../storage_resource_model.thrift | 52 +
.../workflow-models/workflow_data_model.thrift | 43 +
.../generate-thrift-stubs.sh | 37 +-
.../gfac-cpi/generate-gfac-stubs.sh | 127 -
.../gfac-cpi/gfac.cpi.service.thrift | 57 -
.../generate-orchestrator-stubs.sh | 131 -
.../orchestrator.cpi.service.thrift | 80 -
80 files changed, 5236 insertions(+), 5399 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
index 90006ea..692cd5f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
@@ -33,21 +33,21 @@
#include <thrift/cxxfunctional.h>
#include "airavata_errors_types.h"
+#include "security_model_types.h"
#include "airavata_data_models_types.h"
#include "status_models_types.h"
#include "job_model_types.h"
#include "experiment_model_types.h"
#include "workspace_model_types.h"
-#include "compute_resource_model_types.h"
-#include "storage_resource_model_types.h"
#include "scheduling_model_types.h"
#include "application_io_models_types.h"
#include "application_deployment_model_types.h"
#include "application_interface_model_types.h"
+#include "compute_resource_model_types.h"
+#include "storage_resource_model_types.h"
#include "gateway_resource_profile_model_types.h"
-#include "workflow_data_model_types.h"
-#include "security_model_types.h"
#include "data_movement_models_types.h"
+#include "workflow_data_model_types.h"
#include "replica_catalog_models_types.h"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
index ee87676..4849f84 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
@@ -32,9 +32,9 @@
#include <thrift/transport/TTransport.h>
#include <thrift/cxxfunctional.h>
+#include "airavata_commons_types.h"
#include "application_io_models_types.h"
#include "scheduling_model_types.h"
-#include "airavata_commons_types.h"
#include "status_models_types.h"
#include "process_model_types.h"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
index d3c8f28..73b96f3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
@@ -33,9 +33,9 @@
#include <thrift/cxxfunctional.h>
#include "airavata_commons_types.h"
+#include "application_io_models_types.h"
#include "status_models_types.h"
#include "task_model_types.h"
-#include "application_io_models_types.h"
#include "scheduling_model_types.h"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
index a0c89cc..c54c227 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
@@ -33,10 +33,10 @@
#include <thrift/cxxfunctional.h>
#include "airavata_commons_types.h"
-#include "status_models_types.h"
#include "compute_resource_model_types.h"
#include "data_movement_models_types.h"
#include "application_io_models_types.h"
+#include "status_models_types.h"
#include "job_model_types.h"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
index 739f337..a70cb06 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
@@ -8,21 +8,21 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.api.error.ttypes
+import apache.airavata.model.security.ttypes
import apache.airavata.model.ttypes
import apache.airavata.model.status.ttypes
import apache.airavata.model.job.ttypes
import apache.airavata.model.experiment.ttypes
import apache.airavata.model.workspace.ttypes
-import apache.airavata.model.appcatalog.computeresource.ttypes
-import apache.airavata.model.appcatalog.storageresource.ttypes
import apache.airavata.model.scheduling.ttypes
import apache.airavata.model.application.io.ttypes
import apache.airavata.model.appcatalog.appdeployment.ttypes
import apache.airavata.model.appcatalog.appinterface.ttypes
+import apache.airavata.model.appcatalog.computeresource.ttypes
+import apache.airavata.model.appcatalog.storageresource.ttypes
import apache.airavata.model.appcatalog.gatewayprofile.ttypes
-import apache.airavata.model.workflow.ttypes
-import apache.airavata.model.security.ttypes
import apache.airavata.model.data.movement.ttypes
+import apache.airavata.model.workflow.ttypes
import apache.airavata.model.data.resource.ttypes
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
index 764c5bb..3c56619 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
@@ -7,9 +7,9 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import apache.airavata.model.commons.ttypes
import apache.airavata.model.application.io.ttypes
import apache.airavata.model.scheduling.ttypes
-import apache.airavata.model.commons.ttypes
import apache.airavata.model.status.ttypes
import apache.airavata.model.process.ttypes
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
index ca8019c..b83a663 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
@@ -8,9 +8,9 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.model.commons.ttypes
+import apache.airavata.model.application.io.ttypes
import apache.airavata.model.status.ttypes
import apache.airavata.model.task.ttypes
-import apache.airavata.model.application.io.ttypes
import apache.airavata.model.scheduling.ttypes
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
index cacdef0..b89f0ad 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
@@ -8,10 +8,10 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.model.commons.ttypes
-import apache.airavata.model.status.ttypes
import apache.airavata.model.appcatalog.computeresource.ttypes
import apache.airavata.model.data.movement.ttypes
import apache.airavata.model.application.io.ttypes
+import apache.airavata.model.status.ttypes
import apache.airavata.model.job.ttypes
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/credential-store/cs-thrift-descriptions/credentialStoreCPI.thrift
----------------------------------------------------------------------
diff --git a/modules/credential-store/cs-thrift-descriptions/credentialStoreCPI.thrift b/modules/credential-store/cs-thrift-descriptions/credentialStoreCPI.thrift
deleted file mode 100644
index 59ca77e..0000000
--- a/modules/credential-store/cs-thrift-descriptions/credentialStoreCPI.thrift
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * Component Programming Interface definition for Apache Airavata GFac Service.
- *
-*/
-
-include "credentialStoreDataModel.thrift"
-include "credentialStoreErrors.thrift"
-
-namespace java org.apache.airavata.credential.store.cpi
-
-const string CS_CPI_VERSION = "0.16.0"
-
-service CredentialStoreService {
-
- /** Query CS server to fetch the CPI version */
- string getCSServiceVersion(),
-
- /**
- * This method is to add SSHCredential which will return the token Id in success
- **/
- string addSSHCredential (1: required credentialStoreDataModel.SSHCredential sshCredential)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- string addCertificateCredential (1: required credentialStoreDataModel.CertificateCredential certificateCredential)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- string addPasswordCredential (1: required credentialStoreDataModel.PasswordCredential passwordCredential)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- credentialStoreDataModel.SSHCredential getSSHCredential (1: required string tokenId, 2: required string gatewayId)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- credentialStoreDataModel.CertificateCredential getCertificateCredential (1: required string tokenId, 2: required string gatewayId)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- credentialStoreDataModel.PasswordCredential getPasswordCredential (1: required string tokenId, 2: required string gatewayId)
- throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- map<string,string> getAllSSHKeysForUser (1: required string username) throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- map<string,string> getAllSSHKeysForGateway (1: required string gatewayId) throws (1:credentialStoreErrors.CredentialStoreException csException);
-
- bool deleteSSHCredential(1: required string tokenId, 2: required string gatewayId) throws (1:credentialStoreErrors.CredentialStoreException csException);
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift
----------------------------------------------------------------------
diff --git a/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift b/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift
deleted file mode 100644
index 0f52833..0000000
--- a/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-namespace java org.apache.airavata.credential.store.datamodel
-namespace php Airavata.Model.Credential.Store
-
-
-const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
-
-
-struct SSHCredential {
- 1: required string gatewayId,
- 2: required string username,
- 3: optional string passphrase,
- 4: optional string publicKey,
- 5: optional string privateKey,
- 6: optional i64 persistedTime,
- 7: optional string token
-}
-
-struct CommunityUser {
- 1: required string gatewayName,
- 2: required string username,
- 3: required string userEmail
-}
-
-struct CertificateCredential {
- 1: required CommunityUser communityUser,
- 2: required string x509Cert,
- 3: optional string notAfter,
- 4: optional string privateKey,
- 5: optional i64 lifeTime,
- 6: optional string notBefore
- 7: optional i64 persistedTime,
- 8: optional string token
-}
-
-struct PasswordCredential {
- 1: required string username,
- 2: required string password,
- 3: optional i64 persistedTime,
- 4: optional string token
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/credential-store/cs-thrift-descriptions/credentialStoreErrors.thrift
----------------------------------------------------------------------
diff --git a/modules/credential-store/cs-thrift-descriptions/credentialStoreErrors.thrift b/modules/credential-store/cs-thrift-descriptions/credentialStoreErrors.thrift
deleted file mode 100644
index 148d7f2..0000000
--- a/modules/credential-store/cs-thrift-descriptions/credentialStoreErrors.thrift
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
-* This file describes the definitions of the Error Messages that can occur
-* when invoking Apache Airavata Services through the API. In addition Thrift provides
-* built in funcationality to raise TApplicationException for all internal server errors.
-*/
-
-namespace java org.apache.airavata.credential.store.exception
-namespace php Airavata.Credential.Store.Error
-
-exception CredentialStoreException {
- 1: required string message
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh
----------------------------------------------------------------------
diff --git a/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh b/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh
deleted file mode 100755
index cfe3844..0000000
--- a/modules/credential-store/cs-thrift-descriptions/generate-cs-stubs.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script will regenerate the thrift code for Airavata Credential Store Server Skeltons and Client Stubs.
-
-
-# Global Constants used across the script
-REQUIRED_THRIFT_VERSION='0.9.2'
-BASE_TARGET_DIR='target'
-CS_SERVICE_DIR='../credential-store-stubs/src/main/java'
-
-# The Function fail prints error messages on failure and quits the script.
-fail() {
- echo $@
- exit 1
-}
-
-# The function add_license_header adds the ASF V2 license header to all java files within the specified generated
-# directory. The function also adds suppress all warnings annotation to all public classes and enums
-# To Call:
-# add_license_header $generated_code_directory
-add_license_header() {
-
- # Fetch the generated code directory passed as the argument
- GENERATED_CODE_DIR=$1
-
- # For each java file within the generated directory, add the ASF V2 LICENSE header
- for f in $(find ${GENERATED_CODE_DIR} -name '*.java'); do
- cat - ${f} >${f}-with-license <<EOF
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-EOF
- mv ${f}-with-license ${f}
- done
-}
-
-# The function compares every generated java file with the one in specified existing source location. If the comparison
-# shows a difference, then it replaces with the newly generated file (with added license header).
-# To Call:
-# copy_changed_files $generated_code_directory $existing_source_directory
-copy_changed_files() {
-
- # Read all the function arguments
- GENERATED_CODE_DIR=$1
- WORKSPACE_SRC_DIR=$2
-
- echo "Generated sources are in ${GENERATED_CODE_DIR}"
- echo "Destination workspace is in ${WORKSPACE_SRC_DIR}"
-
- # Check if the newly generated files exist in the targetted workspace, if not copy. Only changed files will be synced.
- # the extra slash to GENERATED_CODE_DIR is needed to ensure the parent directory itself is not copied.
- rsync -auv ${GENERATED_CODE_DIR}/ ${WORKSPACE_SRC_DIR}
-}
-
-# Generation of thrift files will require installing Apache Thrift. Please add thrift to your path.
-# Verify is thrift is installed, is in the path is at a specified version.
-VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l)
-if [ "$VERSION" -ne 1 ] ; then
- echo "****************************************************"
- echo "*** thrift is not installed or is not in the path"
- echo "*** expecting 'thrift -version' to return ${REQUIRED_THRIFT_VERSION}"
- echo "*** generated code will not be updated"
- fail "****************************************************"
-fi
-
-# Initialize the thrift arguments.
-# Since most of the Airavata API and Data Models have includes, use recursive option by default.
-# Generate all the files in target directory
-THRIFT_ARGS="-r -o ${BASE_TARGET_DIR}"
-# Ensure the required target directories exists, if not create.
-mkdir -p ${BASE_TARGET_DIR}
-
-#######################################################################
-# Generate/Update the Credential Store CPI service stubs
-# To start with both the servicer and client are in same package, but
-# needs to be split using a common generated api-boilerplate-code
-#######################################################################
-
-#Java generation directory
-JAVA_GEN_DIR=${BASE_TARGET_DIR}/gen-java
-
-# As a precaution remove and previously generated files if exists
-rm -rf ${JAVA_GEN_DIR}
-
-# Using thrift Java generator, generate the java classes based on Airavata API. This
-# The airavata_api.thrift includes rest of data models.
-thrift ${THRIFT_ARGS} --gen java credentialStoreCPI.thrift || fail unable to generate java thrift classes
-thrift ${THRIFT_ARGS} --gen java credentialStoreDataModel.thrift || fail unable to generate java thrift classes
-
-
-# For the generated java classes add the ASF V2 License header
-add_license_header $JAVA_GEN_DIR
-
-# Compare the newly generated classes with existing java generated skeleton/stub sources and replace the changed ones.
-copy_changed_files ${JAVA_GEN_DIR} ${CS_SERVICE_DIR}
-
-# CleanUp: Delete the base target build directory
-#rm -rf ${BASE_TARGET_DIR}
-
-echo "Successfully generated new sources, compared against exiting code and replaced the changed files"
-exit 0
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java
index 75843aa..cc7372a 100644
--- a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java
+++ b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-14")
public class GfacService {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpiConstants.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpiConstants.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpiConstants.java
new file mode 100644
index 0000000..7220e8e
--- /dev/null
+++ b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpiConstants.java
@@ -0,0 +1,57 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.gfac.cpi;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+public class gfac_cpiConstants {
+
+ public static final String GFAC_CPI_VERSION = "0.16.0";
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java
deleted file mode 100644
index b215ebd..0000000
--- a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/gfac_cpi_serviceConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.airavata.gfac.cpi;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-public class gfac_cpi_serviceConstants {
-
- public static final String GFAC_CPI_VERSION = "0.16.0";
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 53665fd..c1c08a5 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -33,7 +33,7 @@ import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.GFacUtils;
import org.apache.airavata.gfac.core.watcher.CancelRequestWatcher;
import org.apache.airavata.gfac.cpi.GfacService;
-import org.apache.airavata.gfac.cpi.gfac_cpi_serviceConstants;
+import org.apache.airavata.gfac.cpi.gfac_cpiConstants;
import org.apache.airavata.gfac.impl.Factory;
import org.apache.airavata.gfac.impl.GFacWorker;
import org.apache.airavata.messaging.core.MessageContext;
@@ -132,7 +132,7 @@ public class GfacServerHandler implements GfacService.Iface {
}
public String getGFACServiceVersion() throws TException {
- return gfac_cpi_serviceConstants.GFAC_CPI_VERSION;
+ return gfac_cpiConstants.GFAC_CPI_VERSION;
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
index 6dbe722..373016f 100644
--- a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
+++ b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-14")
public class OrchestratorService {
public interface Iface {
@@ -78,7 +78,7 @@ public class OrchestratorService {
/**
* * In order to run single applications users should create an associating
* * process and hand it over for execution
- * * along with a credential store token for authentication
+ * * along with a credential store token for sshKeyAuthentication
* *
* * @param processId
* * @param airavataCredStoreToken
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpiConstants.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpiConstants.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpiConstants.java
new file mode 100644
index 0000000..b11f589
--- /dev/null
+++ b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpiConstants.java
@@ -0,0 +1,57 @@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.orchestrator.cpi;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+public class orchestrator_cpiConstants {
+
+ public static final String ORCHESTRATOR_CPI_VERSION = "0.16.0";
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpi_serviceConstants.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpi_serviceConstants.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpi_serviceConstants.java
deleted file mode 100644
index 5bf9119..0000000
--- a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/orchestrator_cpi_serviceConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.airavata.orchestrator.cpi;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-public class orchestrator_cpi_serviceConstants {
-
- public static final String ORCHESTRATOR_CPI_VERSION = "0.16.0";
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c5e9954/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 94e804d..9e39c47 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -55,7 +55,7 @@ import org.apache.airavata.model.status.ExperimentStatus;
import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl;
-import org.apache.airavata.orchestrator.cpi.orchestrator_cpi_serviceConstants;
+import org.apache.airavata.orchestrator.cpi.orchestrator_cpiConstants;
import org.apache.airavata.orchestrator.util.OrchestratorServerThreadPoolExecutor;
import org.apache.airavata.orchestrator.util.OrchestratorUtils;
import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource;
@@ -95,7 +95,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
* Query orchestrator server to fetch the CPI version
*/
public String getOrchestratorCPIVersion() throws TException {
- return orchestrator_cpi_serviceConstants.ORCHESTRATOR_CPI_VERSION;
+ return orchestrator_cpiConstants.ORCHESTRATOR_CPI_VERSION;
}
public OrchestratorServerHandler() throws OrchestratorException{