You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/10/04 17:47:02 UTC
svn commit: r1394120 - in
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests:
ConditionalFeaturesTest.java KarafTestSupport.java
Author: cschneider
Date: Thu Oct 4 15:47:01 2012
New Revision: 1394120
URL: http://svn.apache.org/viewvc?rev=1394120&view=rev
Log:
KARAF-1897 Switch http port for ConditionalFeaturesTest
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java?rev=1394120&r1=1394119&r2=1394120&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java Thu Oct 4 15:47:01 2012
@@ -62,7 +62,7 @@ public class ConditionalFeaturesTest {
MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").versionAsInProject();
return new Option[]{
karafDistributionConfiguration().frameworkUrl(karafUrl),
- KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", "9080")
+ KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", KarafTestSupport.HTTP_PORT)
};
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1394120&r1=1394119&r2=1394120&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Thu Oct 4 15:47:01 2012
@@ -63,7 +63,9 @@ import org.osgi.util.tracker.ServiceTrac
public class KarafTestSupport {
- private static final String RMI_PORT = "1100";
+ public static final String RMI_SERVER_PORT = "44445";
+ public static final String HTTP_PORT = "9081";
+ public static final String RMI_REG_PORT = "1100";
static final Long COMMAND_TIMEOUT = 10000L;
static final Long SERVICE_TIMEOUT = 30000L;
@@ -96,9 +98,9 @@ public class KarafTestSupport {
keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.INFO),
editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "config,standard,region,package,kar,management"),
- editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", "9081"),
- editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", RMI_PORT),
- editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", "44445")
+ editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", HTTP_PORT),
+ editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", RMI_REG_PORT),
+ editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", RMI_SERVER_PORT)
};
}
@@ -232,7 +234,7 @@ public class KarafTestSupport {
}
public JMXConnector getJMXConnector() throws Exception {
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + RMI_PORT+ "/karaf-root");
+ JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + RMI_REG_PORT+ "/karaf-root");
Hashtable<String, Object> env = new Hashtable<String, Object>();
String[] credentials = new String[]{ "karaf", "karaf" };
env.put("jmx.remote.credentials", credentials);