Author: dkulp
Date: Mon Feb 13 18:10:06 2012
New Revision: 1243631
URL: http://svn.apache.org/viewvc?rev=1243631&view=rev
Log:
Remove remaining hard coded ports in 7000-9999 range.
Modified:
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
cxf/trunk/rt/management/pom.xml
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Modified:
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
Mon Feb 13 18:10:06 2012
@@ -27,13 +27,17 @@ import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.test.AbstractCXFSpringTest;
import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Test;
/**
*
*/
public class TypeCreationOptionsSpringTest extends AbstractCXFSpringTest {
-
+ public static final String PORT =
TestUtil.getPortNumber(TypeCreationOptionsSpringTest.class);
+
+
@Override
protected String[] getConfigLocations() {
setConfigContextClass(TypeCreationOptionsSpringTest.class);
Modified:
cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
(original)
+++
cxf/trunk/rt/databinding/aegis/src/test/resources/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml
Mon Feb 13 18:10:06 2012
@@ -27,6 +27,7 @@
http://cxf.apache.org/bindings/soap
http://cxf.apache.org/schemas/configuration/soap.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
">
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<import resource="classpath:META-INF/cxf/cxf.xml" />
@@ -56,7 +57,7 @@
</bean>
<jaxws:endpoint id="aegisServiceTest"
- implementor="#aegisService"
address="http://localhost:9876/aegis";>
+ implementor="#aegisService"
address="http://localhost:${testutil.ports.TypeCreationOptionsSpringTest}/aegis";>
<jaxws:serviceFactory>
<ref bean='jaxws-and-aegis-service-factory' />
</jaxws:serviceFactory>
Modified: cxf/trunk/rt/management/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
--- cxf/trunk/rt/management/pom.xml (original)
+++ cxf/trunk/rt/management/pom.xml Mon Feb 13 18:10:06 2012
@@ -49,6 +49,12 @@
<artifactId>cxf-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
---
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
(original)
+++
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
Mon Feb 13 18:10:06 2012
@@ -28,13 +28,15 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.cxf.management.jmx.export.AnnotationTestInstrumentation;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class JMXManagedComponentManagerTest extends Assert {
-
+ private static final String PORT =
TestUtil.getPortNumber(JMXManagedComponentManagerTest.class);
private static final String NAME_ATTRIBUTE = "Name";
private InstrumentationManagerImpl manager;
@@ -44,7 +46,7 @@ public class JMXManagedComponentManagerT
manager.setDaemon(false);
manager.setThreaded(true);
manager.setEnabled(true);
-
manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi");
+ manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" +
PORT + "/jmxrmi");
manager.init();
//Wait for MBeanServer connector to be initialized on separate thread.
Thread.sleep(2000);
@@ -130,7 +132,7 @@ public class JMXManagedComponentManagerT
// cannot be created.
this.manager.setThreaded(false);
this.manager.setEnabled(true);
-
this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi");
+
this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + PORT
+ "/jmxrmi");
this.manager.setServer(server);
this.manager.register();
this.manager.init();
@@ -164,7 +166,7 @@ public class JMXManagedComponentManagerT
// cannot be created.
this.manager.setThreaded(false);
this.manager.setEnabled(true);
-
this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi");
+
this.manager.setJMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + PORT
+ "/jmxrmi");
this.manager.setServer(server);
this.manager.register();
this.manager.init();
Modified:
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
---
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
(original)
+++
cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorTest.java
Mon Feb 13 18:10:06 2012
@@ -24,13 +24,16 @@ package org.apache.cxf.management.jmx;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Assert;
import org.junit.Test;
public class MBServerConnectorTest extends Assert {
-
+ private static final String PORT =
TestUtil.getPortNumber(MBServerConnectorTest.class);
+
@Test
public void testMBServerConnector() {
MBServerConnectorFactory mcf;
@@ -40,7 +43,7 @@ public class MBServerConnectorTest exten
mcf.setMBeanServer(mbs);
mcf.setThreaded(true);
mcf.setDaemon(true);
-
mcf.setServiceUrl("service:jmx:rmi:///jndi/rmi://localhost:9913/jmxrmi");
+ mcf.setServiceUrl("service:jmx:rmi:///jndi/rmi://localhost:" + PORT +
"/jmxrmi");
try {
mcf.createConnector();
Thread.sleep(1000);
Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Mon Feb 13 18:10:06 2012
@@ -112,6 +112,13 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified:
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=1243631&r1=1243630&r2=1243631&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Mon Feb 13 18:10:06 2012
@@ -40,6 +40,7 @@ import org.apache.cxf.configuration.spri
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.management.InstrumentationManager;
+import org.apache.cxf.testutil.common.TestUtil;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
@@ -54,6 +55,13 @@ import org.junit.Before;
import org.junit.Test;
public class JettyHTTPServerEngineTest extends Assert {
+ private static final int PORT1
+ =
Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 1));
+ private static final int PORT2
+ =
Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 2));
+ private static final int PORT3
+ =
Integer.valueOf(TestUtil.getPortNumber(JettyHTTPServerEngineTest.class, 3));
+
private Bus bus;
private IMocksControl control;
@@ -85,11 +93,11 @@ public class JettyHTTPServerEngineTest e
@Test
public void testEngineRetrieval() throws Exception {
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9234, "http");
+ factory.createJettyHTTPServerEngine(PORT1, "http");
assertTrue(
"Engine references for the same port should point to the same
instance",
- engine == factory.retrieveJettyHTTPServerEngine(9234));
+ engine == factory.retrieveJettyHTTPServerEngine(PORT1));
JettyHTTPServerEngineFactory.destroyForPort(1234);
}
@@ -97,13 +105,13 @@ public class JettyHTTPServerEngineTest e
@Test
public void testHttpAndHttps() throws Exception {
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9234, "http");
+ factory.createJettyHTTPServerEngine(PORT1, "http");
assertTrue("Protocol must be http",
"http".equals(engine.getProtocol()));
engine = new JettyHTTPServerEngine();
- engine.setPort(9235);
+ engine.setPort(PORT2);
engine.setMaxIdleTime(30000);
engine.setTlsServerParameters(new TLSServerParameters());
engine.finalizeConfig();
@@ -111,27 +119,27 @@ public class JettyHTTPServerEngineTest e
List<JettyHTTPServerEngine> list = new
ArrayList<JettyHTTPServerEngine>();
list.add(engine);
factory.setEnginesList(list);
- engine = factory.createJettyHTTPServerEngine(9235, "https");
+ engine = factory.createJettyHTTPServerEngine(PORT2, "https");
JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
// need to create a servant to create the connector
- engine.addServant(new URL("https://localhost:9235/test";), handler1);
+ engine.addServant(new URL("https://localhost:"; + PORT2 + "/test"),
handler1);
assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
assertEquals("Get the wrong maxIdleTime.", 30000,
engine.getConnector().getMaxIdleTime());
- factory.setTLSServerParametersForPort(9234, new TLSServerParameters());
- engine = factory.createJettyHTTPServerEngine(9234, "https");
+ factory.setTLSServerParametersForPort(PORT1, new
TLSServerParameters());
+ engine = factory.createJettyHTTPServerEngine(PORT1, "https");
assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
- factory.setTLSServerParametersForPort(9236, new TLSServerParameters());
- engine = factory.createJettyHTTPServerEngine(9236, "https");
+ factory.setTLSServerParametersForPort(PORT3, new
TLSServerParameters());
+ engine = factory.createJettyHTTPServerEngine(PORT3, "https");
assertTrue("Protocol must be https",
"https".equals(engine.getProtocol()));
- JettyHTTPServerEngineFactory.destroyForPort(9234);
- JettyHTTPServerEngineFactory.destroyForPort(9235);
- JettyHTTPServerEngineFactory.destroyForPort(9236);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT1);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT2);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT3);
}
@@ -171,10 +179,10 @@ public class JettyHTTPServerEngineTest e
@Test
public void testaddServants() throws Exception {
- String urlStr = "http://localhost:9234/hello/test";;
- String urlStr2 = "http://localhost:9234/hello233/test";;
+ String urlStr = "http://localhost:"; + PORT1 + "/hello/test";
+ String urlStr2 = "http://localhost:"; + PORT1 + "/hello233/test";
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9234, "http");
+ factory.createJettyHTTPServerEngine(PORT1, "http");
engine.setMaxIdleTime(30000);
JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
@@ -199,7 +207,7 @@ public class JettyHTTPServerEngineTest e
response = getResponse(urlStr2);
assertEquals("The jetty http handler did not take effect", response,
"string2");
// set the get request
- JettyHTTPServerEngineFactory.destroyForPort(9234);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT1);
}
@@ -209,12 +217,12 @@ public class JettyHTTPServerEngineTest e
*/
@Test
public void testJmxSupport() throws Exception {
- String urlStr = "http://localhost:9234/hello/test";;
- String urlStr2 = "http://localhost:9235/hello/test";;
+ String urlStr = "http://localhost:"; + PORT1 + "/hello/test";
+ String urlStr2 = "http://localhost:"; + PORT2 + "/hello/test";
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9234, "http");
+ factory.createJettyHTTPServerEngine(PORT1, "http");
JettyHTTPServerEngine engine2 =
- factory.createJettyHTTPServerEngine(9235, "http");
+ factory.createJettyHTTPServerEngine(PORT2, "http");
JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
@@ -246,18 +254,18 @@ public class JettyHTTPServerEngineTest e
queryNames(new
ObjectName("org.eclipse.jetty.server:type=server,*"), null));
assertEquals("Could not find 0 Jetty Server: " + s, 0, s.size());
- JettyHTTPServerEngineFactory.destroyForPort(9234);
- JettyHTTPServerEngineFactory.destroyForPort(9235);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT1);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT2);
}
@Test
public void testSetHandlers() throws Exception {
- URL url = new URL("http://localhost:9235/hello/test";);
+ URL url = new URL("http://localhost:"; + PORT2 + "/hello/test");
JettyHTTPTestHandler handler1 = new JettyHTTPTestHandler("string1",
true);
JettyHTTPTestHandler handler2 = new JettyHTTPTestHandler("string2",
true);
JettyHTTPServerEngine engine = new JettyHTTPServerEngine();
- engine.setPort(9235);
+ engine.setPort(PORT2);
List<Handler> handlers = new ArrayList<Handler>();
handlers.add(handler1);
@@ -277,9 +285,9 @@ public class JettyHTTPServerEngineTest e
@Test
public void testGetContextHandler() throws Exception {
- String urlStr = "http://localhost:9234/hello/test";;
+ String urlStr = "http://localhost:"; + PORT1 + "/hello/test";
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9234, "http");
+ factory.createJettyHTTPServerEngine(PORT1, "http");
ContextHandler contextHandler = engine.getContextHandler(new
URL(urlStr));
// can't find the context handler here
assertNull(contextHandler);
@@ -305,15 +313,15 @@ public class JettyHTTPServerEngineTest e
fail("Can't get the reponse from the server " + ex);
}
assertEquals("the jetty http handler did not take effect", response,
"string2");
- JettyHTTPServerEngineFactory.destroyForPort(9234);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT1);
}
@Test
public void testJettyHTTPHandler() throws Exception {
- String urlStr1 = "http://localhost:9236/hello/test";;
- String urlStr2 = "http://localhost:9236/hello/test2";;
+ String urlStr1 = "http://localhost:"; + PORT3 + "/hello/test";
+ String urlStr2 = "http://localhost:"; + PORT3 + "/hello/test2";
JettyHTTPServerEngine engine =
- factory.createJettyHTTPServerEngine(9236, "http");
+ factory.createJettyHTTPServerEngine(PORT3, "http");
ContextHandler contextHandler = engine.getContextHandler(new
URL(urlStr1));
// can't find the context handler here
assertNull(contextHandler);
@@ -338,7 +346,7 @@ public class JettyHTTPServerEngineTest e
}
assertEquals("the jetty http handler did not take effect", response,
"test2");
- JettyHTTPServerEngineFactory.destroyForPort(9236);
+ JettyHTTPServerEngineFactory.destroyForPort(PORT3);
}
private String getResponse(String target) throws Exception {
