This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch merge-svcs
in repository https://gitbox.apache.org/repos/asf/airavata.git
from ebfaf27149 Merge branch 'master' into merge-svcs
add 569e1cdff6 merge server properties to point to same db
No new revisions were added by this update.
Summary of changes:
.devcontainer/docker-compose-alt.yml | 49 ++----
.../src/main/java/org/apache/airavata/Main.java | 6 +-
.../db/utils/SharingRegistryJDBCConfig.java | 10 +-
.../sharing/migrator/ConnectionFactory.java | 8 +-
.../airavata/common/utils/ApplicationSettings.java | 8 -
.../apache/airavata/common/utils/Constants.java | 2 +-
.../airavata/common/utils/ServerSettings.java | 34 ++--
.../store/impl/util/CredentialStoreJDBCConfig.java | 2 +-
.../metadata/analyzer/impl/DataAnalyzerImpl.java | 4 +
.../profile/commons/utils/JPAConstants.java | 10 +-
.../registry/core/utils/AppCatalogJDBCConfig.java | 10 +-
.../registry/core/utils/ExpCatalogJDBCConfig.java | 10 +-
.../core/utils/ReplicaCatalogJDBCConfig.java | 10 +-
.../core/utils/WorkflowCatalogJDBCConfig.java | 10 +-
.../src/main/resources/airavata-server.properties | 142 +++++-----------
.../derby/airavata-server.properties | 44 +----
.../mysql/airavata-server.properties | 34 +---
.../src/test/resources/airavata-server.properties | 44 +----
.../templates/airavata-server.properties.j2 | 132 ++++-----------
.../controller/airavata-server.properties.j2 | 1 -
.../parser-wm/airavata-server.properties.j2 | 6 +-
.../participant/airavata-server.properties.j2 | 5 +-
.../post-wm/airavata-server.properties.j2 | 6 +-
.../templates/pre-wm/airavata-server.properties.j2 | 6 +-
.../templates/airavata-server.properties.j2 | 115 ++++---------
.../deployment-scripts/airavata-server.properties | 182 ++-------------------
26 files changed, 234 insertions(+), 656 deletions(-)
