Author: dkulp
Date: Fri Nov 16 17:29:22 2012
New Revision: 1410497
URL: http://svn.apache.org/viewvc?rev=1410497&view=rev
Log:
Use new ports on the tests to make sure things aren't beeing shutdown
while running.
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AegisTest.java
Fri Nov 16 17:29:22 2012
@@ -29,6 +29,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.AegisServiceImpl;
+import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Before;
import org.junit.Test;
@@ -56,6 +57,7 @@ public class AegisTest extends Javascrip
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:AegisBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/AnyTest.java
Fri Nov 16 17:29:22 2012
@@ -27,6 +27,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.AnyImpl;
+import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Before;
import org.junit.Test;
@@ -55,6 +56,7 @@ public class AnyTest extends JavascriptR
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:AnyBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitBareClientTest.java
Fri Nov 16 17:29:22 2012
@@ -28,6 +28,8 @@ import org.apache.cxf.javascript.Javascr
import org.apache.cxf.javascript.fortest.SimpleDocLitBareImpl;
import org.apache.cxf.javascript.fortest.TestBean1;
import org.apache.cxf.javascript.fortest.TestBean2;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Before;
import org.junit.Test;
import org.mozilla.javascript.Context;
@@ -55,6 +57,7 @@ public class DocLitBareClientTest extend
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:DocLitBareClientTestBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
Fri Nov 16 17:29:22 2012
@@ -29,6 +29,8 @@ import org.apache.cxf.javascript.Javascr
import org.apache.cxf.javascript.fortest.SimpleDocLitWrappedImpl;
import org.apache.cxf.javascript.fortest.TestBean1;
import org.apache.cxf.javascript.fortest.TestBean2;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Before;
import org.junit.Test;
import org.mozilla.javascript.Context;
@@ -64,6 +66,7 @@ public class DocLitWrappedClientTest ext
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:DocLitWrappedClientTestBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
Fri Nov 16 17:29:22 2012
@@ -26,6 +26,8 @@ import org.apache.cxf.annotations.Schema
import org.apache.cxf.javascript.JavascriptTestUtilities.CountDownNotifier;
import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Before;
import org.junit.Test;
import org.mozilla.javascript.Context;
@@ -42,6 +44,7 @@ public class GreeterClientTest extends J
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:GreeterClientTestBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptRhinoTest.java
Fri Nov 16 17:29:22 2012
@@ -28,10 +28,8 @@ import org.apache.cxf.jaxws.JaxWsProxyFa
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.AbstractCXFSpringTest;
-import org.apache.cxf.testutil.common.TestUtil;
public abstract class JavascriptRhinoTest extends AbstractCXFSpringTest {
- public static final String PORT = TestUtil.getPortNumber("TestPort");
protected JavascriptTestUtilities testUtilities;
protected JaxWsProxyFactoryBean clientProxyFactory;
protected ServiceInfo serviceInfo;
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/MtoMTest.java
Fri Nov 16 17:29:22 2012
@@ -27,6 +27,8 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable;
import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier;
import org.apache.cxf.javascript.fortest.MtoMImpl;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Before;
import org.junit.Test;
import org.mozilla.javascript.Context;
@@ -51,6 +53,7 @@ public class MtoMTest extends Javascript
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:MtoMBeans.xml"};
}
Modified:
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java?rev=1410497&r1=1410496&r2=1410497&view=diff
==============================================================================
---
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
(original)
+++
cxf/trunk/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java
Fri Nov 16 17:29:22 2012
@@ -42,7 +42,6 @@ import org.springframework.context.suppo
*
*/
public class QueryHandlerTest extends AbstractCXFSpringTest {
- public static final String PORT = TestUtil.getPortNumber("TestPort");
private static final Charset UTF8 = Charset.forName("utf-8");
private static final Logger LOG =
LogUtils.getL7dLogger(QueryHandlerTest.class);
private Endpoint hwEndpoint;
@@ -62,6 +61,7 @@ public class QueryHandlerTest extends Ab
/** {@inheritDoc}*/
@Override
protected String[] getConfigLocations() {
+ TestUtil.getNewPortNumber("TestPort");
return new String[] {"classpath:HelloWorldDocLitBeans.xml",
"classpath:DocLitBareClientTestBeans.xml",
"classpath:HelloWorldGreeterBeans.xml"};
