This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch dev-env-fix
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 9ed4331aea add missing services, add nginx reverse proxy
add 9e34aa8b89 fix dozermapper issues after updating to
org.github.dozermapper.core. cleanup dockerfiles. add a new service (Restproxy)
to replace confluent rest proxy.
No new revisions were added by this update.
Summary of changes:
.../docker-compose-alt.yml | 0
.devcontainer/docker-compose.yml | 27 +--
.devcontainer/kafka_rest/Dockerfile | 14 --
airavata-api/pom.xml | 127 ++------------
.../src/main/docker/{api-server => }/Dockerfile | 43 +++--
.../src/main/docker/api-server/wait-for-it.sh | 182 ---------------------
airavata-api/src/main/docker/controller/Dockerfile | 34 ----
.../src/main/docker/controller/wait-for-it.sh | 182 ---------------------
.../src/main/docker/email-monitor/Dockerfile | 33 ----
.../src/main/docker/email-monitor/wait-for-it.sh | 182 ---------------------
.../src/main/docker/participant/Dockerfile | 36 ----
.../src/main/docker/participant/wait-for-it.sh | 182 ---------------------
airavata-api/src/main/docker/post-wm/Dockerfile | 36 ----
.../src/main/docker/post-wm/wait-for-it.sh | 182 ---------------------
airavata-api/src/main/docker/pre-wm/Dockerfile | 36 ----
airavata-api/src/main/docker/pre-wm/wait-for-it.sh | 182 ---------------------
.../core/repositories/AbstractRepository.java | 2 +-
.../ApplicationDeploymentRepository.java | 2 +-
.../appcatalog/ApplicationInterfaceRepository.java | 2 +-
.../appcatalog/ComputeResourceRepository.java | 2 +-
.../appcatalog/DataMovementRepository.java | 2 +-
.../appcatalog/GwyResourceProfileRepository.java | 2 +-
.../JobSubmissionInterfaceRepository.java | 2 +-
.../repositories/appcatalog/ParserRepository.java | 2 +-
.../appcatalog/StorageResourceRepository.java | 2 +-
.../appcatalog/UserResourceProfileRepository.java | 2 +-
.../expcatalog/ExperimentErrorRepository.java | 2 +-
.../expcatalog/ExperimentInputRepository.java | 2 +-
.../expcatalog/ExperimentOutputRepository.java | 2 +-
.../expcatalog/ExperimentRepository.java | 2 +-
.../expcatalog/ExperimentStatusRepository.java | 2 +-
.../repositories/expcatalog/GatewayRepository.java | 2 +-
.../GatewayUsageReportingCommandRepository.java | 2 +-
.../repositories/expcatalog/JobRepository.java | 2 +-
.../expcatalog/JobStatusRepository.java | 2 +-
.../expcatalog/NotificationRepository.java | 2 +-
.../expcatalog/ProcessErrorRepository.java | 2 +-
.../expcatalog/ProcessInputRepository.java | 2 +-
.../expcatalog/ProcessOutputRepository.java | 2 +-
.../repositories/expcatalog/ProcessRepository.java | 2 +-
.../expcatalog/ProcessStatusRepository.java | 2 +-
.../expcatalog/ProcessWorkflowRepository.java | 2 +-
.../repositories/expcatalog/ProjectRepository.java | 2 +-
.../expcatalog/QueueStatusRepository.java | 2 +-
.../expcatalog/TaskErrorRepository.java | 2 +-
.../repositories/expcatalog/TaskRepository.java | 2 +-
.../expcatalog/TaskStatusRepository.java | 2 +-
.../replicacatalog/DataProductRepository.java | 2 +-
.../DataReplicaLocationRepository.java | 2 +-
.../workflowcatalog/WorkflowRepository.java | 2 +-
.../registry/core/utils/CustomBeanFactory.java | 11 +-
.../utils/DozerConverter/CsvStringConverter.java | 2 +-
.../utils/DozerConverter/StorageDateConverter.java | 2 +-
.../registry/core/utils/ObjectMapperSingleton.java | 33 ++--
.../commons/repositories/AbstractRepository.java | 2 +-
.../commons/utils/ObjectMapperSingleton.java | 22 +--
.../core/repositories/UserProfileRepository.java | 2 +-
.../db/repositories/AbstractRepository.java | 2 +-
.../registry/db/utils/ObjectMapperSingleton.java | 22 +--
.../src/main/resources/airavata-server.properties | 4 +-
.../registry/core/utils/CustomBeanFactoryTest.java | 4 +-
.../deployment-scripts/distribution_backup.sh | 1 +
.../deployment-scripts/distribution_update.sh | 11 +-
dev-tools/deployment-scripts/services_down.sh | 9 +-
dev-tools/deployment-scripts/services_up.sh | 7 +
modules/{file-server => restproxy}/pom.xml | 35 ++--
.../src/main/assembly/restproxy-bin-assembly.xml} | 0
.../airavata/restproxy/RestProxyApplication.java} | 10 +-
.../restproxy/RestProxyConfiguration.java} | 18 +-
.../restproxy/controller/ProxyController.java | 78 +++++++++
.../src/main/resources/application.properties | 2 +
.../main/resources/distribution/bin/restproxy.sh} | 4 +-
.../src/main/resources/distribution/bin/setenv.sh | 0
.../src/main/resources/distribution/conf/.gitkeep | 0
.../restproxy}/src/main/resources/log4j2.xml | 30 ++--
pom.xml | 1 +
76 files changed, 284 insertions(+), 1574 deletions(-)
rename airavata-api/src/main/docker/docker-compose.yml =>
.devcontainer/docker-compose-alt.yml (100%)
delete mode 100644 .devcontainer/kafka_rest/Dockerfile
rename airavata-api/src/main/docker/{api-server => }/Dockerfile (64%)
delete mode 100644 airavata-api/src/main/docker/api-server/wait-for-it.sh
delete mode 100644 airavata-api/src/main/docker/controller/Dockerfile
delete mode 100644 airavata-api/src/main/docker/controller/wait-for-it.sh
delete mode 100644 airavata-api/src/main/docker/email-monitor/Dockerfile
delete mode 100644 airavata-api/src/main/docker/email-monitor/wait-for-it.sh
delete mode 100644 airavata-api/src/main/docker/participant/Dockerfile
delete mode 100644 airavata-api/src/main/docker/participant/wait-for-it.sh
delete mode 100644 airavata-api/src/main/docker/post-wm/Dockerfile
delete mode 100644 airavata-api/src/main/docker/post-wm/wait-for-it.sh
delete mode 100644 airavata-api/src/main/docker/pre-wm/Dockerfile
delete mode 100644 airavata-api/src/main/docker/pre-wm/wait-for-it.sh
copy modules/{file-server => restproxy}/pom.xml (77%)
copy modules/{file-server/src/main/assembly/file-service-bin-assembly.xml =>
restproxy/src/main/assembly/restproxy-bin-assembly.xml} (100%)
copy
modules/{agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/AgentServiceApplication.java
=>
restproxy/src/main/java/org/apache/airavata/restproxy/RestProxyApplication.java}
(77%)
copy
modules/{agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/config/ClusterApplicationConfig.java
=>
restproxy/src/main/java/org/apache/airavata/restproxy/RestProxyConfiguration.java}
(68%)
create mode 100644
modules/restproxy/src/main/java/org/apache/airavata/restproxy/controller/ProxyController.java
create mode 100644 modules/restproxy/src/main/resources/application.properties
copy modules/{file-server/src/main/resources/distribution/bin/file-service.sh
=> restproxy/src/main/resources/distribution/bin/restproxy.sh} (91%)
copy {airavata-api =>
modules/restproxy}/src/main/resources/distribution/bin/setenv.sh (100%)
mode change 100755 => 100644
copy {airavata-api =>
modules/restproxy}/src/main/resources/distribution/conf/.gitkeep (100%)
copy {airavata-api => modules/restproxy}/src/main/resources/log4j2.xml (60%)
