svn commit: r1086675 - /tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java

[lr...@apache.org]

Author: lresende
Date: Tue Mar 29 18:26:10 2011
New Revision: 1086675

URL: http://svn.apache.org/viewvc?rev=1086675&view=rev
Log:
TUSCANY-3856 - Adding support for 'portDefault' backdoor to avoid test failures...

Modified:
    tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java

Modified: tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?rev=1086675&r1=1086674&r2=1086675&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java Tue Mar 29 18:26:10 2011
@@ -89,7 +89,7 @@ public class JettyServer implements Serv
 
     // TODO - this static seems to be set by the JSORPC binding unit test
     //        doesn't look to be a great way of doing things
-    //public static int portDefault = 8080;
+    public static int portDefault = 0;
     private int defaultPort;
     private int defaultSSLPort;
 
@@ -128,6 +128,10 @@ public class JettyServer implements Serv
         this.workScheduler = workScheduler;
 
         this.defaultPort = httpPortAllocator.getDefaultPort(HttpScheme.HTTP);
+        //handle backdoor to set specific default port in tests
+        if(portDefault > 0) {
+            this.defaultPort = portDefault;
+        }
         this.defaultSSLPort = httpPortAllocator.getDefaultPort(HttpScheme.HTTPS);
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {