Author: rotty3000 Date: Wed Apr 25 13:56:59 2018 New Revision: 1830078 URL: http://svn.apache.org/viewvc?rev=1830078&view=rev Log: [CDI] test using ephemeral HTTP port
Signed-off-by: Raymond Auge <[email protected]> Modified: aries/trunk/cdi/cdi-itests/itest.bndrun aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/HttpTestCase.java Modified: aries/trunk/cdi/cdi-itests/itest.bndrun URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1830078&r1=1830077&r2=1830078&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/itest.bndrun (original) +++ aries/trunk/cdi/cdi-itests/itest.bndrun Wed Apr 25 13:56:59 2018 @@ -70,6 +70,6 @@ eclipse.log.enabled=false,\ logback.configurationFile=file:${.}/logback.xml,\ org.jboss.logging.provider=slf4j,\ - org.osgi.service.http.port=8080,\ + org.osgi.service.http.port=0,\ osgi.console.enable.builtin=false, \ osgi.console= Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/HttpTestCase.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/HttpTestCase.java?rev=1830078&r1=1830077&r2=1830078&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/HttpTestCase.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/HttpTestCase.java Wed Apr 25 13:56:59 2018 @@ -173,6 +173,11 @@ public class HttpTestCase extends Abstra private String getEndpoint() { String[] endpoints = (String[])hsrReference.getProperty("osgi.http.endpoint"); + if (endpoints == null || endpoints.length == 0) { + String port = (String)hsrReference.getProperty("org.osgi.service.http.port"); + return "http://localhost:"; + port; + } + return endpoints[0]; }
