jboss-remoting-commits
December 2009
jboss-remoting-commits@lists.jboss.org
- 1 participants
- 33 discussions
JBoss Remoting SVN: r5619 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-12-20 21:16:24 -0500 (Sun, 20 Dec 2009)
New Revision: 5619
Added:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java
Log:
JBREM-1164: New unit tests.
Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6HostWithNoBracketsTestCase.java 2009-12-21 02:16:24 UTC (rev 5619)
@@ -0,0 +1,404 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.remoting.ipv6;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerConfiguration;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.util.SecurityUtility;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+
+/**
+ * Unit tests for JBREM-1164.
+ *
+ * @author <a href="mailto:bclare@tpg.com.au">Ben Clare</a>
+ * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
+ *
+ * @version $Rev$
+ * <p>
+ * Copyright Dec 20, 2009
+ * </p>
+ */
+public class IPv6HostWithNoBracketsTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(IPv6HostWithNoBracketsTestCase.class);
+ private static boolean firstTime = true;
+ private static int port = 8080;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testXMLWithoutBrackets() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ assertTrue(doXMLTest("::", ++port));
+ assertTrue(doXMLTest("::1", ++port));
+ assertTrue(doXMLTest("0:0:0:0:0:0:0:1", ++port));
+ assertTrue(doXMLTest("0:0:0:0:0:0:127.0.0.1", ++port));
+ assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port));
+ assertTrue(doXMLTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port));
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testXMLWithBrackets() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ assertTrue(doXMLTest("[::]", ++port));
+ assertTrue(doXMLTest("[::1]", ++port));
+ assertTrue(doXMLTest("[0:0:0:0:0:0:0:1]", ++port));
+ assertTrue(doXMLTest("[0:0:0:0:0:0:127.0.0.1]", ++port));
+ assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port));
+ assertTrue(doXMLTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port));
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testXMLWithoutHost() throws Exception
+ {
+ log.info("entering " + getName());
+
+ String xml = new StringBuffer()
+ .append("<mbean code=\"org.jboss.remoting.transport.Connector\"\n")
+ .append(" name=\"jboss.messaging:service=Connector,transport=socket\"\n")
+ .append(" display-name=\"Connector\">\n")
+ .append(" <attribute name=\"Configuration\">\n")
+ .append(" <config>\n")
+ .append(" <invoker transport=\"socket\">\n")
+ .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_PORT_KEY + "\">" + port + "</attribute>\n")
+ .append(" <attribute name=\"timeout\" isParam=\"true\">10000</attribute>\n")
+ .append(" </invoker>\n")
+ .append(" <handlers>\n")
+ .append(" <handler subsystem=\"test\">" + SampleInvocationHandler.class.getName() + "</handler>\n")
+ .append(" </handlers>\n")
+ .append(" </config>\n")
+ .append(" </attribute>\n")
+ .append("</mbean>\n").toString();
+ Connector connector = new Connector();
+ ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
+ Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(bais);
+ Element element = doc.getDocumentElement();
+ connector.setConfiguration(element);
+ try
+ {
+ connector.create();
+ InvokerLocator expected = new InvokerLocator("socket://" + getLocalHost() + ":" + port + "/?timeout=10000");
+ InvokerLocator actual = connector.getLocator();
+ log.info("Expected: " + expected);
+ log.info("Actual: " + actual);InetAddress.getLocalHost();
+ assertEquals(expected, actual);
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught " + e.getMessage());
+ }
+ finally
+ {
+ connector.stop();
+ }
+
+ log.info(getName() + " PASSES");
+ }
+
+
+
+ public void testServerConfigurationWithoutBrackets() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ assertTrue(doServerConfigurationTest("::", ++port));
+ assertTrue(doServerConfigurationTest("::1", ++port));
+ assertTrue(doServerConfigurationTest("0:0:0:0:0:0:0:1", ++port));
+ assertTrue(doServerConfigurationTest("0:0:0:0:0:0:127.0.0.1", ++port));
+ assertTrue(doServerConfigurationTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf", ++port));
+ assertTrue(doServerConfigurationTest("3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", ++port));
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testServerConfigurationWithBrackets() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ assertTrue(doServerConfigurationTest("[::]", ++port));
+ assertTrue(doServerConfigurationTest("[::1]", ++port));
+ assertTrue(doServerConfigurationTest("[0:0:0:0:0:0:0:1]", ++port));
+ assertTrue(doServerConfigurationTest("[0:0:0:0:0:0:127.0.0.1]", ++port));
+ assertTrue(doServerConfigurationTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", ++port));
+ assertTrue(doServerConfigurationTest("[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", ++port));
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ public void testServerConfigurationWithoutHost() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Create ServerConfiguration.
+ ServerConfiguration config = new ServerConfiguration("socket");
+ Map locatorConfig = new HashMap();
+
+ // Add invokerLocatorParameters.
+ locatorConfig.put("serverBindPort", Integer.toString(port));
+ locatorConfig.put("timeout", "10000");
+ config.setInvokerLocatorParameters(locatorConfig);
+
+ // Add invocation handler.
+ Map handlers = new HashMap();
+ ServerInvocationHandler handler = new SampleInvocationHandler();
+ handlers.put("test", handler);
+ config.setInvocationHandlers(handlers);
+
+ // Create Connector.
+ Connector connector = new Connector();
+ try
+ {
+ connector.setServerConfiguration(config);
+ connector.create();
+ InvokerLocator expected = new InvokerLocator("socket://" + getLocalHost() + ":" + port + "/?timeout=10000");
+ InvokerLocator actual = connector.getLocator();
+ log.info("Expected: " + expected);
+ log.info("Actual: " + actual);
+ assertEquals(expected, actual);
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught ", e);
+ }
+ finally
+ {
+ connector.stop();
+ }
+
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected boolean doXMLTest(String host, int port) throws Exception
+ {
+ String xml = new StringBuffer()
+ .append("<mbean code=\"org.jboss.remoting.transport.Connector\"\n")
+ .append(" name=\"jboss.messaging:service=Connector,transport=socket\"\n")
+ .append(" display-name=\"Connector\">\n")
+ .append(" <attribute name=\"Configuration\">\n")
+ .append(" <config>\n")
+ .append(" <invoker transport=\"socket\">\n")
+ .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_ADDRESS_KEY + "\">" + host + "</attribute>\n")
+ .append(" <attribute name=\"" + ServerInvoker.SERVER_BIND_PORT_KEY + "\">" + port + "</attribute>\n")
+ .append(" <attribute name=\"timeout\" isParam=\"true\">10000</attribute>\n")
+ .append(" </invoker>\n")
+ .append(" <handlers>\n")
+ .append(" <handler subsystem=\"test\">" + SampleInvocationHandler.class.getName() + "</handler>\n")
+ .append(" </handlers>\n")
+ .append(" </config>\n")
+ .append(" </attribute>\n")
+ .append("</mbean>\n").toString();
+ Connector connector = new Connector();
+ ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
+ Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(bais);
+ Element element = doc.getDocumentElement();
+ connector.setConfiguration(element);
+ try
+ {
+ connector.create();
+ InvokerLocator expected = new InvokerLocator("socket://" + fixHostnameForURL(host) + ":" + port + "/?timeout=10000");
+ InvokerLocator actual = connector.getLocator();
+ log.info("Expected: " + expected);
+ log.info("Actual: " + actual);
+ assertEquals(expected, actual);
+ return true;
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught ", e);
+ return false;
+ }
+ finally
+ {
+ connector.stop();
+ }
+ }
+
+
+ protected boolean doServerConfigurationTest(String host, int port) throws Exception
+ {
+ // Create ServerConfiguration.
+ ServerConfiguration config = new ServerConfiguration("socket");
+ Map locatorConfig = new HashMap();
+
+ // Add invokerLocatorParameters.
+ locatorConfig.put("serverBindAddress", host);
+ locatorConfig.put("serverBindPort", Integer.toString(port));
+ locatorConfig.put("timeout", "10000");
+ config.setInvokerLocatorParameters(locatorConfig);
+
+ // Add invocation handler.
+ Map handlers = new HashMap();
+ ServerInvocationHandler handler = new SampleInvocationHandler();
+ handlers.put("test", handler);
+ config.setInvocationHandlers(handlers);
+
+ // Create Connector.
+ Connector connector = new Connector();
+ try
+ {
+ connector.setServerConfiguration(config);
+ connector.create();
+ InvokerLocator expected = new InvokerLocator("socket://" + fixHostnameForURL(host) + ":" + port + "/?timeout=10000");
+ InvokerLocator actual = connector.getLocator();
+ log.info("Expected: " + expected);
+ log.info("Actual: " + actual);
+ assertEquals(expected, actual);
+ return true;
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught ", e);
+ return false;
+ }
+ finally
+ {
+ connector.stop();
+ }
+ }
+
+
+ static protected String fixHostnameForURL(String host)
+ {
+ if (host == null)
+ return host ;
+
+ // if the hostname is an IPv6 literal, enclose it in brackets
+ if (host.indexOf(':') != -1 && host.indexOf("[") == -1)
+ {
+ System.out.println("HOST: [" + host + "]");
+ return "[" + host + "]" ;
+ }
+ else
+ {
+ return host;
+ }
+ }
+
+
+ static protected String getLocalHost() throws UnknownHostException
+ {
+ if (SecurityUtility.skipAccessControl())
+ {
+ try
+ {
+ System.setProperty("java.net.preferIPv6Addresses", "true");
+ return InetAddress.getLocalHost().getHostAddress();
+ }
+ catch (IOException e)
+ {
+ return InetAddress.getByName("127.0.0.1").getHostAddress();
+ }
+ }
+
+ try
+ {
+ return (String) AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws IOException
+ {
+ try
+ {
+ System.setProperty("java.net.preferIPv6Addresses", "true");
+ return InetAddress.getLocalHost().getHostAddress();
+ }
+ catch (IOException e)
+ {
+ return InetAddress.getByName("127.0.0.1").getHostAddress();
+ }
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (UnknownHostException) e.getCause();
+ }
+ }
+
+
+ public static class SampleInvocationHandler implements ServerInvocationHandler
+ {
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+}
\ No newline at end of file
14 years, 4 months
- 1
- 0
JBoss Remoting SVN: r5618 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-12-20 21:13:43 -0500 (Sun, 20 Dec 2009)
New Revision: 5618
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java
Log:
JBREM-1164: Adds brackets around IPv6 host addresses when it creates an InvokerLocator.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java 2009-12-14 00:10:14 UTC (rev 5617)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java 2009-12-21 02:13:43 UTC (rev 5618)
@@ -627,7 +627,7 @@
: localHostAddress;
// finally, let's build the invoker uri
- tempURI = transport + "://" + host + ":" + port;
+ tempURI = transport + "://" + fixHostnameForURL(host) + ":" + port;
if (path != null)
{
tempURI += "/" + path;
@@ -824,7 +824,7 @@
? serverBindAddress
: localHostAddress);
- tempURI = transport + "://" + host + ":" + port + ((path != null) ? ("/" + path) : "");
+ tempURI = transport + "://" + fixHostnameForURL(host) + ":" + port + ((path != null) ? ("/" + path) : "");
}
else
{
@@ -878,6 +878,18 @@
}
}
+ // adds enclosing brackets if an IPv6 literal address
+ private String fixHostnameForURL(String address)
+ {
+ if (address == null)
+ return address ;
+
+ if (address.indexOf(':') != -1 && address.indexOf("[") == -1)
+ return "[" + address + "]" ;
+ else
+ return address ;
+ }
+
private void configureHandlersFromServerConfiguration() throws Exception
{
Map handlerMap = serverConfiguration.getInvocationHandlers();
14 years, 4 months
- 1
- 0
JBoss Remoting SVN: r5603 - in remoting3-multiplex/trunk/src/main: resources and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-12-10 17:44:07 -0500 (Thu, 10 Dec 2009)
New Revision: 5603
Added:
remoting3-multiplex/trunk/src/main/resources/
remoting3-multiplex/trunk/src/main/resources/META-INF/
remoting3-multiplex/trunk/src/main/resources/META-INF/services/
remoting3-multiplex/trunk/src/main/resources/META-INF/services/org.jboss.remoting3.spi.RemotingServiceDescriptor
Log:
Add service descriptor
Added: remoting3-multiplex/trunk/src/main/resources/META-INF/services/org.jboss.remoting3.spi.RemotingServiceDescriptor
===================================================================
--- remoting3-multiplex/trunk/src/main/resources/META-INF/services/org.jboss.remoting3.spi.RemotingServiceDescriptor (rev 0)
+++ remoting3-multiplex/trunk/src/main/resources/META-INF/services/org.jboss.remoting3.spi.RemotingServiceDescriptor 2009-12-10 22:44:07 UTC (rev 5603)
@@ -0,0 +1,23 @@
+#
+# JBoss, Home of Professional Open Source
+# Copyright 2009, JBoss Inc., and individual contributors as indicated
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# This module defines the Remoting multiplex provider
+org.jboss.remoting3.multiplex.RemoteDescriptor
\ No newline at end of file
14 years, 4 months
- 1
- 0