JBoss Remoting SVN: r5960 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:49:17 -0400 (Mon, 02 Aug 2010)
New Revision: 5960
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2010-08-02 20:48:49 UTC (rev 5959)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java 2010-08-02 20:49:17 UTC (rev 5960)
@@ -31,6 +31,7 @@
import org.jboss.remoting.marshal.MarshalFactory;
import org.jboss.remoting.marshal.MarshallLoaderFactory;
import org.jboss.remoting.serialization.ClassLoaderUtility;
+import org.jboss.remoting.util.LocalHostUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -525,8 +526,8 @@
String path = (String) invokerConfig.get("path");
PortUtil.updateRange(invokerConfig);
- String host = clientConnectAddress != null ? clientConnectAddress : serverBindAddress != null ? serverBindAddress : InetAddress.getLocalHost().getHostAddress();
- int port = clientConnectPort != null ? Integer.parseInt(clientConnectPort) : serverBindPort != null ? Integer.parseInt(serverBindPort) : PortUtil.findFreePort(serverBindAddress != null ? serverBindAddress : InetAddress.getLocalHost().getHostAddress());
+ String host = clientConnectAddress != null ? clientConnectAddress : serverBindAddress != null ? serverBindAddress : LocalHostUtil.getLocalHost().getHostAddress();
+ int port = clientConnectPort != null ? Integer.parseInt(clientConnectPort) : serverBindPort != null ? Integer.parseInt(serverBindPort) : PortUtil.findFreePort(serverBindAddress != null ? serverBindAddress : LocalHostUtil.getLocalHost().getHostAddress());
// finally, let's bild the invoker uri
String tempURI = transport + "://" + fixHostnameForURL(host) + ":" + port;
14 years, 3 months
JBoss Remoting SVN: r5959 - remoting2/branches/2.2/src/main/org/jboss/remoting/stream.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:48:49 -0400 (Mon, 02 Aug 2010)
New Revision: 5959
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/stream/StreamServer.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/stream/StreamServer.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/stream/StreamServer.java 2010-08-02 20:48:26 UTC (rev 5958)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/stream/StreamServer.java 2010-08-02 20:48:49 UTC (rev 5959)
@@ -30,6 +30,7 @@
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.transport.Connector;
import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.util.LocalHostUtil;
import javax.management.MBeanServer;
import java.io.IOException;
@@ -116,13 +117,13 @@
transport = System.getProperty(STREAM_TRANSPORT_KEY, transport);
try
{
- host = InetAddress.getLocalHost().getHostName();
+ host = LocalHostUtil.getLocalHost().getHostName();
}
catch(UnknownHostException e)
{
try
{
- host = InetAddress.getLocalHost().getHostAddress();
+ host = LocalHostUtil.getLocalHost().getHostAddress();
}
catch(UnknownHostException e1)
{
14 years, 3 months
JBoss Remoting SVN: r5958 - remoting2/branches/2.2/src/main/org/jboss/remoting/ident.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:48:26 -0400 (Mon, 02 Aug 2010)
New Revision: 5958
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/ident/Identity.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ident/Identity.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/ident/Identity.java 2010-08-02 20:48:04 UTC (rev 5957)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/ident/Identity.java 2010-08-02 20:48:26 UTC (rev 5958)
@@ -22,6 +22,7 @@
package org.jboss.remoting.ident;
import org.jboss.remoting.network.NetworkRegistry;
+import org.jboss.remoting.util.LocalHostUtil;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -202,7 +203,7 @@
try
{
String serverid = (String) server.getAttribute(new ObjectName("JMImplementation:type=MBeanServerDelegate"), "MBeanServerId");
- Identity identity = new Identity(InetAddress.getLocalHost(), createId(server), serverid);
+ Identity identity = new Identity(LocalHostUtil.getLocalHost(), createId(server), serverid);
identities.put(server, identity);
return identity;
}
14 years, 3 months
JBoss Remoting SVN: r5957 - remoting2/branches/2.2/src/main/org/jboss/remoting/detection/multicast.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:48:04 -0400 (Mon, 02 Aug 2010)
New Revision: 5957
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/detection/multicast/MulticastDetector.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/detection/multicast/MulticastDetector.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/detection/multicast/MulticastDetector.java 2010-08-02 20:47:49 UTC (rev 5956)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/detection/multicast/MulticastDetector.java 2010-08-02 20:48:04 UTC (rev 5957)
@@ -23,6 +23,7 @@
import org.jboss.remoting.detection.AbstractDetector;
import org.jboss.remoting.detection.Detection;
+import org.jboss.remoting.util.LocalHostUtil;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -157,7 +158,7 @@
this.addr = InetAddress.getByName(defaultIP);
}
// check to see if we're running on a machine with loopback and no NIC
- InetAddress localHost = InetAddress.getLocalHost();
+ InetAddress localHost = LocalHostUtil.getLocalHost();
if(bindAddr == null && localHost.getHostAddress().equals("127.0.0.1"))
{
// use this to bind so multicast will work w/o network
14 years, 3 months
JBoss Remoting SVN: r5956 - remoting2/branches/2.2/src/main/org/jboss/remoting/detection/jndi.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:47:49 -0400 (Mon, 02 Aug 2010)
New Revision: 5956
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java 2010-08-02 20:47:27 UTC (rev 5955)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java 2010-08-02 20:47:49 UTC (rev 5956)
@@ -28,6 +28,7 @@
import org.jboss.remoting.detection.Detection;
import org.jboss.remoting.ident.Identity;
import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.util.LocalHostUtil;
import org.jnp.interfaces.NamingContextFactory;
import org.jnp.server.Main;
@@ -422,7 +423,7 @@
try
{
log.info("JNDI Server configuration information not present so will create a local server.");
- host = InetAddress.getLocalHost().getHostName();
+ host = LocalHostUtil.getLocalHost().getHostName();
port = PortUtil.findFreePort(host);
log.info("Remoting JNDI detector starting JNDI server instance since none where specified via configuration.");
14 years, 3 months
JBoss Remoting SVN: r5955 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:47:27 -0400 (Mon, 02 Aug 2010)
New Revision: 5955
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java 2010-08-02 20:47:10 UTC (rev 5954)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/ServerInvoker.java 2010-08-02 20:47:27 UTC (rev 5955)
@@ -36,6 +36,7 @@
import org.jboss.remoting.stream.StreamHandler;
import org.jboss.remoting.stream.StreamInvocationHandler;
import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.util.LocalHostUtil;
import org.jboss.remoting.serialization.ClassLoaderUtility;
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BlockingMode;
@@ -1074,7 +1075,7 @@
}
else
{
- addr = InetAddress.getLocalHost();
+ addr = LocalHostUtil.getLocalHost();
}
int port = locator.getPort();
if(port <= 0)
@@ -1090,7 +1091,7 @@
if(clientConnectAddress != null)
{
// can't use uri address, as is for client only
- serverBindAddress = InetAddress.getLocalHost().getHostAddress();
+ serverBindAddress = LocalHostUtil.getLocalHost().getHostAddress();
}
else
{
14 years, 3 months
JBoss Remoting SVN: r5954 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:47:10 -0400 (Mon, 02 Aug 2010)
New Revision: 5954
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-08-02 20:46:37 UTC (rev 5953)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-08-02 20:47:10 UTC (rev 5954)
@@ -25,6 +25,7 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.util.LocalHostUtil;
import java.io.Serializable;
import java.net.InetAddress;
@@ -132,11 +133,11 @@
boolean byHost = Boolean.valueOf(bindByHost).booleanValue();
if(byHost)
{
- return InetAddress.getLocalHost().getHostName();
+ return LocalHostUtil.getLocalHost().getHostName();
}
else
{
- return InetAddress.getLocalHost().getHostAddress();
+ return LocalHostUtil.getLocalHost().getHostAddress();
}
}
});
@@ -445,11 +446,11 @@
}
if(byHost)
{
- return InetAddress.getLocalHost().getHostName();
+ return LocalHostUtil.getLocalHost().getHostName();
}
else
{
- return InetAddress.getLocalHost().getHostAddress();
+ return LocalHostUtil.getLocalHost().getHostAddress();
}
}
}
14 years, 3 months
JBoss Remoting SVN: r5953 - remoting2/branches/2.2/src/main/org/jboss/remoting.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:46:37 -0400 (Mon, 02 Aug 2010)
New Revision: 5953
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java
Log:
JBREM-1235: Replaced call(s) to InetAddress.getLocalHost() with LocalHostUtil.getLocalHost().
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2010-08-02 20:25:50 UTC (rev 5952)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2010-08-02 20:46:37 UTC (rev 5953)
@@ -37,6 +37,7 @@
import org.jboss.remoting.transport.Connector;
import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.local.LocalClientInvoker;
+import org.jboss.remoting.util.LocalHostUtil;
import org.jboss.util.id.GUID;
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BlockingMode;
@@ -1116,7 +1117,7 @@
}
if (host == null)
{
- host = InetAddress.getLocalHost().getHostAddress();
+ host = LocalHostUtil.getLocalHost().getHostAddress();
metadata.put(CALLBACK_SERVER_HOST, host);
}
if (port == -1)
14 years, 3 months
JBoss Remoting SVN: r5952 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 16:25:50 -0400 (Mon, 02 Aug 2010)
New Revision: 5952
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/LeaseCreationTimeoutTestCase.java
Log:
JBREM-1238: Removed reference to org.apache.log4j.Level.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/LeaseCreationTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/LeaseCreationTimeoutTestCase.java 2010-08-02 19:45:09 UTC (rev 5951)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/LeaseCreationTimeoutTestCase.java 2010-08-02 20:25:50 UTC (rev 5952)
@@ -38,7 +38,6 @@
import junit.framework.TestCase;
import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
import org.apache.log4j.PatternLayout;
import org.jboss.logging.Logger;
import org.jboss.logging.Log4jLoggerPlugin;
14 years, 3 months
JBoss Remoting SVN: r5951 - remoting2/branches/2.x.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-08-02 15:45:09 -0400 (Mon, 02 Aug 2010)
New Revision: 5951
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1238: Determines which version of LeaseCreationTimeoutTestCase based on jdk.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2010-08-02 19:44:05 UTC (rev 5950)
+++ remoting2/branches/2.x/build.xml 2010-08-02 19:45:09 UTC (rev 5951)
@@ -529,6 +529,7 @@
<exclude name="org/jboss/test/remoting/**/http/**" if="isJDK4"/>
<exclude name="org/jboss/test/remoting/**/https/**" if="isJDK4"/>
<exclude name="org/jboss/test/remoting/**/servlet/**" if="isJDK4"/>
+ <exclude name="org/jboss/test/remoting/lease/LeaseCreationTimeoutJDK14TestCase*" unless="isJDK4"/>
<exclude name="org/jboss/test/remoting/lease/LeaseCreationTimeoutTestCase*" if="isJDK4"/>
<classpath refid="tests.classpath"/>
</javac>
14 years, 3 months