Author: ivol37 at gmail.com Date: Fri Dec 3 09:09:34 2010 New Revision: 472
Log: [AMDATU-181] The new REST service test suffered from the old known issue AMDATU-189. Therefore I removed trying to set the felix http service configuration, instead all tests will only use default values. Until https://issues.apache.org/jira/browse/FELIX-2714 has been resolved we should just use the defaults. Modified: trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java Modified: trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java ============================================================================== --- trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java (original) +++ trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java Fri Dec 3 09:09:34 2010 @@ -37,8 +37,10 @@ public class ConfigProvider { public final static String HOSTNAME = "localhost"; public final static String DEFAULT_PORTNR = "8080"; - public final static String PORTNR = "3737"; - public final static String SECURE_PORTNR = "3738"; + + // NB: Due to issue https://issues.apache.org/jira/browse/FELIX-2714 we must use the default port for testing + public final static String PORTNR = "8080"; + public final static String SECURE_PORTNR = "8081"; public void addLogConfig(ConfigurationAdmin configAdmin) throws IOException { Configuration config = configAdmin.getConfiguration("org.amdatu.core.loghandler", null); @@ -133,6 +135,11 @@ } public void addHttpServiceConfig(ConfigurationAdmin configAdmin) throws IOException { + // NB: Due to issue https://issues.apache.org/jira/browse/FELIX-2714 updating the felix http service + // configuration may cause throwing a connection refused, a service that still listens to the default + // port 8080 or returning a 404. Therefore, until this issue has been fixed, we will not try to change + // any configuration of the felix http service and just use the defaults. + /* Configuration config = configAdmin.getConfiguration("org.apache.felix.http", null); Properties properties = new Properties(); properties.put("org.osgi.service.http.hostname", HOSTNAME); @@ -141,6 +148,7 @@ properties.put("org.apache.felix.http.debug", "true"); properties.put("org.apache.felix.log.storeDebug", "true"); config.update(properties); + */ } public void addUserAdminConfig(ConfigurationAdmin configAdmin) throws IOException {
