airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: removing seperate app-catalog thrift server start up from destribution
Date Tue, 01 Jul 2014 19:29:44 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 81e2b9f8d -> a30f8ae67


removing seperate app-catalog thrift server start up from destribution


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a30f8ae6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a30f8ae6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a30f8ae6

Branch: refs/heads/master
Commit: a30f8ae679b8b05b6643b8a6fde1b58383bf3ea4
Parents: 81e2b9f
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Tue Jul 1 15:29:39 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Tue Jul 1 15:29:39 2014 -0400

----------------------------------------------------------------------
 .../airavata/api/server/util/Constants.java     |  4 ++--
 .../catalog/data/util/AppCatalogJPAUtils.java   | 15 ++++++++++++
 .../app/catalog/test/ComputeResourceTest.java   | 24 +++++++++++++++++---
 .../main/resources/airavata-client.properties   |  4 ++--
 .../main/resources/airavata-server.properties   |  9 ++++----
 .../main/resources/airavata-server.properties   |  8 +++----
 modules/distribution/server/pom.xml             | 10 ++++++++
 .../server/src/main/assembly/bin-assembly.xml   |  2 ++
 8 files changed, 61 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
index 92eac88..b5d2416 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
@@ -24,7 +24,7 @@ package org.apache.airavata.api.server.util;
 public class Constants {
     public static final String API_SERVER_PORT = "apiserver.server.port";
     public static final String API_SERVER_HOST = "apiserver.server.host";
-    public static final String APP_CATALOG_SERVER_PORT = "app.catalog.server.port";
-    public static final String APP_CATALOG_SERVER_HOST = "app.catalog.server.host";
+//    public static final String APP_CATALOG_SERVER_PORT = "app.catalog.server.port";
+//    public static final String APP_CATALOG_SERVER_HOST = "app.catalog.server.host";
     public static final String API_SERVER_MIN_THREADS = "apiserver.server.min.threads";
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
index 1306d3a..b5ac1af 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
@@ -169,6 +169,13 @@ public class AppCatalogJPAUtils {
                     logger.error("Object should be a GridFTPDataMovement.", new IllegalArgumentException());
                     throw new IllegalArgumentException("Object should be a GridFTPDataMovement.");
                 }
+            case GRID_FTP_DM_ENDPOINT:
+                if (o instanceof GridFTPDMEndpoint){
+                    return createGridFTPDMEP((GridFTPDMEndpoint) o);
+                }else {
+                    logger.error("Object should be a GridFTPDataMovement.", new IllegalArgumentException());
+                    throw new IllegalArgumentException("Object should be a GridFTPDataMovement.");
+                }
             case JOB_SUBMISSION_PROTOCOL:
                 if (o instanceof JobSubmissionProtocol){
                     return createJobSubmissionProtocol((JobSubmissionProtocol) o);
@@ -358,6 +365,14 @@ public class AppCatalogJPAUtils {
         return resource;
     }
 
+    private static Resource createGridFTPDMEP(GridFTPDMEndpoint o) {
+        GridFTPDMEndpointResource resource = new GridFTPDMEndpointResource();
+        resource.setDataMoveId(o.getDataMoveId());
+        resource.setEndpoint(o.getEndpoint());
+        resource.setGridFTPDataMovementResource((GridFTPDataMovementResource)createGridFTPDataMovement(o.getGridFTPDataMovement()));
+        return resource;
+    }
+
     private static Resource createJobSubmissionProtocol(JobSubmissionProtocol o) {
         JobSubmissionProtocolResource resource = new JobSubmissionProtocolResource();
         resource.setResourceID(o.getResourceID());

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
index 1a465df..ab12ae4 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
@@ -99,9 +99,27 @@ public class ComputeResourceTest {
 
             String resourceId = computeResource.addComputeResource(description);
             System.out.println("**********Resource id ************* : " +  resourceId);
-            ComputeResourceDescription host = computeResource.getComputeResource(resourceId);
-            System.out.println("**********Resource name ************* : " +  host.getHostName());
-            assertTrue("Compute resource save successfully", host!=null);
+            ComputeResourceDescription host = null;
+            if (computeResource.isComputeResourceExists(resourceId)){
+                host = computeResource.getComputeResource(resourceId);
+                System.out.println("**********Resource name ************* : " +  host.getHostName());
+            }
+
+            SSHJobSubmission sshJobSubmission = computeResource.getSSHJobSubmission(sshsubmissionId);
+            System.out.println("**********SSH Submission resource job manager *************
: " +  sshJobSubmission.getResourceJobManager().toString());
+
+            GSISSHJobSubmission gsisshJobSubmission = computeResource.getGSISSHJobSubmission(gsiSSHsubmissionId);
+            System.out.println("**********GSISSH Submission resource job manager *************
: " +  gsisshJobSubmission.getResourceJobManager().toString());
+
+            GlobusJobSubmission globusJobSubmission = computeResource.getGlobusJobSubmission(globusSubmissionId);
+            System.out.println("**********Globus Submission resource job manager *************
: " + globusJobSubmission.getResourceJobManager().toString());
+
+            SCPDataMovement scpDataMovement = computeResource.getSCPDataMovement(scpDataMoveId);
+            System.out.println("**********SCP Data Move Security protocol ************* :
" + scpDataMovement.getSecurityProtocol().toString());
+
+            GridFTPDataMovement gridFTPDataMovement = computeResource.getGridFTPDataMovement(gridFTPDataMoveId);
+            System.out.println("**********GRID FTP Data Move Security protocol *************
: " + gridFTPDataMovement.getSecurityProtocol().toString());
+            assertTrue("Compute resource save successfully", host != null);
         } catch (AppCatalogException e) {
             e.printStackTrace();
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/configuration/client/src/main/resources/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties
index b0b3f90..bc70787 100644
--- a/modules/configuration/client/src/main/resources/airavata-client.properties
+++ b/modules/configuration/client/src/main/resources/airavata-client.properties
@@ -93,6 +93,6 @@ xbaya.default.gateway=default
 thrift.server.host=localhost
 thrift.server.port=8930
 
-app.catalog.server.host=${thrift.server.host}
-app.catalog.server.port=8931
+#app.catalog.server.host=${thrift.server.host}
+#app.catalog.server.port=8931
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index ecc0932..794dcf7 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -293,11 +293,12 @@ orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
 apiserver=org.apache.airavata.api.server.AiravataAPIServer
 
 ###---------------------------Application Catalog Server module Configurations---------------------------###
-appcatalogserver=org.apache.airavata.api.server.ApplicationCatalogServer
+#appcatalogserver=org.apache.airavata.api.server.ApplicationCatalogServer
 
 
 ###---------------------------Airavata Server Configurations---------------------------###
-servers=apiserver,appcatalogserver,orchestrator,gfac
+#servers=apiserver,appcatalogserver,orchestrator,gfac
+servers=apiserver,orchestrator,gfac
 #shutdown.trategy=NONE
 shutdown.trategy=SELF_TERMINATE
 
@@ -325,8 +326,8 @@ email.from=airavata@apache.org
 apiserver.server.host=localhost
 apiserver.server.port=8930
 apiserver.server.min.threads=30
-app.catalog.server.host=localhost
-app.catalog.server.port=8931
+#app.catalog.server.host=localhost
+#app.catalog.server.port=8931
 orchestrator.server.host=localhost
 orchestrator.server.port=8940
 gfac.server.host=localhost

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
b/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
index 5f34f8c..1e64c99 100644
--- a/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
+++ b/modules/credential-store-service/credential-store-webapp/src/main/resources/airavata-server.properties
@@ -293,11 +293,11 @@ orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
 apiserver=org.apache.airavata.api.server.AiravataAPIServer
 
 ###---------------------------Application Catalog Server module Configurations---------------------------###
-appcatalogserver=org.apache.airavata.api.server.ApplicationCatalogServer
+#appcatalogserver=org.apache.airavata.api.server.ApplicationCatalogServer
 
 
 ###---------------------------Airavata Server Configurations---------------------------###
-servers=apiserver,appcatalogserver,orchestrator
+servers=apiserver,orchestrator
 #shutdown.trategy=NONE
 shutdown.trategy=SELF_TERMINATE
 
@@ -325,8 +325,8 @@ email.from=airavata@apache.org
 apiserver.server.host=localhost
 apiserver.server.port=8930
 apiserver.server.min.threads=30
-app.catalog.server.host=localhost
-app.catalog.server.port=8931
+#app.catalog.server.host=localhost
+#app.catalog.server.port=8931
 orchestrator.server.host=localhost
 orchestrator.server.port=8940
 orchestrator.server.min.threads=30

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index 91eb02a..fcc4ec4 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -244,6 +244,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
+            <artifactId>app-catalog-cpi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>app-catalog-data</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a30f8ae6/modules/distribution/server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/assembly/bin-assembly.xml b/modules/distribution/server/src/main/assembly/bin-assembly.xml
index 8a51725..dcfa0a1 100644
--- a/modules/distribution/server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/server/src/main/assembly/bin-assembly.xml
@@ -202,6 +202,8 @@
                 <include>org.apache.airavata:airavata-workflow-execution-context:jar</include>
                 <include>org.apache.airavata:airavata-registry-cpi:jar</include>
                 <include>org.apache.airavata:airavata-jpa-registry:jar</include>
+                <include>org.apache.airavata:app-catalog-cpi:jar</include>
+                <include>org.apache.airavata:app-catalog-data:jar</include>
                 <include>org.apache.airavata:airavata-data-models:jar</include>
                 <include>org.apache.airavata:airavata-credential-store:jar</include>
                 <include>org.apache.airavata:airavata-gfac-core:jar</include>


Mime
View raw message