Author: tchemit Date: 2014-04-29 10:47:41 +0200 (Tue, 29 Apr 2014) New Revision: 3884 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3884 Log: use specific configuration files (pollen-services.properties, pollen-rest-api.properties to avoid any collision with existing config) Removed: trunk/pollen-persistence/src/main/resources/META-INF/ Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -75,7 +75,7 @@ protected PollenServiceConfig applicationConfig; public static PollenRestApiApplicationContext newApplicationContext() { - PollenServiceConfig applicationConfig = new PollenServiceConfig(); + PollenServiceConfig applicationConfig = new PollenServiceConfig("pollen-rest-api.properties"); PollenTopiaApplicationContext pollenTopiaApplicationContext = new PollenTopiaApplicationContext(applicationConfig.getTopiaProperties()); PollenRestApiApplicationContext result = new PollenRestApiApplicationContext(applicationConfig, pollenTopiaApplicationContext); return result; Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -51,7 +51,7 @@ @Before public void launchServer() throws Exception { - PollenRestApiApplicationContext applicationContext = FakePollenRestApiApplicationContext.newApplicationContext(); + PollenRestApiApplicationContext applicationContext = FakePollenRestApiApplicationContext.newFakeApplicationContext(); applicationContext.init(); PollenRestApiApplicationContext.setApplicationContext(applicationContext); Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -52,8 +52,8 @@ protected List<PollenTopiaPersistenceContext> openedTransactions = new LinkedList<>(); - public static PollenRestApiApplicationContext newApplicationContext() { - PollenServiceConfig applicationConfig = new PollenServiceConfig(); + public static PollenRestApiApplicationContext newFakeApplicationContext() { + PollenServiceConfig applicationConfig = new PollenServiceConfig("pollen-rest-api.properties"); PollenTopiaApplicationContext pollenTopiaApplicationContext = newTopiaApplicationContext(applicationConfig, UUID.randomUUID().toString()); PollenRestApiApplicationContext result = new FakePollenRestApiApplicationContext(applicationConfig, pollenTopiaApplicationContext); return result; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -53,16 +53,20 @@ protected ApplicationConfig applicationConfig; public PollenServiceConfig() { + this("pollen.properties"); + } + + public PollenServiceConfig(String filename) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(PollenServiceConfigOption.values()); - applicationConfig.setConfigFileName("pollen.properties"); + applicationConfig.setConfigFileName(filename); try { applicationConfig.parse(); } catch (ArgumentsParserException e) { throw new PollenTechnicalException(e); } if (log.isInfoEnabled()) { - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new StringBuilder("Filename: "+filename); List<PollenServiceConfigOption> options = Lists.newArrayList(PollenServiceConfigOption.values()); for (PollenServiceConfigOption option : options) { builder.append(String.format("\n%1$-40s = %2$s", Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -118,13 +118,13 @@ log.debug("jdbc url is\n" + jdbcUrl); } - PollenTopiaApplicationContext applicationContext = new PollenTopiaApplicationContext(hibernateH2Config); + PollenTopiaApplicationContext topiaApplicationContext = new PollenTopiaApplicationContext(hibernateH2Config); if (log.isTraceEnabled()) { - log.trace("created root context " + applicationContext); + log.trace("created root context " + topiaApplicationContext); } - return applicationContext; + return topiaApplicationContext; } protected PollenTopiaApplicationContext getApplicationContext() { @@ -159,7 +159,7 @@ if (applicationConfig == null) { - applicationConfig = new PollenServiceConfig(); + applicationConfig = new PollenServiceConfig("pollen-services.properties"); } return applicationConfig;