cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1244326 - in /cxf/branches/2.4.x-fixes: ./ parent/pom.xml testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
Date Wed, 15 Feb 2012 03:14:30 GMT
Author: dkulp
Date: Wed Feb 15 03:14:30 2012
New Revision: 1244326

URL: http://svn.apache.org/viewvc?rev=1244326&view=rev
Log:
Merged revisions 1244158 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1244158 | dkulp | 2012-02-14 13:44:24 -0500 (Tue, 14 Feb 2012) | 10 lines
  
  Merged revisions 1244145 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1244145 | dkulp | 2012-02-14 13:23:02 -0500 (Tue, 14 Feb 2012) | 2 lines
    
    The serversocket lock doesn't seem to be 100% reliable.  Stick with a
    randomo starting point
  ........
  
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/parent/pom.xml
    cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1244326&r1=1244325&r2=1244326&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Wed Feb 15 03:14:30 2012
@@ -331,6 +331,7 @@
                         <argLine>${cxf.surefire.fork.vmargs}</argLine>
                         <parallel>${cxf.surefire.parallel.mode}</parallel>
                         <systemPropertyVariables>
+                            <cxf.useRandomFirstPort>true</cxf.useRandomFirstPort>
                             <org.apache.ws.commons.schema.protectReadOnlyCollections>${cxf.protect-xmlschema-collections}</org.apache.ws.commons.schema.protectReadOnlyCollections>
                             <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
                             <java.awt.headless>${java.awt.headless}</java.awt.headless>

Modified: cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java?rev=1244326&r1=1244325&r2=1244326&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
(original)
+++ cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
Wed Feb 15 03:14:30 2012
@@ -27,6 +27,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Properties;
+import java.util.Random;
 
 
 public final class TestUtil {
@@ -38,6 +39,9 @@ public final class TestUtil {
     
     static {
         int pn = 9000;
+        if (Boolean.getBoolean("cxf.useRandomFirstPort")) {
+            pn += new Random().nextInt(500) * 100;
+        }
         while (portNum == -1) {
             try {
                 //we'll hold a socket open and allocate ports up from that socket.



Mime
View raw message