You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/03/12 14:06:50 UTC
[airavata] branch helix-integration updated: Restructuring property
files
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch helix-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/helix-integration by this push:
new ab8435b Restructuring property files
ab8435b is described below
commit ab8435b2574e555736059ef0e81800293e4a02bb
Author: dimuthu <di...@gmail.com>
AuthorDate: Mon Mar 12 10:06:38 2018 -0400
Restructuring property files
---
.../main/resources/conf/airavata-server.properties | 76 +---------------------
.../src/main/resources/conf/application.properties | 3 -
.../src/main/resources/conf/log4j.properties | 18 ++++-
.../src/main/resources/airavata-server.properties | 9 ++-
.../src/main/resources/application.properties | 20 ------
.../src/main/resources/log4j.properties | 2 +-
6 files changed, 29 insertions(+), 99 deletions(-)
diff --git a/modules/airavata-helix-distribution/src/main/resources/conf/airavata-server.properties b/modules/airavata-helix-distribution/src/main/resources/conf/airavata-server.properties
index 19b3b3d..b0508a2 100644
--- a/modules/airavata-helix-distribution/src/main/resources/conf/airavata-server.properties
+++ b/modules/airavata-helix-distribution/src/main/resources/conf/airavata-server.properties
@@ -1,5 +1,3 @@
-#
-#
# 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
@@ -52,11 +50,6 @@ default.registry.password.hash.method=SHA
default.registry.gateway=default
super.tenant.gatewayId=default
-# Properties for cluster status monitoring
-# cluster status monitoring job repeat time in seconds
-cluster.status.monitoring.enable=false
-cluster.status.monitoring.repeat.time=18000
-
###########################################################################
# Application Catalog DB Configuration
###########################################################################
@@ -84,19 +77,6 @@ replicacatalog.jdbc.password=eroma123456
replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
###########################################################################
-# Workflow Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#workflowcatalog.jdbc.url=jdbc:derby://localhost:1527/workflow_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mariadb://149.165.168.248:3306/replica_catalog
-workflowcatalog.jdbc.user=eroma
-workflowcatalog.jdbc.password=eroma123456
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
# Sharing Catalog DB Configuration
###########################################################################
#for derby [AiravataJPARegistry]
@@ -117,21 +97,6 @@ sharing.registry.server.host=192.168.99.102
sharing.registry.server.port=7878
###########################################################################
-# User Profile MongoDB Configuration
-###########################################################################
-userprofile.mongodb.host=localhost
-userprofile.mongodb.port=27017
-
-
-###########################################################################
-# Server module Configuration
-###########################################################################
-#credential store server should be started before API server
-#This is obsolete property with new script files.
-#servers=credentialstore,apiserver,orchestrator
-
-
-###########################################################################
# API Server Configurations
###########################################################################
apiserver=org.apache.airavata.api.server.AiravataAPIServer
@@ -141,21 +106,6 @@ apiserver.port=8930
apiserver.min.threads=50
###########################################################################
-# Orchestrator Server Configurations
-###########################################################################
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-orchestrator.server.name=orchestrator-node0
-orchestrator.server.host=192.168.99.102
-orchestrator.server.port=8940
-orchestrator.server.min.threads=50
-job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
-enable.validation=true
-
-###########################################################################
# Registry Server Configurations
###########################################################################
regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
@@ -164,28 +114,6 @@ regserver.server.host=192.168.99.102
regserver.server.port=8970
regserver.server.min.threads=50
-###########################################################################
-# GFac Server Configurations
-###########################################################################
-gfac=org.apache.airavata.gfac.server.GfacServer
-gfac.server.name=gfac-node0
-gfac.server.host=10.0.2.15
-gfac.server.port=8950
-gfac.thread.pool.size=50
-host.scheduler=org.apache.airavata.gfac.impl.DefaultHostScheduler
-
-
-
-###########################################################################
-# Airavata Workflow Interpreter Configurations
-###########################################################################
-workflowserver=org.apache.airavata.api.server.WorkflowServer
-enactment.thread.pool.size=10
-
-#to define custom workflow parser user following property
-#workflow.parser=org.apache.airavata.workflow.core.parser.AiravataWorkflowBuilder
-
-
###########################################################################
# Job Scheduler can send informative email messages to you about the status of your job.
@@ -202,7 +130,7 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url=/Users/dimuthu/code/fork/airavata/modules/helix-spectator/src/main/resources/cred_store.jks
+credential.store.keystore.url=/Users/dimuthu/code/reference/airavata/modules/airavata-helix-distribution/src/main/resources/conf/cred_store.jks
credential.store.keystore.alias=seckey
credential.store.keystore.password=credstore123
credential.store.jdbc.url=jdbc:mariadb://149.165.168.248:3306/credential_store
@@ -269,6 +197,8 @@ kafka.broker.consumer.group=MonitoringConsumer
helix.cluster.name=AiravataDemoCluster
pre.workflow.manager.name=prewm
post.workflow.manager.name=postwm
+helix.controller.name=helixcontroller
+helix.participant.name=helixparticipant
###########################################################################
# AMQP Notification Configuration
diff --git a/modules/airavata-helix-distribution/src/main/resources/conf/application.properties b/modules/airavata-helix-distribution/src/main/resources/conf/application.properties
deleted file mode 100644
index b4b8048..0000000
--- a/modules/airavata-helix-distribution/src/main/resources/conf/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-zookeeper.connection.url=localhost:2199
-helix.cluster.name=AiravataDemoCluster
-participant.name=all-p3
\ No newline at end of file
diff --git a/modules/airavata-helix-distribution/src/main/resources/conf/log4j.properties b/modules/airavata-helix-distribution/src/main/resources/conf/log4j.properties
index 04aa72a..870e7f0 100644
--- a/modules/airavata-helix-distribution/src/main/resources/conf/log4j.properties
+++ b/modules/airavata-helix-distribution/src/main/resources/conf/log4j.properties
@@ -1,3 +1,19 @@
+# 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.
# Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=INFO, A1
@@ -10,4 +26,4 @@ log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] [E=%X{experiment},P=%X{process},T=%X{task},G=%X{gateway}] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.A1.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-4r [%t] %-5p %c %x - %m [E=%X{experiment},P=%X{process},T=%X{task},G=%X{gateway}]%n
\ No newline at end of file
diff --git a/modules/airavata-helix/helix-spectator/src/main/resources/airavata-server.properties b/modules/airavata-helix/helix-spectator/src/main/resources/airavata-server.properties
index 764f005..b0508a2 100644
--- a/modules/airavata-helix/helix-spectator/src/main/resources/airavata-server.properties
+++ b/modules/airavata-helix/helix-spectator/src/main/resources/airavata-server.properties
@@ -43,6 +43,13 @@ jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
enable.sharing=true
+# Properties for default user mode
+default.registry.user=default-admin
+default.registry.password=123456
+default.registry.password.hash.method=SHA
+default.registry.gateway=default
+super.tenant.gatewayId=default
+
###########################################################################
# Application Catalog DB Configuration
###########################################################################
@@ -123,7 +130,7 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-credential.store.keystore.url=/Users/dimuthu/code/fork/airavata/modules/helix-spectator/src/main/resources/cred_store.jks
+credential.store.keystore.url=/Users/dimuthu/code/reference/airavata/modules/airavata-helix-distribution/src/main/resources/conf/cred_store.jks
credential.store.keystore.alias=seckey
credential.store.keystore.password=credstore123
credential.store.jdbc.url=jdbc:mariadb://149.165.168.248:3306/credential_store
diff --git a/modules/airavata-helix/helix-spectator/src/main/resources/application.properties b/modules/airavata-helix/helix-spectator/src/main/resources/application.properties
deleted file mode 100644
index 6d416dd..0000000
--- a/modules/airavata-helix/helix-spectator/src/main/resources/application.properties
+++ /dev/null
@@ -1,20 +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.
-
-zookeeper.connection.url=localhost:2199
-helix.cluster.name=AiravataDemoCluster
-participant.name=all-p3
\ No newline at end of file
diff --git a/modules/airavata-helix/helix-spectator/src/main/resources/log4j.properties b/modules/airavata-helix/helix-spectator/src/main/resources/log4j.properties
index fa71331..870e7f0 100644
--- a/modules/airavata-helix/helix-spectator/src/main/resources/log4j.properties
+++ b/modules/airavata-helix/helix-spectator/src/main/resources/log4j.properties
@@ -26,4 +26,4 @@ log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] [E=%X{experiment},P=%X{process},T=%X{task},G=%X{gateway}] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.A1.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-4r [%t] %-5p %c %x - %m [E=%X{experiment},P=%X{process},T=%X{task},G=%X{gateway}]%n
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.