Simplified configuration of repo

eclipse-vorto · Jan 15, 2017 · 9d06b52 · 9d06b52
1 parent 90fa9db
commit 9d06b52
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 36 deletions.
diff --git a/...sitory/web/config/CloudConfiguration.java → ...y/web/config/RepositoryConfiguration.java b/...sitory/web/config/CloudConfiguration.java → ...y/web/config/RepositoryConfiguration.java
@@ -14,18 +14,18 @@
  */
 package org.eclipse.vorto.repository.web.config;
 
-import org.modeshape.jcr.RepositoryConfiguration;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.ClassPathResource;
 
 @Configuration
-@Profile("cloud")
-public class CloudConfiguration {
+public class RepositoryConfiguration {
 
+	@Value("${repo.configFile}")
+	private String repositoryConfigFile = null;
 	@Bean
-	public RepositoryConfiguration repoConfiguration() throws Exception {
-		return RepositoryConfiguration.read(new ClassPathResource("vorto-repository-config-h2.json").getURL());
+	public org.modeshape.jcr.RepositoryConfiguration repoConfiguration() throws Exception {
+		return org.modeshape.jcr.RepositoryConfiguration.read(new ClassPathResource(repositoryConfigFile).getURL());
 	}
 }
diff --git a/...sitory/web/config/LocalConfiguration.java → .../config/RepositoryConfigurationLocal.java b/...sitory/web/config/LocalConfiguration.java → .../config/RepositoryConfigurationLocal.java
@@ -19,18 +19,15 @@
 import org.eclipse.vorto.repository.model.Role;
 import org.eclipse.vorto.repository.model.User;
 import org.eclipse.vorto.repository.service.IUserRepository;
-import org.modeshape.jcr.RepositoryConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @Profile("local")
-public class LocalConfiguration {
-
+public class RepositoryConfigurationLocal extends org.eclipse.vorto.repository.web.config.RepositoryConfiguration {
+	
 	@Autowired
 	private IUserRepository userRepository;
 
@@ -56,9 +53,4 @@ public void setUpTestUser() {
 
 		userRepository.save(user);
 	}
-
-	@Bean
-	public RepositoryConfiguration repoConfiguration() throws Exception {
-		return RepositoryConfiguration.read(new ClassPathResource("vorto-repository-config-file.json").getURL());
-	}
 }
diff --git a/server/repo/repository-server/src/main/resources/application-cloud.yml b/server/repo/repository-server/src/main/resources/application-cloud.yml
diff --git a/server/repo/repository-server/src/main/resources/application-local.yml b/server/repo/repository-server/src/main/resources/application-local.yml
@@ -1,7 +1,7 @@
 server:
   port: 8080
   contextPath: /infomodelrepository
-  
+
 mail:
   smtp:
     host: localhost

diff --git a/server/repo/repository-server/src/main/resources/application.properties b/server/repo/repository-server/src/main/resources/application.properties
@@ -1,5 +1,4 @@
-spring.datasource.testWhileIdle = true
-spring.datasource.timeBetweenEvictionRunsMillis = 60000
-spring.datasource.validationQuery = SELECT 1
 spring.profiles.active=local
 spring.jackson.serialization.write-dates-as-timestamps:false
+
+repo.configFile: vorto-repository-config-file.json
diff --git a/.../src/main/resources/application-mysql.yml → .../src/test/resources/application-mysql.yml b/.../src/main/resources/application-mysql.yml → .../src/test/resources/application-mysql.yml