You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/02/16 22:26:05 UTC
[1/2] airavata git commit: updating the credential-store-mysql.sql
Repository: airavata
Updated Branches:
refs/heads/develop 614f8bbf5 -> 2c2d63d04
updating the credential-store-mysql.sql
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7a345e54
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7a345e54
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7a345e54
Branch: refs/heads/develop
Commit: 7a345e547487b0cf78eb1805f25bb053ad49a840
Parents: d8df3d0
Author: scnakandala <su...@gmail.com>
Authored: Tue Feb 16 16:25:34 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Feb 16 16:25:34 2016 -0500
----------------------------------------------------------------------
.../scripts/credential-store-mysql.sql | 28 +++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a345e54/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql b/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
index 50d5e0f..b0e4fb9 100644
--- a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
+++ b/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
@@ -20,23 +20,19 @@
*/
CREATE TABLE COMMUNITY_USER
(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
+ PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
);
-
CREATE TABLE CREDENTIALS
(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- CREDENTIAL TEXT NOT NULL,
- PRIVATE_KEY TEXT NOT NULL,
- NOT_BEFORE VARCHAR(256) NOT NULL,
- NOT_AFTER VARCHAR(256) NOT NULL,
- LIFETIME MEDIUMINT NOT NULL,
- REQUESTING_PORTAL_USER_NAME VARCHAR(256) NOT NULL,
- REQUESTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ CREDENTIAL BLOB NOT NULL,
+ PORTAL_USER_ID VARCHAR(256) NOT NULL,
+ TIME_PERSISTED TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
+ PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
+);
\ No newline at end of file
[2/2] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2c2d63d0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c2d63d0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c2d63d0
Branch: refs/heads/develop
Commit: 2c2d63d04deba0e4828bb08c6a176f2af44c87b7
Parents: 7a345e5 614f8bb
Author: scnakandala <su...@gmail.com>
Authored: Tue Feb 16 16:26:02 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Feb 16 16:26:02 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 26 +-
.../java/org/apache/airavata/api/Airavata.java | 990 ++++++++++----
.../main/resources/lib/airavata/Airavata.cpp | 217 ++--
.../src/main/resources/lib/airavata/Airavata.h | 728 ++++++++---
.../lib/airavata/Airavata_server.skeleton.cpp | 633 ++++++---
.../lib/airavata/workflow_data_model_types.cpp | 966 +++++++++++++-
.../lib/airavata/workflow_data_model_types.h | 444 ++++++-
.../resources/lib/Airavata/API/Airavata.php | 667 +++++++---
.../main/resources/lib/Airavata/Model/Types.php | 885 ++++++++++++-
.../lib/apache/airavata/api/Airavata-remote | 14 +-
.../lib/apache/airavata/api/Airavata.py | 1224 +++++++++++++-----
.../apache/airavata/model/workflow/ttypes.py | 671 +++++++++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../org/apache/airavata/model/Workflow.java | 1055 ---------------
.../apache/airavata/model/WorkflowModel.java | 339 ++++-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../server/src/main/resources/gfac-config.yaml | 2 +-
.../gfac/core/cluster/RemoteCluster.java | 3 +
.../airavata/gfac/impl/BESRemoteCluster.java | 6 +
.../org/apache/airavata/gfac/impl/Factory.java | 30 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 8 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 6 +
.../server/OrchestratorServerHandler.java | 11 +-
.../app/catalog/impl/StorageResourceImpl.java | 14 +
.../resources/StorageInterfaceResource.java | 4 +-
.../catalog/impl/WorkflowCatalogImpl.java | 8 +-
.../utils/WorkflowCatalogThriftConversion.java | 6 +-
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../airavata/registry/cpi/StorageResource.java | 2 +
.../airavata/registry/cpi/WorkflowCatalog.java | 7 +-
modules/workflow/workflow-core/pom.xml | 5 +
.../core/SimpleWorkflowInterpreter.java | 328 -----
.../airavata/workflow/core/WorkflowBuilder.java | 21 +
.../workflow/core/WorkflowEnactmentService.java | 28 +-
.../airavata/workflow/core/WorkflowFactory.java | 1 +
.../airavata/workflow/core/WorkflowInfo.java | 87 ++
.../workflow/core/WorkflowInterpreter.java | 336 +++++
.../airavata/workflow/core/WorkflowParser.java | 46 -
.../workflow/core/dag/edge/DirectedEdge.java | 4 +
.../core/dag/nodes/ApplicationNode.java | 5 +
.../core/dag/nodes/ApplicationNodeImpl.java | 11 +
.../workflow/core/dag/nodes/InputNode.java | 8 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 110 +-
.../workflow/core/dag/nodes/OutputNode.java | 2 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 89 +-
.../workflow/core/dag/port/InputPortIml.java | 17 +
.../workflow/core/dag/port/OutPortImpl.java | 17 +
.../airavata/workflow/core/dag/port/Port.java | 7 +
.../core/parser/JsonWorkflowParser.java | 689 +++++++++-
.../workflow/core/parser/ParserException.java | 40 +
.../workflow/core/parser/WorkflowParser.java | 47 +
.../airavata/workflow/core/WorkflowDAGTest.java | 46 -
.../core/parser/JsonWorkflowParserTest.java | 123 +-
.../src/test/resources/TestWorkflow.json | 28 +-
.../airavata-apis/airavata_api.thrift | 11 +-
134 files changed, 8163 insertions(+), 3074 deletions(-)
----------------------------------------------------------------------