This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from ac30f48 Added new next TDB domain and SSL certificates to the gateway
add 8ce886b AIRAVATA-2938 Change DB Initialization to use
registry-refactoring scripts
add d200a8d AIRAVATA-2938 Removing dependency on registry-core
add 76a0357 AIRAVATA-2938 explicitly set CHARACTER SET on all tables
add c490b84 AIRAVATA-2938 Convert credential store to DBInitializer
add db5b321 AIRAVATA-2938 Convert sharing registry to use common
DBInitializer
add 40a2fba AIRAVATA-2938 Allow "mariadb" in JDBC url to identity a
"mysql" type DB
add 55cb6a1 AIRAVATA-2938 Fixing path to sharing registry mysql init
scripts
add 42b1fcc AIRAVATA-2938 Update ProfileServiceServer to run db init
script
add cbed930 AIRAVATA-2938 Add missing comma
add 0c5f494 AIRAVATA-2938 Removing unused code
add 5144ca7 AIRAVATA-2938 Converting registry DB tests to use
DBInitializer, DerbyUtil
add ca5e20e Fixing typo
add 61bc8fd AIRAVATA-2938 More code cleanup
add 156b7c5 AIRAVATA-2938 Migration to bring DB into sync with DB init
script
add 966886d AIRAVATA-2938 Migration to bring DB into sync with DB init
script
add 6878eb8 AIRAVATA-2938 Migration to sync DB with DB init script:
replica_catalog
add 6e3542c AIRAVATA-2938 Migration to sync DB with DB init script:
sharing_catalog
add a75a4f0 AIRAVATA-2938 Self-referencing FK added in ALTER TABLE
statement
add 0db1312 AIRAVATA-2938 Fixing logger name
add 7a4ebee AIRAVATA-2938 Common JPAUtils with `validate` instead of
`buildSchema`
add 4649b2a AIRAVATA-2938 Fixing typo, duplicate column
add 4cde408 AIRAVATA-2938 Keep VALID_UNTIL as DATETIME
No new revisions were added by this update.
Summary of changes:
.../airavata/api/server/AiravataDerbyServer.java | 165 ---------
.../user/entities/NSFDemographicsEntity.java | 8 +-
.../commons/user/entities/UserProfileEntity.java | 6 +-
.../service/profile/commons/utils/JPAUtils.java | 42 +--
...ingleton.java => ProfileServiceJDBCConfig.java} | 41 ++-
.../service/profile/commons/utils/Utils.java | 27 +-
.../profile/server/ProfileServiceServer.java | 15 +
.../core/utils/UserProfileCatalogDBInitConfig.java | 83 ++---
.../core/utils/UserProfileCatalogJDBCConfig.java | 93 ++---
.../main/resources/user-profile-catalog-derby.sql | 163 +++++++++
.../main/resources/user-profile-catalog-mysql.sql | 163 +++++++++
.../src/main/resources/user_profile_catalog.sql | 114 ------
.../templates/airavata-server.properties.j2 | 2 +-
modules/airavata-helix/helix-spectator/pom.xml | 7 +-
modules/commons/pom.xml | 19 +-
.../{ClientSettings.java => DBInitConfig.java} | 14 +-
.../airavata/common/utils/DBInitializer.java | 71 ++++
.../org/apache/airavata/common/utils/DBUtil.java | 21 +-
.../airavata/common/utils}/DatabaseCreator.java | 15 +-
.../airavata/common/utils/DerbyTestUtil.java} | 253 ++++++++++----
.../apache/airavata/common/utils/DerbyUtil.java | 2 +-
.../utils/{ClientSettings.java => JDBCConfig.java} | 14 +-
.../org/apache/airavata/common/utils/JPAUtils.java | 68 ++++
.../store/server/CredentialStoreServerHandler.java | 5 +-
.../store/store/impl/util/ConnectionPool.java | 381 ---------------------
.../impl/util/CredentialStoreDBInitConfig.java} | 82 ++---
.../store/impl/util/CredentialStoreInitUtil.java | 155 ---------
.../impl/util/CredentialStoreJDBCConfig.java} | 48 ++-
.../store/store/impl/util/DatabaseCreator.java | 352 -------------------
.../store/store/impl/util/JdbcStorage.java | 174 ----------
.../src/main/resources/credstore-derby.sql | 0
.../src/main/resources/credstore-mysql.sql | 6 +-
modules/distribution/pom.xml | 5 -
.../src/main/assembly/bin-assembly.xml | 22 +-
.../gfac/client/GfacClientFactoryTest.java | 84 -----
.../airavata/gfac/client/util/Initialize.java | 226 ------------
modules/integration-tests/pom.xml | 16 -
.../orchestrator/core/util/Initialize.java | 306 -----------------
.../orchestrator/client/util/Initialize.java | 202 -----------
modules/registry-refactoring/pom.xml | 17 +-
.../HandlerErrorEntity.java | 5 +-
.../HandlerInputEntity.java | 5 +-
.../HandlerOutputEntity.java | 7 +-
.../HandlerStatusEntity.java | 5 +-
.../appcatalog/ComputeResourcePolicyEntity.java | 1 +
.../appcatalog/GroupResourceProfileEntity.java | 1 +
.../appcatalog/ParsingTemplateInputEntity.java | 2 +-
.../appcatalog/StoragePreferenceEntity.java | 4 +-
.../appcatalog/UnicoreDatamovementEntity.java | 7 +-
.../workspacecatalog/NSFDemographicsEntity.java | 94 -----
.../workspacecatalog/UserProfileEntity.java | 247 -------------
.../core/repositories/AbstractRepository.java | 3 +-
.../appcatalog/AppCatAbstractRepository.java | 12 +-
.../expcatalog/ExpCatAbstractRepository.java | 7 +-
.../replicacatalog/RepCatAbstractRepository.java | 7 +-
.../WorkflowCatAbstractRepository.java | 7 +-
.../core/utils/AppCatalogDBInitConfig.java | 68 ++++
.../registry/core/utils/AppCatalogJDBCConfig.java | 67 ++++
.../core/utils/ExpCatalogDBInitConfig.java | 82 +++++
.../registry/core/utils/ExpCatalogJDBCConfig.java | 66 ++++
.../core/utils/JPAUtil/AppCatalogJPAUtils.java | 67 +---
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 66 +---
.../core/utils/JPAUtil/RepCatalogJPAUtils.java | 60 +---
.../utils/JPAUtil/WorkflowCatalogJPAUtils.java | 61 +---
.../airavata/registry/core/utils/JPAUtils.java | 82 -----
.../core/utils/ReplicaCatalogDBInitConfig.java} | 34 +-
.../core/utils/ReplicaCatalogJDBCConfig.java | 65 ++++
.../core/utils/WorkflowCatalogDBInitConfig.java} | 33 +-
.../core/utils/WorkflowCatalogJDBCConfig.java | 65 ++++
.../META-INF/generate-sql-persistence.xml} | 33 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../resources/airavataworkflowcatalog-derby.sql | 53 ++-
.../src/main/resources/appcatalog-derby.sql | 60 +---
.../src/main/resources/appcatalog-mysql.sql | 149 +++-----
.../src/main/resources/expcatalog-derby.sql | 8 +-
.../src/main/resources/expcatalog-mysql.sql | 52 +--
.../src/main/resources/replicacatalog-derby.sql | 21 +-
.../src/main/resources/replicacatalog-mysql.sql | 19 +-
.../appcatalog/GatewayProfileRepositoryTest.java | 13 +-
.../core/repositories/common/DerbyDBManager.java | 239 -------------
.../core/repositories/common/TestBase.java | 56 +--
.../expcatalog/GatewayRepositoryTest.java | 17 +-
.../repositories/expcatalog/util/Initialize.java | 293 ----------------
.../replicacatalog/DataProductRepositoryTest.java | 32 +-
.../DataReplicaLocationRepositoryTest.java | 34 +-
.../replicacatalog/util/Initialize.java | 313 -----------------
.../workflowcatalog/WorkflowRepositoryTest.java | 33 +-
.../workflowcatalog/util/Initialize.java | 313 -----------------
.../src/test/resources/airavata-server.properties} | 58 ++--
.../resources/airavataworkflowcatalog-derby.sql | 172 ----------
modules/registry/pom.xml | 1 -
.../registry-server/registry-api-service/pom.xml | 7 +-
.../registry/api/service/RegistryAPIServer.java | 40 ++-
.../api/service/util/AppCatalogInitUtil.java | 187 ----------
.../registry/api/service/util/ConnectionPool.java | 381 ---------------------
.../service/util/ExperimentCatalogInitUtil.java | 224 ------------
.../registry/api/service/util/JdbcStorage.java | 175 ----------
.../api/service/util/ReplicaCatalogInitUtil.java | 179 ----------
.../api/service/util/WorkflowCatalogInitUtil.java | 179 ----------
.../next/DeltaScripts/appCatalog_schema_delta.sql | 186 ++++++++++
.../credential_store_schema_delta.sql} | 14 +-
.../DeltaScripts/profile_service_schema_delta.sql | 23 ++
.../DeltaScripts/replicaCatalog_schema_delta.sql | 16 +
.../DeltaScripts/sharingCatalog_schema_delta.sql} | 12 +-
.../registry/db/repositories/EntityRepository.java | 33 +-
.../sharing/registry/db/utils/ConnectionPool.java | 381 ---------------------
.../sharing/registry/db/utils/DatabaseCreator.java | 352 -------------------
.../sharing/registry/db/utils/JPAUtils.java | 196 +----------
.../sharing/registry/db/utils/JdbcStorage.java | 174 ----------
...leton.java => SharingRegistryDBInitConfig.java} | 36 +-
.../db/utils/SharingRegistryJDBCConfig.java | 67 ++++
.../registry/server/SharingRegistryServer.java | 23 +-
.../server/SharingRegistryServerHandler.java | 11 +-
.../registry/SharingRegistryServerHandlerTest.java | 14 +-
.../registry/SharingRegistryServiceTest.java | 11 +-
.../airavata/sharing/registry/util/Initialize.java | 296 ----------------
modules/workflow-model/workflow-engine/pom.xml | 10 -
modules/workflow/workflow-core/pom.xml | 7 +-
.../workflow/core/WorkflowInterpreter.java | 3 +-
modules/xbaya-gui/pom.xml | 5 -
120 files changed, 2209 insertions(+), 7720 deletions(-)
delete mode 100644
airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataDerbyServer.java
copy
airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/{ObjectMapperSingleton.java
=> ProfileServiceJDBCConfig.java} (57%)
copy
modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/actions/registry/browser/RefreshAction.java
=>
airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogDBInitConfig.java
(62%)
copy
modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/actions/registry/browser/AddAction.java
=>
airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/utils/UserProfileCatalogJDBCConfig.java
(56%)
create mode 100644
airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-derby.sql
create mode 100644
airavata-services/profile-service/profile-user-core/src/main/resources/user-profile-catalog-mysql.sql
delete mode 100644
airavata-services/profile-service/profile-user-core/src/main/resources/user_profile_catalog.sql
copy
modules/commons/src/main/java/org/apache/airavata/common/utils/{ClientSettings.java
=> DBInitConfig.java} (83%)
create mode 100644
modules/commons/src/main/java/org/apache/airavata/common/utils/DBInitializer.java
rename
modules/{registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util
=>
commons/src/main/java/org/apache/airavata/common/utils}/DatabaseCreator.java
(97%)
rename
modules/{registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/common/JdbcUtil.java
=> commons/src/main/java/org/apache/airavata/common/utils/DerbyTestUtil.java}
(60%)
copy
modules/commons/src/main/java/org/apache/airavata/common/utils/{ClientSettings.java
=> JDBCConfig.java} (84%)
create mode 100644
modules/commons/src/main/java/org/apache/airavata/common/utils/JPAUtils.java
delete mode 100644
modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/ConnectionPool.java
copy
modules/{xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/actions/registry/browser/RefreshAction.java
=>
credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/CredentialStoreDBInitConfig.java}
(63%)
delete mode 100644
modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/CredentialStoreInitUtil.java
copy
modules/{commons/src/main/java/org/apache/airavata/common/utils/DefaultKeyStorePasswordCallback.java
=>
credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/CredentialStoreJDBCConfig.java}
(50%)
delete mode 100644
modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/DatabaseCreator.java
delete mode 100644
modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/impl/util/JdbcStorage.java
rename modules/{registry/registry-core =>
credential-store/credential-store-service}/src/main/resources/credstore-derby.sql
(100%)
rename modules/{registry/registry-core =>
credential-store/credential-store-service}/src/main/resources/credstore-mysql.sql
(88%)
delete mode 100644
modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/GfacClientFactoryTest.java
delete mode 100644
modules/gfac/gfac-service/src/test/java/org/apache/airavata/gfac/client/util/Initialize.java
delete mode 100644
modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
delete mode 100644
modules/orchestrator/orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/util/Initialize.java
delete mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
delete mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogDBInitConfig.java
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/AppCatalogJDBCConfig.java
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogDBInitConfig.java
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ExpCatalogJDBCConfig.java
delete mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java
copy
modules/{job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultSerializer.java
=>
registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogDBInitConfig.java}
(53%)
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/ReplicaCatalogJDBCConfig.java
copy
modules/{job-monitor/job-monitor-api/src/main/java/org/apache/airavata/monitor/kafka/JobStatusResultSerializer.java
=>
registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogDBInitConfig.java}
(55%)
create mode 100644
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/WorkflowCatalogJDBCConfig.java
copy
modules/{credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/store/CredentialWriter.java
=>
registry-refactoring/src/main/resources/META-INF/generate-sql-persistence.xml}
(56%)
delete mode 100644
modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/common/DerbyDBManager.java
delete mode 100644
modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/util/Initialize.java
delete mode 100644
modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/util/Initialize.java
delete mode 100644
modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/workflowcatalog/util/Initialize.java
copy
modules/{sharing-registry/sharing-data-migrator/src/main/resources/airavata-server.properties.sample
=> registry-refactoring/src/test/resources/airavata-server.properties} (53%)
delete mode 100644
modules/registry-refactoring/src/test/resources/airavataworkflowcatalog-derby.sql
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/AppCatalogInitUtil.java
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ConnectionPool.java
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ExperimentCatalogInitUtil.java
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/JdbcStorage.java
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/ReplicaCatalogInitUtil.java
delete mode 100644
modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/WorkflowCatalogInitUtil.java
copy
modules/registry/release-migration-scripts/{0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
=> next/DeltaScripts/credential_store_schema_delta.sql} (51%)
copy
modules/registry/release-migration-scripts/{0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
=> next/DeltaScripts/sharingCatalog_schema_delta.sql} (52%)
delete mode 100644
modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ConnectionPool.java
delete mode 100644
modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DatabaseCreator.java
delete mode 100644
modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JdbcStorage.java
copy
modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/{ObjectMapperSingleton.java
=> SharingRegistryDBInitConfig.java} (56%)
create mode 100644
modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryJDBCConfig.java
delete mode 100644
modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/util/Initialize.java
