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/01/26 20:57:29 UTC
svn commit: r1561541 - in /airavata/trunk: ./
modules/distribution/airavata-server/src/main/resources/
modules/orchestrator/orchestrator-service/src/main/resources/
modules/thrift-interfaces/
Author: smarru
Date: Sun Jan 26 19:57:29 2014
New Revision: 1561541
URL: http://svn.apache.org/r1561541
Log:
applying patch for AIARAVATA-997 from Shameera
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE
airavata/trunk/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift
airavata/trunk/modules/thrift-interfaces/airavataApi.thrift
airavata/trunk/modules/thrift-interfaces/airavataDatastructures.thrift
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE?rev=1561541&r1=1561540&r2=1561541&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE (original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/LICENSE Sun Jan 26 19:57:29 2014
@@ -2248,7 +2248,7 @@ POSSIBILITY OF SUCH DAMAGE.
================================================================================
-gsabes-client-1.6.0.jar
+ogsabes-client-1.6.0.jar
================================================================================
Copyright (c) 2004-2010
Modified: airavata/trunk/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift?rev=1561541&r1=1561540&r2=1561541&view=diff
==============================================================================
--- airavata/trunk/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift (original)
+++ airavata/trunk/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift Sun Jan 26 19:57:29 2014
@@ -19,7 +19,7 @@
*
*/
-namespace java org.apache.airavata.orchestrator
+namespace java org.apache.airavata.api.execution
struct HPCSettings {
@@ -102,7 +102,9 @@ struct ExperimentAdvanceOptions {
7:optional SecuritySettings securitySettings;
}
-service InterpreterService {
- string createExperiment(1:string executionUser,2:string applicationName),
- string submitExperiment(1:map<string,string> applicationInputs, 2: ExperimentAdvanceOptions experimentAdOptions)
-}
\ No newline at end of file
+Service CreateExperiment
+
+Service LaunchExperiment
+
+Service TerminateExperiment
+
Modified: airavata/trunk/modules/thrift-interfaces/airavataApi.thrift
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/thrift-interfaces/airavataApi.thrift?rev=1561541&r1=1561540&r2=1561541&view=diff
==============================================================================
--- airavata/trunk/modules/thrift-interfaces/airavataApi.thrift (original)
+++ airavata/trunk/modules/thrift-interfaces/airavataApi.thrift Sun Jan 26 19:57:29 2014
@@ -91,10 +91,10 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- string createExperiment(1: required airavataDatastructures.ExperimentMetadata experimentMetadata)
- throws (1:airavataErrors.InvalidRequestException ire
- 2:airavataErrors.AiravataClientException ace,
- 3:airavataErrors.AiravataSystemException ase)
+ string createExperiment(1: airavataDatastructures.ExperimentMetadata experimentMetadata)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
/**
* Fetch previously created experiment metadata.
@@ -129,11 +129,11 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- airavataDatastructures.ExperimentMetadata getExperimentMetadata(1:required string airavataExperimentId)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ airavataDatastructures.ExperimentMetadata getExperimentMetadata(1: string airavataExperimentId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
@@ -178,12 +178,12 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- void configureExperiment(1:required string airavataExperimentId,
- 2:required airavataDatastructures.ExperimentConfigurationData experimentConfigurationData)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ void configureExperiment(1: string airavataExperimentId,
+ 2: airavataDatastructures.ExperimentConfigurationData experimentConfigurationData)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Fetch the previously configured experiment configuration information.
@@ -218,11 +218,11 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- airavataDatastructures.ExperimentConfigurationData getExperimentConfiguration(1:required string airavataExperimentId)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ airavataDatastructures.ExperimentConfigurationData getExperimentConfiguration(1: string airavataExperimentId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
@@ -267,12 +267,12 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- void launchConfiguredExperiment(1:required string airavataExperimentId
- 2:required string airavataCredStoreToken)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ void launchConfiguredExperiment(1: string airavataExperimentId
+ 2: string airavataCredStoreToken)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Configure and Launch a previously created experiment with required inputs, scheduling, security and other quality of service
@@ -322,13 +322,13 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- string configureAndLaunchExperiment (1:required string airavataExperimentId
- 2:required airavataDatastructures.ExperimentConfigurationData experimentConfigurationData,
- 3:required string airavataCredStoreToken)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ string configureAndLaunchExperiment (1: string airavataExperimentId
+ 2: airavataDatastructures.ExperimentConfigurationData experimentConfigurationData,
+ 3: string airavataCredStoreToken)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
@@ -369,12 +369,12 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- string cloneExperimentConfiguration(1:required string airavataExperimentIdToBeCloned,
- 2:required airavataDatastructures.ExperimentMetadata experimentMetadata)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ string cloneExperimentConfiguration(1: string airavataExperimentIdToBeCloned,
+ 2: airavataDatastructures.ExperimentMetadata experimentMetadata)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
/**
* Terminate a running experiment.
@@ -409,10 +409,10 @@ service Airavata {
* rather an Airavata Administrator will be notified to take corrective action.
*
*/
- void terminateExperiment(1:required string airavataExperimentId)
- throws (1:airavataErrors.InvalidRequestException ire,
- 2:airavataErrors.ExperimentNotFoundException enf,
- 3:airavataErrors.AiravataClientException ace,
- 4:airavataErrors.AiravataSystemException ase)
+ void terminateExperiment(1: string airavataExperimentId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.ExperimentNotFoundException enf,
+ 3: airavataErrors.AiravataClientException ace,
+ 4: airavataErrors.AiravataSystemException ase)
}
Modified: airavata/trunk/modules/thrift-interfaces/airavataDatastructures.thrift
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/thrift-interfaces/airavataDatastructures.thrift?rev=1561541&r1=1561540&r2=1561541&view=diff
==============================================================================
--- airavata/trunk/modules/thrift-interfaces/airavataDatastructures.thrift (original)
+++ airavata/trunk/modules/thrift-interfaces/airavataDatastructures.thrift Sun Jan 26 19:57:29 2014
@@ -18,6 +18,8 @@
*
*/
+namespace java org.apache.airavata.datamodel
+
/*
* This file describes the definitions of the Airavata Execution Data Structures. Each of the
* language specific Airavata Client SDK's will translate this neutral data model into an
@@ -25,6 +27,30 @@
*/
/**
+ * A structure holding the experiment configuration.
+ *
+ * userName:
+ * The user name of the targeted gateway end user on whose behalf the experiment is being created.
+ * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
+ * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
+ * Airavata, an authorization exception is thrown.
+ *
+ * experimentName:
+ * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
+ * by the generated experiment id.
+ *
+ * experimentDescription:
+ * The verbose description of the experiment. This is an optional parameter.
+*/
+struct ExperimentConfiguration {
+ 1: required string userName,
+ 2: required string experimentName,
+ 3: optional string experimentDescription,
+ 4: optional bool shareExperimentPublicly = 0
+}
+
+
+/**
* A structure holding the experiment metadata.
*
* userName:
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1561541&r1=1561540&r2=1561541&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Sun Jan 26 19:57:29 2014
@@ -342,11 +342,6 @@
</dependencyManagement>
<repositories>
- <repository>
- <name>ogce.m2.all</name>
- <id>ogce.m2.all</id>
- <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
- </repository>
<!--<repository>-->
<!--<name>go.nexus.repo</name>-->
<!--<id>go.nexus.repo</id>-->