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/06/30 04:34:35 UTC
[1/2] git commit: using service names to disambiguate
Repository: airavata
Updated Branches:
refs/heads/master 8b8dca6ac -> 6f0b74c51
using service names to disambiguate
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ce127985
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ce127985
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ce127985
Branch: refs/heads/master
Commit: ce1279854f8e695d2de0b6a515043132c76f0a5b
Parents: 373d1dd
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 22:34:21 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 22:34:21 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/api/server/AiravataAPIServer.java | 8 ++++----
.../java/org/apache/airavata/gfac/server/GfacServer.java | 4 ++--
.../airavata/orchestrator/server/OrchestratorServer.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce127985/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 44484b9..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
@@ -55,7 +55,7 @@ public class AiravataAPIServer implements IServer{
setStatus(ServerStatus.STOPPED);
}
- public void StartAiravataServer(Airavata.Processor<Airavata.Iface> mockAiravataServer) throws AiravataSystemException {
+ public void StartAiravataServer(Airavata.Processor<Airavata.Iface> airavataAPIServer) throws AiravataSystemException {
try {
AiravataUtils.setExecutionAsServer();
RegistryInitUtil.initializeDB();
@@ -73,7 +73,7 @@ public class AiravataAPIServer implements IServer{
TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_MIN_THREADS, "30"));
- server = new TThreadPoolServer(options.processor(mockAiravataServer));
+ server = new TThreadPoolServer(options.processor(airavataAPIServer));
new Thread() {
public void run() {
server.serve();
@@ -118,9 +118,9 @@ public class AiravataAPIServer implements IServer{
@Override
public void start() throws Exception {
setStatus(ServerStatus.STARTING);
- Airavata.Processor<Airavata.Iface> mockAiravataServer =
+ Airavata.Processor<Airavata.Iface> airavataAPIServer =
new Airavata.Processor<Airavata.Iface>(new AiravataServerHandler());
- StartAiravataServer(mockAiravataServer);
+ StartAiravataServer(airavataAPIServer);
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce127985/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
index f96e40f..e355071 100644
--- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
+++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
@@ -99,9 +99,9 @@ public class GfacServer implements IServer{
public void start() throws Exception {
setStatus(IServer.ServerStatus.STARTING);
- GfacService.Processor<GfacServerHandler> mockAiravataServer =
+ GfacService.Processor<GfacServerHandler> gfacService =
new GfacService.Processor<GfacServerHandler>(new GfacServerHandler());
- StartGfacServer(mockAiravataServer);
+ StartGfacServer(gfacService);
}
public void stop() throws Exception {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce127985/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
index 4fce52f..d86960c 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
@@ -111,9 +111,9 @@ public class OrchestratorServer implements IServer{
@Override
public void start() throws Exception {
setStatus(ServerStatus.STARTING);
- OrchestratorService.Processor<OrchestratorServerHandler> mockAiravataServer =
+ OrchestratorService.Processor<OrchestratorServerHandler> orchestratorService =
new OrchestratorService.Processor<OrchestratorServerHandler>(new OrchestratorServerHandler());
- StartOrchestratorServer(mockAiravataServer);
+ StartOrchestratorServer(orchestratorService);
}
@Override
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6f0b74c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6f0b74c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6f0b74c5
Branch: refs/heads/master
Commit: 6f0b74c5116361df06709ce21cbcff7189fb40bc
Parents: ce12798 8b8dca6
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 22:34:31 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 22:34:31 2014 -0400
----------------------------------------------------------------------
.../org/airavata/appcatalog/cpi/AppCatalog.java | 20 +-
.../appcatalog/cpi/ApplicationDeployment.java | 10 +-
.../appcatalog/cpi/ApplicationInterface.java | 22 +-
.../appcatalog/cpi/ComputeResource.java | 46 +--
.../catalog/data/impl/AppCatalogImpl.java | 44 +++
.../data/impl/ApplicationDeploymentImpl.java | 57 ++++
.../data/impl/ApplicationInterfaceImpl.java | 88 ++++++
.../catalog/data/impl/ComputeResourceImpl.java | 300 +++++++++++++++++++
.../catalog/data/model/ComputeResource.java | 10 -
.../catalog/data/model/GlobusGKEndPointPK.java | 64 ++++
.../catalog/data/model/GlobusGKEndpoint.java | 65 ++++
.../data/resources/AbstractResource.java | 6 +
.../data/resources/ComputeHostResource.java | 11 -
.../resources/GlobusGKEndpointResource.java | 292 ++++++++++++++++++
.../catalog/data/util/AppCatalogJPAUtils.java | 16 +-
.../data/util/AppCatalogResourceType.java | 1 +
.../data/util/AppCatalogThriftConversion.java | 36 +++
.../catalog/data/util/AppCatalogUtils.java | 31 ++
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/appcatalog-derby.sql | 10 +-
.../src/main/resources/appcatalog-mysql.sql | 10 +-
21 files changed, 1072 insertions(+), 68 deletions(-)
----------------------------------------------------------------------