-
- Downloads
Pull request #777: NMAAS-984 read initial portal configuration from properties
Merge in NMAAS/nmaas from NMAAS-984-read-initial-portal-configuration-from-properties to develop * commit '57aa0f2f': NMAAS-984: Initializing only if configuration doesn't exist NMAAS-984 changes to avoid failing tests NMAAS-984 delegate initial configuration delegation to initializing bean
Showing
- docker/nmaas-platform.properties.template 11 additions, 0 deletionsdocker/nmaas-platform.properties.template
- src/integrationTest/resources/application.properties 12 additions, 1 deletionsrc/integrationTest/resources/application.properties
- src/main/java/net/geant/nmaas/portal/PortalConfig.java 47 additions, 4 deletionssrc/main/java/net/geant/nmaas/portal/PortalConfig.java
- src/main/java/net/geant/nmaas/portal/api/configuration/ConfigurationController.java 2 additions, 2 deletions...aas/portal/api/configuration/ConfigurationController.java
- src/main/java/net/geant/nmaas/portal/api/configuration/ConfigurationView.java 7 additions, 8 deletions...ant/nmaas/portal/api/configuration/ConfigurationView.java
- src/main/java/net/geant/nmaas/portal/service/ConfigurationManager.java 1 addition, 1 deletion.../net/geant/nmaas/portal/service/ConfigurationManager.java
- src/main/java/net/geant/nmaas/portal/service/impl/ConfigurationManagerImpl.java 5 additions, 9 deletions...t/nmaas/portal/service/impl/ConfigurationManagerImpl.java
- src/main/resources/application.properties 12 additions, 1 deletionsrc/main/resources/application.properties
- src/test/java/net/geant/nmaas/portal/service/impl/ConfigurationManagerTest.java 4 additions, 4 deletions...t/nmaas/portal/service/impl/ConfigurationManagerTest.java
- src/test/resources/application.properties 12 additions, 1 deletionsrc/test/resources/application.properties
Please register or sign in to comment