airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: fixing startup script issues relating to reg server
Date Mon, 08 Aug 2016 19:38:38 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 4e9c4f049 -> 7666d32c8


fixing startup script issues relating to reg server


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

Branch: refs/heads/develop
Commit: 7666d32c80094628bb46c7bd1947ce402dd33fee
Parents: 4e9c4f0
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Aug 8 15:38:34 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Aug 8 15:38:34 2016 -0400

----------------------------------------------------------------------
 .../main/resources/bin/airavata-server-start.sh   |  4 ++--
 .../src/main/resources/airavata-server.properties | 18 +++++++++---------
 .../registry-server/registry-api-service/pom.xml  |  2 ++
 .../registry/api/service/util/Constants.java      |  6 +++---
 .../api/service/util/ReplicaCatalogInitUtil.java  |  2 +-
 .../registry-server/registry-api-stubs/pom.xml    |  2 ++
 6 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
index eb1b077..f44661b 100644
--- a/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -43,7 +43,7 @@ do
             JAVA_OPTS="${JAVA_OPTS} -Djava.security.manager -Djava.security.policy=${AIRAVATA_HOME}/conf/axis2.policy
-Daxis2.home=${AIRAVATA_HOME}"
             shift
         ;;
-	    apiserver | gfac | orchestrator | credentialstore)
+	    apiserver | gfac | orchestrator | credentialstore | regserver)
 	        if [ -z ${SERVERS} ] ; then
 	            SERVERS="${var}"
 	        else
@@ -71,7 +71,7 @@ do
             echo "  gfac                Start gfac server"
             echo "  orchestrator        Start orchestrator server"
             echo "  credentialstore     Start credentialstore server"
-            echo "  registry            Start registry server"
+            echo "  regserver           Start registry server"
             echo "  all                 Start all servers in one JVM"
 
             echo "command options:"

http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/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 a2cb584..4fcdd03 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -134,15 +134,6 @@ start.submitter=true
 embedded.mode=true
 enable.validation=true
 
-###########################################################################
-#  Registry Server Configurations
-###########################################################################
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-regserver.server.name=regserver-node0
-regserver.server.host=localhost
-regserver.server.port=8960
-regserver.server.min.threads=50
-
 
 ###########################################################################
 #  GFac Server Configurations
@@ -155,6 +146,15 @@ gfac.thread.pool.size=50
 host.scheduler=org.apache.airavata.gfac.impl.DefaultHostScheduler
 
 
+###########################################################################
+#  Registry Server Configurations
+###########################################################################
+regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
+regserver.server.name=regserver-node0
+regserver.server.host=localhost
+regserver.server.port=8970
+regserver.server.min.threads=50
+
 
 ###########################################################################
 # Airavata Workflow Interpreter Configurations

http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/modules/registry/registry-server/registry-api-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/pom.xml b/modules/registry/registry-server/registry-api-service/pom.xml
index 7cd8b29..ea6722b 100644
--- a/modules/registry/registry-server/registry-api-service/pom.xml
+++ b/modules/registry/registry-server/registry-api-service/pom.xml
@@ -10,6 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>registry-api-service</artifactId>
+    <packaging>jar</packaging>
+    <url>http://airavata.apache.org/</url>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
index 90046c3..ed2b471 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
@@ -22,8 +22,8 @@
 package org.apache.airavata.registry.api.service.util;
 
 public class Constants {
-    public static final String REGISTRY_SERVER_PORT = "regserver.port";
-    public static final String REGISTRY_SERVER_HOST = "regserver.host";
-	public static final String REGISTRY_SERVER_NAME = "regserver.name";
+    public static final String REGISTRY_SERVER_PORT = "regserver.server.port";
+    public static final String REGISTRY_SERVER_HOST = "regserver.server.host";
+	public static final String REGISTRY_SERVER_NAME = "regserver.server.name";
     public static final String REGISTRY_SERVER_MIN_THREADS = "regserver.server.min.threads";
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
index 996afaf..b25d4d1 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
@@ -35,7 +35,7 @@ import java.sql.SQLException;
 
 public class ReplicaCatalogInitUtil {
     private static final Logger logger = LoggerFactory.getLogger(ReplicaCatalogInitUtil.class);
-    public static final String REPLICA_CATALOG = "REPLICA_CATALOG";
+    public static final String REPLICA_CATALOG = "DATA_PRODUCT";
     public static final String REPLICA_CATALOG_JDBC_DRIVER = "replicacatalog.jdbc.driver";
     public static final String REPLICA_CATALOG_JDBC_URL = "replicacatalog.jdbc.url";
     public static final String REPLICA_CATALOG_JDBC_USER = "replicacatalog.jdbc.user";

http://git-wip-us.apache.org/repos/asf/airavata/blob/7666d32c/modules/registry/registry-server/registry-api-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-stubs/pom.xml b/modules/registry/registry-server/registry-api-stubs/pom.xml
index 818db67..44f5ec1 100644
--- a/modules/registry/registry-server/registry-api-stubs/pom.xml
+++ b/modules/registry/registry-server/registry-api-stubs/pom.xml
@@ -10,6 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>registry-api-stubs</artifactId>
+    <packaging>jar</packaging>
+    <url>http://airavata.apache.org/</url>
 
     <dependencies>
         <dependency>


Mime
View raw message