This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch service-layer-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 5729027438 add rest api controllers to restproxy
add a2d8be40c3 fix few more test cases, add distribution module to
generate a single airavata distribution bundle.
add fd009813d1 move db migration scripts to dev-tools/ and update refs.
cleanup modules
add 02297769c1 unify the distribution binary, fix test cases, fix bugs
No new revisions were added by this update.
Summary of changes:
.../registry_tools_consolidation_46a13ed9.plan.md | 113 ++++
README.md | 156 +++--
airavata-api/pom.xml | 22 -
.../apache/airavata/config/ServerLifecycle.java | 125 ++++
.../airavata/config/ThriftServerLauncher.java | 187 ------
.../services/CredentialEntityService.java | 4 +-
.../manager/dbevent/DBEventManagerRunner.java | 89 ++-
.../metadata/analyzer/DataInterpreterService.java | 49 +-
.../rescheduler/ProcessReschedulingService.java | 49 +-
.../ComputationalResourceMonitoringService.java | 66 +--
.../utils/TenantManagementKeycloakImpl.java | 13 +-
.../ComputationalResourceSchedulingEntity.java | 4 +-
.../entities/expcatalog/ExperimentErrorEntity.java | 4 +-
.../entities/expcatalog/ExperimentInputEntity.java | 4 +-
.../expcatalog/ExperimentOutputEntity.java | 4 +-
.../expcatalog/ExperimentStatusEntity.java | 4 +-
.../registry/entities/expcatalog/JobEntity.java | 7 +-
.../entities/expcatalog/ProcessErrorEntity.java | 1 -
.../entities/expcatalog/ProcessInputEntity.java | 1 -
.../entities/expcatalog/ProcessOutputEntity.java | 1 -
.../entities/expcatalog/ProcessStatusEntity.java | 7 +-
.../entities/expcatalog/TaskErrorEntity.java | 1 -
.../registry/entities/expcatalog/UserEntity.java | 7 +-
.../registry/services/ComputeResourceService.java | 47 +-
.../registry/services/DataProductService.java | 110 ++--
.../services/DataReplicaLocationService.java | 33 +-
.../registry/services/ExperimentService.java | 26 +-
.../services/GroupResourceProfileService.java | 9 +-
.../registry/services/ProcessErrorService.java | 7 +-
.../registry/services/ProcessInputService.java | 7 +-
.../registry/services/ProcessOutputService.java | 7 +-
.../airavata/registry/services/ProcessService.java | 27 +-
.../airavata/registry/services/ProjectService.java | 5 +-
.../registry/services/StorageResourceService.java | 3 +-
.../registry/services/TaskErrorService.java | 7 +-
.../airavata/registry/services/TaskService.java | 8 +-
.../registry/services/WorkflowService.java | 1 -
.../airavata/security/KeyCloakSecurityManager.java | 18 +-
.../service/profile/UserProfileService.java | 8 +-
.../service/security/CredentialStoreService.java | 8 +-
.../sharing/services/GroupMembershipService.java | 51 +-
.../main/resources/distribution/bin/airavata.sh | 31 -
.../SSHAccountProvisionerFactoryTest.java | 1 -
.../airavata/accountprovisioning/SSHUtilTest.java | 13 +-
.../common/utils/ApplicationSettingsTest.java | 3 +-
.../airavata/common/utils/NameValidatorTest.java | 3 +-
.../airavata/common/utils/SecurityUtilTest.java | 1 -
.../airavata/credential/SSHCredentialTest.java | 13 +-
.../apache/airavata/credential/SSHSummaryTest.java | 13 +-
.../orchestrator/core/BaseOrchestratorTest.java | 3 +-
.../orchestrator/core/NewOrchestratorTest.java | 3 +-
.../appcatalog/ComputeResourceRepositoryTest.java | 44 +-
.../expcatalog/ExperimentRepositoryTest.java | 4 +-
.../ExperimentSummaryRepositoryTest.java | 20 +-
.../expcatalog/ProcessRepositoryTest.java | 2 +-
.../registry/utils/CustomBeanFactoryTest.java | 1 -
.../security/GatewayGroupsInitializerTest.java | 1 -
.../security/KeyCloakSecurityManagerTest.java | 11 +-
.../AuthenticatorConfigurationReaderTest.java | 14 +-
.../AiravataServiceIntegrationTest.java | 38 +-
.../AwsComputeResourceIntegrationTest.java | 1 -
.../GroupManagerServiceIntegrationTest.java | 1 -
.../IamAdminServiceIntegrationTest.java | 1 -
.../OrchestratorServiceIntegrationTest.java | 9 +-
.../integration/ServiceIntegrationTestBase.java | 1 -
.../SlurmComputeResourceIntegrationTest.java | 1 -
.../TenantProfileServiceIntegrationTest.java | 1 -
.../UserProfileServiceIntegrationTest.java | 12 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 0
.../DeltaScripts/credentialStore_schema_delta.sql | 0
.../DeltaScripts/expCatalog_schema_delta.sql | 0
.../DeltaScripts/profile_service_schema_delta.sql | 0
.../DeltaScripts/replicaCatalog_schema_delta.sql | 0
.../DeltaScripts/sharingCatalog_schema_delta.sql | 0
.../DeltaScripts/workFlow_schema_delta.sql | 0
...licaCatalog_lowercase_user_data_dir_example.sql | 0
.../credentialStore_keycloak_migration.sql | 0
.../expCatalog_keycloak_migration.sql | 0
.../profileService_keycloak_migration.sql | 0
.../sharingCatalog_keycloak_migration.sql | 0
.../migrations}/0.16-0.17/migration-notes.md | 0
.../DeltaScripts/expCatalog_schema_delta.sql | 0
.../DeltaScripts/profile_service_schema_delta.sql | 0
.../DeltaScripts/sharingCatalog_schema_delta.sql | 0
.../DeltaScripts/appCatalog_schema_delta.sql | 0
.../DeltaScripts/credential_store_schema_delta.sql | 0
.../experimentCatalog_schema_delta.sql | 0
.../DeltaScripts/profile_service_schema_delta.sql | 0
.../DeltaScripts/replicaCatalog_schema_delta.sql | 0
.../DeltaScripts/sharingCatalog_schema_delta.sql | 0
.../DeltaScripts/appCatalog_schema_delta.sql | 0
.../DeltaScripts/credential_store_schema_delta.sql | 0
.../experimentCatalog_schema_delta.sql | 0
.../DeltaScripts/profile_service_schema_delta.sql | 0
.../DeltaScripts/replicaCatalog_schema_delta.sql | 0
.../DeltaScripts/sharingCatalog_schema_delta.sql | 0
.../migrations}/0.6/migrate_derby.sql | 0
.../migrations}/0.6/migrate_mysql.sql | 0
.../migrations}/0.7/migrate_derby.sql | 0
.../migrations}/0.7/migrate_mysql.sql | 0
.../migrations}/0.8/migrate_derby.sql | 0
.../migrations}/0.8/migrate_mysql.sql | 0
.../next/DeltaScripts/appCatalog_schema_delta.sql | 0
.../DeltaScripts/credential_store_schema_delta.sql | 0
.../experimentCatalog_schema_delta.sql | 0
.../DeltaScripts/profile_service_schema_delta.sql | 0
.../DeltaScripts/replicaCatalog_schema_delta.sql | 0
.../DeltaScripts/sharingCatalog_schema_delta.sql | 0
examples/registry-core-README.md | 4 +-
modules/agent-framework/agent-service/pom.xml | 24 -
.../main/assembly/agent-service-bin-assembly.xml | 76 ---
.../resources/distribution/bin/agent-service.sh | 26 -
.../src/main/resources/distribution/bin/setenv.sh | 146 -----
.../src/main/resources/distribution/conf/.gitkeep | 0
modules/distribution/pom.xml | 142 +++++
.../src/main/assembly/all-in-one-bin-assembly.xml | 144 +++++
.../airavata/ide/integration/APIServerStarter.java | 1 +
.../airavata/ide/integration/JobEngineStarter.java | 1 +
.../ide/integration/JobMonitorStarter.java | 1 +
.../apache/airavata/server/UnifiedApplication.java | 79 ++-
.../applications}/AgentServiceApplication.java | 9 +-
.../server/applications}/AiravataApplication.java | 10 +-
.../applications}/FileServerApplication.java | 10 +-
.../applications}/ResearchServiceApplication.java | 9 +-
.../server/applications}/RestProxyApplication.java | 30 +-
.../server/bootstrap/DatabaseMigratorCommand.java | 474 +++++++++++++++
.../server/bootstrap}/DevDataInitializer.java | 8 +-
.../src/main/resources/bin/airavata-server.sh | 219 +++++++
.../src/main/resources/bin/airavata.sh | 190 ++++++
.../src/main/resources/bin/db-migrate.sh | 89 +++
.../distribution/src/main/resources}/bin/setenv.sh | 1 +
modules/file-server/pom.xml | 27 +-
.../main/assembly/file-service-bin-assembly.xml | 75 ---
.../resources/distribution/bin/file-service.sh | 26 -
.../src/main/resources/distribution/bin/setenv.sh | 146 -----
.../src/main/resources/distribution/conf/.gitkeep | 0
modules/ide-integration/.gitignore | 2 -
modules/ide-integration/README.md | 294 ---------
modules/ide-integration/pom.xml | 56 --
modules/registry-db-migrator/README.md | 9 -
modules/registry-db-migrator/pom.xml | 58 --
.../apache/airavata/registry/tool/DBMigrator.java | 398 -------------
.../src/main/resources/db-migrate.sh | 34 --
modules/registry-jpa-generator/pom.xml | 41 --
.../computeresource/BatchQueueGenerator.java | 95 ---
.../ComputeResourceDescriptionGenerator.java | 83 ---
.../DataMovementInterfaceGenerator.java | 92 ---
.../computeresource/FileSystemsGenerator.java | 91 ---
.../GridFTPDataMovementGenerator.java | 83 ---
.../computeresource/GridFTPEndpointsGenerator.java | 91 ---
.../JobManagerCommandGenerator.java | 94 ---
.../JobSubmissionInterfaceGenerator.java | 92 ---
.../LocalDataMovementGenerator.java | 82 ---
.../computeresource/LocalSubmissionGenerator.java | 91 ---
.../computeresource/ModuleCMDGenerator.java | 90 ---
.../ResourceJobManagerGenerator.java | 90 ---
.../computeresource/SCPDataMovementGenerator.java | 85 ---
.../computeresource/SSHJobSubmissionGenerator.java | 94 ---
.../main/java/generators/AbstractGenerator.java | 144 -----
.../main/java/generators/JPAClassGenerator.java | 253 --------
.../java/generators/JPAResourceClassGenerator.java | 655 ---------------------
.../src/main/java/generators/SQLGenerator.java | 91 ---
.../src/main/java/model/JPAClassField.java | 71 ---
.../src/main/java/model/JPAClassModel.java | 53 --
.../src/main/java/model/JPAPKClassModel.java | 49 --
.../src/main/java/model/JPAResourceClassModel.java | 46 --
.../src/main/java/model/SQLData.java | 106 ----
.../src/main/java/test/Test.java | 104 ----
.../research-framework/research-service/pom.xml | 27 +-
.../assembly/research-service-bin-assembly.xml | 76 ---
.../resources/distribution/bin/research-service.sh | 26 -
.../src/main/resources/distribution/bin/setenv.sh | 146 -----
.../src/main/resources/distribution/conf/.gitkeep | 0
modules/restproxy/pom.xml | 27 +-
.../src/main/assembly/restproxy-bin-assembly.xml | 75 ---
.../airavata/restproxy/RestProxyConfiguration.java | 4 +
.../airavata/restproxy/config/OpenApiConfig.java | 3 +-
.../ApplicationDeploymentController.java | 7 +-
.../controller/ApplicationInterfaceController.java | 5 +-
.../controller/ComputeResourceController.java | 4 +-
.../controller/DataProductController.java | 6 +-
.../restproxy/controller/ExperimentController.java | 3 +-
.../restproxy/controller/GatewayController.java | 5 +-
.../controller/GroupResourceProfileController.java | 10 +-
.../restproxy/controller/JobController.java | 11 +-
.../restproxy/controller/ProcessController.java | 16 +-
.../restproxy/controller/ProjectController.java | 18 +-
.../restproxy/controller/ProxyController.java | 2 +
.../controller/StorageResourceController.java | 3 +-
.../controller/UserResourceProfileController.java | 13 +-
.../restproxy/controller/WorkflowController.java | 4 +-
.../main/resources/distribution/bin/restproxy.sh | 26 -
.../src/main/resources/distribution/bin/setenv.sh | 146 -----
.../src/main/resources/distribution/conf/.gitkeep | 0
.../thriftapi/server/AiravataServiceServer.java | 93 ++-
.../thriftapi/server/CredentialServiceServer.java | 56 +-
.../server/OrchestratorServiceServer.java | 169 ++----
.../thriftapi/server/ProfileServiceServer.java | 66 +--
.../thriftapi/server/RegistryServiceServer.java | 78 +--
.../thriftapi/server/SharingRegistryServer.java | 88 ++-
.../airavata/thriftapi/client/TestSSLClient.java | 14 +-
pom.xml | 4 +-
202 files changed, 2459 insertions(+), 6002 deletions(-)
create mode 100644 .cursor/plans/registry_tools_consolidation_46a13ed9.plan.md
create mode 100644
airavata-api/src/main/java/org/apache/airavata/config/ServerLifecycle.java
delete mode 100644
airavata-api/src/main/java/org/apache/airavata/config/ThriftServerLauncher.java
delete mode 100644 airavata-api/src/main/resources/distribution/bin/airavata.sh
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/keycloak-migration-replica-catalog/replicaCatalog_lowercase_user_data_dir_example.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/keycloak-migration/credentialStore_keycloak_migration.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/keycloak-migration/expCatalog_keycloak_migration.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/keycloak-migration/profileService_keycloak_migration.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/keycloak-migration/sharingCatalog_keycloak_migration.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.16-0.17/migration-notes.md (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/credential_store_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/profile_service_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/replicaCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.18-0.19/DeltaScripts/sharingCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/credential_store_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/profile_service_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/replicaCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/0.19-0.20/DeltaScripts/sharingCatalog_schema_delta.sql
(100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.6/migrate_derby.sql (100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.6/migrate_mysql.sql (100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.7/migrate_derby.sql (100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.7/migrate_mysql.sql (100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.8/migrate_derby.sql (100%)
rename {modules/registry-db-migrator/src/main/resources/db-scripts =>
dev-tools/migrations}/0.8/migrate_mysql.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/appCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/credential_store_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/experimentCatalog_schema_delta.sql
(100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/profile_service_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/replicaCatalog_schema_delta.sql (100%)
rename {modules/release-migration-scripts =>
dev-tools/migrations}/next/DeltaScripts/sharingCatalog_schema_delta.sql (100%)
delete mode 100644
modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
delete mode 100755
modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
delete mode 100755
modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
delete mode 100644
modules/agent-framework/agent-service/src/main/resources/distribution/conf/.gitkeep
create mode 100644 modules/distribution/pom.xml
create mode 100644
modules/distribution/src/main/assembly/all-in-one-bin-assembly.xml
rename modules/{ide-integration =>
distribution}/src/main/java/org/apache/airavata/ide/integration/APIServerStarter.java
(99%)
rename modules/{ide-integration =>
distribution}/src/main/java/org/apache/airavata/ide/integration/JobEngineStarter.java
(99%)
rename modules/{ide-integration =>
distribution}/src/main/java/org/apache/airavata/ide/integration/JobMonitorStarter.java
(99%)
copy airavata-api/src/main/java/org/apache/airavata/AiravataApplication.java
=>
modules/distribution/src/main/java/org/apache/airavata/server/UnifiedApplication.java
(56%)
rename
modules/{agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service
=>
distribution/src/main/java/org/apache/airavata/server/applications}/AgentServiceApplication.java
(80%)
rename {airavata-api/src/main/java/org/apache/airavata =>
modules/distribution/src/main/java/org/apache/airavata/server/applications}/AiravataApplication.java
(92%)
rename modules/{file-server/src/main/java/org/apache/airavata/file/server =>
distribution/src/main/java/org/apache/airavata/server/applications}/FileServerApplication.java
(80%)
rename
modules/{research-framework/research-service/src/main/java/org/apache/airavata/research/service
=>
distribution/src/main/java/org/apache/airavata/server/applications}/ResearchServiceApplication.java
(81%)
rename modules/{restproxy/src/main/java/org/apache/airavata/restproxy =>
distribution/src/main/java/org/apache/airavata/server/applications}/RestProxyApplication.java
(76%)
create mode 100644
modules/distribution/src/main/java/org/apache/airavata/server/bootstrap/DatabaseMigratorCommand.java
rename
modules/{research-framework/research-service/src/main/java/org/apache/airavata/research/service/config
=>
distribution/src/main/java/org/apache/airavata/server/bootstrap}/DevDataInitializer.java
(97%)
create mode 100644
modules/distribution/src/main/resources/bin/airavata-server.sh
create mode 100644 modules/distribution/src/main/resources/bin/airavata.sh
create mode 100755 modules/distribution/src/main/resources/bin/db-migrate.sh
rename {airavata-api/src/main/resources/distribution =>
modules/distribution/src/main/resources}/bin/setenv.sh (99%)
mode change 100755 => 100644
delete mode 100644
modules/file-server/src/main/assembly/file-service-bin-assembly.xml
delete mode 100644
modules/file-server/src/main/resources/distribution/bin/file-service.sh
delete mode 100644
modules/file-server/src/main/resources/distribution/bin/setenv.sh
delete mode 100644
modules/file-server/src/main/resources/distribution/conf/.gitkeep
delete mode 100644 modules/ide-integration/.gitignore
delete mode 100644 modules/ide-integration/README.md
delete mode 100644 modules/ide-integration/pom.xml
delete mode 100644 modules/registry-db-migrator/README.md
delete mode 100644 modules/registry-db-migrator/pom.xml
delete mode 100644
modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
delete mode 100755
modules/registry-db-migrator/src/main/resources/db-migrate.sh
delete mode 100644 modules/registry-jpa-generator/pom.xml
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/generators/AbstractGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/generators/JPAClassGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/generators/JPAResourceClassGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/model/JPAClassField.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/model/JPAClassModel.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/model/JPAPKClassModel.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/model/JPAResourceClassModel.java
delete mode 100644
modules/registry-jpa-generator/src/main/java/model/SQLData.java
delete mode 100644 modules/registry-jpa-generator/src/main/java/test/Test.java
delete mode 100644
modules/research-framework/research-service/src/main/assembly/research-service-bin-assembly.xml
delete mode 100755
modules/research-framework/research-service/src/main/resources/distribution/bin/research-service.sh
delete mode 100755
modules/research-framework/research-service/src/main/resources/distribution/bin/setenv.sh
delete mode 100644
modules/research-framework/research-service/src/main/resources/distribution/conf/.gitkeep
delete mode 100644
modules/restproxy/src/main/assembly/restproxy-bin-assembly.xml
delete mode 100644
modules/restproxy/src/main/resources/distribution/bin/restproxy.sh
delete mode 100644
modules/restproxy/src/main/resources/distribution/bin/setenv.sh
delete mode 100644
modules/restproxy/src/main/resources/distribution/conf/.gitkeep
