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/02/22 16:58:46 UTC
git commit: Removing the stale orchestrator service directory
Repository: airavata
Updated Branches:
refs/heads/master 197daf118 -> a7f35a3e0
Removing the stale orchestrator service directory
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a7f35a3e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a7f35a3e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a7f35a3e
Branch: refs/heads/master
Commit: a7f35a3e087c8c2e71d6679aacc9d880c8bff2c9
Parents: 197daf1
Author: Suresh Marru <sm...@apache.org>
Authored: Sat Feb 22 10:58:39 2014 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Sat Feb 22 10:58:39 2014 -0500
----------------------------------------------------------------------
.../orchestrator/orchestrator-service/pom.xml | 39 -------
.../src/main/resources/orchestrator.thrift | 110 -------------------
modules/orchestrator/pom.xml | 1 -
3 files changed, 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7f35a3e/modules/orchestrator/orchestrator-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
deleted file mode 100644
index 10f49c7..0000000
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator</artifactId>
- <version>0.12-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-orchestrator-service</artifactId>
- <packaging>jar</packaging>
- <name>Airavata Interpreter Service</name>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency>
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7f35a3e/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift b/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift
deleted file mode 100644
index f487ac2..0000000
--- a/modules/orchestrator/orchestrator-service/src/main/resources/orchestrator.thrift
+++ /dev/null
@@ -1,110 +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.api.execution
-
-
-struct HPCSettings {
- 1:optional string jobManager;
- 2:optional i32 cpuCount;
- 3:optional i32 nodeCount;
- 4:optional string queueName;
- 5:optional i32 maxWalltime;
-}
-
-struct HostSchedulingSettings {
- 1:optional string hostID;
- 2:optional bool isWSGramPreferred;
- 3:optional string gatekeeperEPR;
-}
-
-struct NameValuePairType {
- 1:optional string name;
- 2:optional string value;
- 3:optional string description;
-}
-
-
-struct WorkflowSchedulingSettings {
- 1:optional list<NodeSettings> nodeSettingsList;
-}
-
-struct OutputDataSettings {
- 1:optional string nodeID;
- 2:optional string outputdataDir;
- 3:optional string dataRegURL;
- 4:optional bool isdataPersisted;
-}
-
-struct WorkflowOutputDataSettings{
- 1:optional list<OutputDataSettings> outputDataSettingsList;
-}
-
-struct SSHAuthenticationSettings {
- 1:optional string accessKeyID;
- 2:optional string secretAccessKey;
-}
-
-struct MyProxyRepositorySettings {
- 1:optional string userName;
- 2:optional string password;
- 3:optional string myproxyServer;
- 4:optional i32 lifetime;
-}
-
-struct CredentialStoreSecuritySettings {
- 1:optional string tokenId;
- 2:optional string portalUser;
- 3:optional string gatewayID;
-}
-
-struct AmazonWebServicesSettings {
- 1:optional string accessKey;
- 2:optional string amiID;
- 3:optional string instanceID;
- 4:optional string instanceType;
- 5:optional string secretAccessKey;
- 6:optional string username;
-}
-
-struct SecuritySettings {
- 1:optional AmazonWebServicesSettings amazonWSSettings;
- 2:optional CredentialStoreSecuritySettings credentialStoreSettings;
- 3:optional MyProxyRepositorySettings myproxySettings;
- 4:optional SSHAuthenticationSettings sshAuthSettings;
-}
-
-struct ExperimentAdvanceOptions {
- 1:optional string executionUser;
- 2:optional string metadata;
- 3:optional string experimentName;
- 4:optional string customExperimentId;
- 5:optional WorkflowSchedulingSettings workflowSchedulingSettings;
- 6:optional WorkflowOutputDataSettings workflowOutputDataSettings;
- 7:optional SecuritySettings securitySettings;
-}
-
-Service CreateExperiment
-
-Service LaunchExperiment
-
-Service TerminateExperiment
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7f35a3e/modules/orchestrator/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/pom.xml b/modules/orchestrator/pom.xml
index 89c4c57..3819627 100644
--- a/modules/orchestrator/pom.xml
+++ b/modules/orchestrator/pom.xml
@@ -31,7 +31,6 @@
</activation>
<modules>
<module>orchestrator-core</module>
- <module>orchestrator-service</module>
</modules>
</profile>
</profiles>