Author: dkulp Date: Fri Nov 16 01:50:04 2012 New Revision: 1410152 URL: http://svn.apache.org/viewvc?rev=1410152&view=rev Log: Merged revisions 1410147 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1410147 | dkulp | 2012-11-15 20:47:58 -0500 (Thu, 15 Nov 2012) | 10 lines Merged revisions 1410142 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1410142 | dkulp | 2012-11-15 20:36:23 -0500 (Thu, 15 Nov 2012) | 2 lines Fix an issue with a test if run standalone. ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java Modified: cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java?rev=1410152&r1=1410151&r2=1410152&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/QueryHandlerTest.java Fri Nov 16 01:50:04 2012 @@ -32,6 +32,8 @@ import org.apache.cxf.common.logging.Log import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.ServerFactoryBean; import org.apache.cxf.test.AbstractCXFSpringTest; +import org.apache.cxf.testutil.common.TestUtil; + import org.junit.Before; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; @@ -40,6 +42,7 @@ 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;
