[320077] Add a system property for the TCPAcceptor listen port

https://bugs.eclipse.org/bugs/show_bug.cgi?id=320077

5 files changed, 59 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
index 3e977fb0cf..185ae82a01 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/SessionConfig.java
@@ -207,11 +207,6 @@ public abstract class SessionConfig extends Config implements ISessionConfig
     @Override
     public void startTransport() throws Exception
     {
-      if (System.getProperty("org.eclipse.net4j.tcp.acceptor.port") == null)
-      {
-        System.setProperty("org.eclipse.net4j.tcp.acceptor.port", "2037");
-      }
-
       IAcceptor acceptor = getAcceptor();
       LifecycleUtil.activate(acceptor);
 
@@ -278,13 +273,13 @@ public abstract class SessionConfig extends Config implements ISessionConfig
     @Override
     public IAcceptor getAcceptor()
     {
-      return TCPUtil.getAcceptor(getCurrentTest().getServerContainer(), null);
+      return TCPUtil.getAcceptor(getCurrentTest().getServerContainer(), "0.0.0.0:2037");
     }
 
     @Override
     public IConnector getConnector()
     {
-      return TCPUtil.getConnector(getCurrentTest().getClientContainer(), CONNECTOR_HOST);
+      return TCPUtil.getConnector(getCurrentTest().getClientContainer(), CONNECTOR_HOST + ":2037");
     }
 
     @Override
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/.api_filters b/plugins/org.eclipse.net4j.tcp/.settings/.api_filters
new file mode 100644
index 0000000000..0e24a42d4f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tcp/.settings/.api_filters
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.net4j.tcp" version="2">
+    <resource path="src/org/eclipse/net4j/tcp/ITCPAcceptor.java" type="org.eclipse.net4j.tcp.ITCPAcceptor">
+        <filter id="389242988">
+            <message_arguments>
+                <message_argument value="org.eclipse.net4j.tcp.ITCPAcceptor"/>
+                <message_argument value="DEFAULT_PORT"/>
+                <message_argument value="2036"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/net4j/tcp/ITCPConnector.java" type="org.eclipse.net4j.tcp.ITCPConnector">
+        <filter id="389242988">
+            <message_arguments>
+                <message_argument value="org.eclipse.net4j.tcp.ITCPConnector"/>
+                <message_argument value="DEFAULT_PORT"/>
+                <message_argument value="2036"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
index 63bf5c07ce..1ea131b4c7 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
@@ -62,7 +62,7 @@ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPPassiveSe
 
   private String address = DEFAULT_ADDRESS;
 
-  private int port = getDefaultPort();
+  private int port = DEFAULT_PORT;
 
   public TCPAcceptor()
   {
@@ -258,22 +258,4 @@ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPPassiveSe
   {
     return new TCPServerConnector(this);
   }
-
-  private static int getDefaultPort()
-  {
-    try
-    {
-      String property = System.getProperty(DEFAULT_PORT_PROPERTY);
-      if (property != null)
-      {
-        return Integer.valueOf(property);
-      }
-    }
-    catch (Exception ex)
-    {
-      OM.LOG.error(ex);
-    }
-
-    return DEFAULT_PORT;
-  }
 }
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
index 4d8c5e5304..6ab92fba6b 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/OM.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -32,6 +32,34 @@ public abstract class OM
   public static final OMLogger LOG = BUNDLE.logger();
 
   /**
+   * @since 3.1
+   */
+  public static final String DEFAULT_PORT_PROPERTY = BUNDLE_ID + ".port";
+
+  /**
+   * @since 3.1
+   */
+  public static final int DEFAULT_PORT = 2036;
+
+  public static int getDefaultPort()
+  {
+    try
+    {
+      String property = BUNDLE.getPlatform().getProperty(DEFAULT_PORT_PROPERTY);
+      if (property != null)
+      {
+        return Integer.valueOf(property);
+      }
+    }
+    catch (Exception ex)
+    {
+      OM.LOG.error(ex);
+    }
+
+    return DEFAULT_PORT;
+  }
+
+  /**
    * @author Eike Stepper
    */
   public static final class Activator extends OSGiActivator
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
index d0e90979a4..d15c2bb0a7 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.tcp;
 
 import org.eclipse.net4j.acceptor.IAcceptor;
+import org.eclipse.net4j.internal.tcp.bundle.OM;
 
 /**
  * @author Eike Stepper
@@ -20,7 +21,11 @@ public interface ITCPAcceptor extends IAcceptor
 {
   public static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
 
-  public static final int DEFAULT_PORT = 2036;
+  /**
+   * The value of the <i>org.eclipse.net4j.tcp.port</i> bundle/system property if defined, the value <i>2036</i>
+   * otherwise.
+   */
+  public static final int DEFAULT_PORT = OM.getDefaultPort();
 
   public String getAddress();