April 2011 - jboss-remoting-commits

JBoss Remoting SVN: r6350 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream: local and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-29 17:20:04 -0400 (Fri, 29 Apr 2011) New Revision: 6350 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream/local/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream/local/LocalStreamTestCase.java Log: JBREM-1288: New unit test. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream/local/LocalStreamTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream/local/LocalStreamTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/stream/local/LocalStreamTestCase.java 2011-04-29 21:20:04 UTC (rev 6350) @@ -0,0 +1,270 @@ +/* +* 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.stream.local; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; + +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.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.InvokerRegistry; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.stream.StreamInvocationHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.local.LocalServerInvoker; +import org.jboss.remoting.transport.socket.SocketServerInvoker; + + +/** + * Unit test for JBREM-1288. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * @version $Rev$ + * <p> + * Copyright Apr 29, 2011 + * </p> + */ +public class LocalStreamTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(LocalStreamTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected File testFile = null; + protected FileInputStream fileInput = null; + protected TestStreamInvocationHandler invocationHandler; + + + 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 testLocalStream() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, "test_stream", clientConfig); + client.connect(); + log.info("client is connected"); + + // Test sending stream. + URL fileURL = this.getClass().getResource("../test.txt"); + if(fileURL == null) + { + throw new Exception("Can not find file test.txt"); + } + testFile = new File(fileURL.getFile()); + fileInput = new FileInputStream(testFile); + + String param = "foobar"; + long fileLength = testFile.length(); + log.info("File size = " + fileLength); + Object ret = client.invoke(fileInput, param); + + Map responseMap = (Map)ret; + String subSys = (String)responseMap.get("subsystem"); + String clientId = (String)responseMap.get("clientid"); + String paramVal = (String)responseMap.get("paramval"); + + assertEquals("test_stream".toUpperCase(), subSys); + assertEquals(client.getSessionId(), clientId); + assertEquals("foobar", paramVal); + + Object response = client.invoke("get_size"); + int returnedFileLength = ((Integer) response).intValue(); + log.info("Invocation response: " + response); + log.info("returnedFileLength: " + returnedFileLength); + assertEquals(fileLength, returnedFileLength); + + // Test for LocalServerInvoker. + ServerInvoker[] serverInvokers = InvokerRegistry.getServerInvokers(); + assertEquals(2, serverInvokers.length); + assertTrue(serverInvokers[0] instanceof SocketServerInvoker || serverInvokers[1] instanceof SocketServerInvoker); + assertTrue(serverInvokers[0] instanceof LocalServerInvoker || serverInvokers[1] instanceof LocalServerInvoker); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "socket"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "/?" + metadata; + } + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector = new Connector(serverLocator, config); + connector.create(); + invocationHandler = new TestStreamInvocationHandler(); + connector.addInvocationHandler("test_stream", invocationHandler); + connector.start(); + } + + + protected void shutdownServer() throws Exception + { + if (connector != null) + connector.stop(); + } + + + public static class TestStreamInvocationHandler implements StreamInvocationHandler + { + private InputStream stream = null; + + private int streamSize = 0; + + public Object invoke(InvocationRequest invocation) throws Throwable + { + // Print out the invocation request + log.info("Invocation request is: " + invocation.getParameter()); + + // Just going to return static string as this is just simple example code. + return new Integer(streamSize); + } + + public void addListener(InvokerCallbackHandler callbackHandler) + { + } + public void removeListener(InvokerCallbackHandler callbackHandler) + { + } + public void setMBeanServer(MBeanServer server) + { + } + public void setInvoker(ServerInvoker invoker) + { + } + + public Object handleStream(InputStream stream, InvocationRequest param) + { + this.stream = stream; + + try + { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + byte buf[] = new byte[4096]; + while(true) + { + int c = this.stream.read(buf); + if(c < 0) + { + break; + } + out.write(buf, 0, c); + } + byte[] bytes = out.toByteArray(); + streamSize = bytes.length; + log.info("Read stream. Length is: " + streamSize); + } + catch(IOException e) + { + e.printStackTrace(); + } + // Not closing the InputStream to keep the StreamServer alive. +// finally +// { +// try +// { +//// log.info("closing stream"); +//// stream.close(); +// } +// catch(IOException e) +// { +// log.error("error closing stream", e); +// } +// } + // build return map + Map retMap = new HashMap(); + retMap.put("subsystem", param.getSubsystem()); + retMap.put("clientid", param.getSessionId()); + retMap.put("paramval", param.getParameter()); + return retMap; + } + } +} \ No newline at end of file

13 years, 6 months

1
0
0 / 0

JBoss Remoting SVN: r6349 - remoting2/branches/2.x/src/main/org/jboss/remoting/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-29 17:19:37 -0400 (Fri, 29 Apr 2011) New Revision: 6349 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamServer.java Log: JBREM-1288: Added a new constructor with a transport parameter. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamServer.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamServer.java 2011-04-29 21:18:21 UTC (rev 6348) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamServer.java 2011-04-29 21:19:37 UTC (rev 6349) @@ -119,6 +119,14 @@ String locatorURI = getLocatorURI(); setupServer(locatorURI); } + + public StreamServer(InputStream stream, String transport) throws Exception + { + this.transport = transport; + this.streamSource = stream; + String locatorURI = getLocatorURI(); + setupServer(locatorURI); + } public StreamServer(InputStream stream, InvokerLocator locator) throws Exception { @@ -256,6 +264,7 @@ connector.stop(); connector.destroy(); } + return null; } else if(StreamHandler.RESET.equals(method)) {

13 years, 6 months

1
0
0 / 0

JBoss Remoting SVN: r6348 - remoting2/branches/2.x/src/main/org/jboss/remoting/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-29 17:18:21 -0400 (Fri, 29 Apr 2011) New Revision: 6348 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamHandler.java Log: JBREM-1288: close() calls invokeOneway() and calls Client.disconnect(). Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamHandler.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamHandler.java 2011-04-29 21:08:16 UTC (rev 6347) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/stream/StreamHandler.java 2011-04-29 21:18:21 UTC (rev 6348) @@ -125,13 +125,17 @@ { try { - streamClient.invoke(new StreamCallPayload(CLOSE)); + streamClient.invokeOneway(new StreamCallPayload(CLOSE)); } catch(Throwable throwable) { log.debug("Error closing client stream.", throwable); throw new IOException(throwable.getMessage()); } + finally + { + streamClient.disconnect(); + } } /**

13 years, 6 months

1
0
0 / 0

JBoss Remoting SVN: r6347 - remoting2/branches/2.x/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-29 17:08:16 -0400 (Fri, 29 Apr 2011) New Revision: 6347 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java Log: JBREM-1288: invoke() with InputStream checks for LocalClientInvoker. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2011-04-28 03:05:35 UTC (rev 6346) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2011-04-29 21:08:16 UTC (rev 6347) @@ -1756,7 +1756,15 @@ */ public Object invoke(InputStream inputStream, Object param) throws Throwable { - StreamServer streamServer = new StreamServer(inputStream); + StreamServer streamServer = null; + if (invoker instanceof LocalClientInvoker) + { + streamServer = new StreamServer(inputStream, "local"); + } + else + { + streamServer = new StreamServer(inputStream); + } String locator = streamServer.getInvokerLocator(); // now call on target server and pass locator for stream callbacks

13 years, 6 months

1
0
0 / 0

JBoss Remoting SVN: r6346 - remoting2/branches/2.x/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 23:05:35 -0400 (Wed, 27 Apr 2011) New Revision: 6346 Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml Log: JBREM-1283: Reorganized discussion of executor created by CoyoteInvoker. Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap5.xml 2011-04-28 02:58:51 UTC (rev 6345) +++ remoting2/branches/2.x/docs/guide/en/chap5.xml 2011-04-28 03:05:35 UTC (rev 6346) @@ -1838,11 +1838,8 @@ <para><emphasis role="bold">Note.</emphasis> An executor, subclassed from <classname>java.util.concurrent.Executor</classname>, can be configured and injected into the coyote Connector. As of release 2.5.4.SP2, Remoting can configure - and inject an instance of <classname>org.apache.catalina.core.StandardThreadExecutor</classname>. - The configurable attributes of the <classname>StandardThreadExecutor</classname> - are described in <ulink - url="http://tomcat.apache.org/tomcat-6.0-doc/config/executor.html">http://tomcat.apache.org/tomcat-6.0-doc/config/executor.html</ulink>. - These attributes may be passed to Remoting using the key "executor" and a string of + and inject an instance of <classname>org.apache.catalina.core.StandardThreadExecutor</classname>, + using attributes passed to Remoting using the key "executor" and a string of the form "attribute0=value0,...,attributeN=valueN". For example, a <code>*-service.xml</code> configuration file could contain</para> @@ -1852,6 +1849,9 @@ a <classname>StandardThreadExecutor</classname>, and inject it into the coyote Connector. Note that if an executor is injected, the other threadpool related attributes such as "maxThreads", which would otherwise be applied to a threadpool created by the coyote Connector, are ignored. + The configurable attributes of the <classname>StandardThreadExecutor</classname> are described in <ulink + url="http://tomcat.apache.org/tomcat-6.0-doc/config/executor.html">http://tomcat.apache.org/tomcat-6.0-doc/config/executor.html</ulink>. + </para> <para>A feature introduced in Remoting version 2.4 is the ability to

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6345 - remoting2/branches/2.x/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 22:58:51 -0400 (Wed, 27 Apr 2011) New Revision: 6345 Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml Log: JBREM-1281: Added two previously omitted HttpClientInvoker parameters, not actually related to JBREM-1281. Modified: remoting2/branches/2.x/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.x/docs/guide/en/chap5.xml 2011-04-28 02:55:45 UTC (rev 6344) +++ remoting2/branches/2.x/docs/guide/en/chap5.xml 2011-04-28 02:58:51 UTC (rev 6345) @@ -6608,7 +6608,18 @@ <section> <title>org.jboss.remoting.transport.http.HTTPClientInvoker</title> - + + <para><emphasis role="bold">DISCONNECT_AFTER_USE</emphasis> (actual value + is "disconnectAfterUse") - key indicating if the + <classname>java.net.HttpURLConnection</classname> should be disconnected after the invocation. + The default value is "false".</para> + + <para><emphasis role="bold">IGNORE_ERROR_RESPONSE_MESSAGE</emphasis> (actual value + is "ignoreErrorResponseMessage") - key indicating if + <classname>org.jboss.remoting.transport.http.HTTPClientInvoker</classname> + should try to get a response message and response code in the event of an exception. + The default value is "false".</para> + <para> <emphasis role="bold">NUMBER_OF_CALL_ATTEMPTS</emphasis> (actual value is "numberOfCallAttempts"): This parameter is relevant only on the client side, where it determines the maximum number of attempts that

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6344 - remoting2/branches/2.2/docs/guide/en.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 22:55:45 -0400 (Wed, 27 Apr 2011) New Revision: 6344 Modified: remoting2/branches/2.2/docs/guide/en/chap5.xml Log: JBREM-1281: Added two previously omitted HttpClientInvoker parameters, not actually related to JBREM-1281. Modified: remoting2/branches/2.2/docs/guide/en/chap5.xml =================================================================== --- remoting2/branches/2.2/docs/guide/en/chap5.xml 2011-04-28 01:56:16 UTC (rev 6343) +++ remoting2/branches/2.2/docs/guide/en/chap5.xml 2011-04-28 02:55:45 UTC (rev 6344) @@ -6763,7 +6763,18 @@ <para></para> <bridgehead>org.jboss.remoting.transport.http.HTTPClientInvoker</bridgehead> - + + <para><emphasis role="bold">DISCONNECT_AFTER_USE</emphasis> (actual value + is "disconnectAfterUse") - key indicating if the + <classname>java.net.HttpURLConnection</classname> should be disconnected after the invocation. + The default value is "false".</para> + + <para><emphasis role="bold">IGNORE_ERROR_RESPONSE_MESSAGE</emphasis> (actual value + is "ignoreErrorResponseMessage") - key indicating if + <classname>org.jboss.remoting.transport.http.HTTPClientInvoker</classname> + should try to get a response message and response code in the event of an exception. + The default value is "false".</para> + <para><emphasis role="bold">UNMARSHAL_NULL_STREAM</emphasis> (actual value is 'unmarshalNullStream') - key indicating if <classname>org.jboss.remoting.transport.http.HTTPClientInvoker</classname>

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6343 - remoting2/branches/2.x/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 21:56:16 -0400 (Wed, 27 Apr 2011) New Revision: 6343 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java Log: JBREM-1285: addListener() checks for LocalClientInvoker before deriving the transport from the InvokerLocator. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2011-04-28 01:55:33 UTC (rev 6342) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2011-04-28 01:56:16 UTC (rev 6343) @@ -1200,7 +1200,14 @@ } if (transport == null) { - transport = invoker.getLocator().getProtocol(); + if (invoker instanceof LocalClientInvoker) + { + transport = "local"; + } + else + { + transport = invoker.getLocator().getProtocol(); + } metadata.put(CALLBACK_SERVER_PROTOCOL, transport); } if (host == null)

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6342 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local: callback and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 21:55:33 -0400 (Wed, 27 Apr 2011) New Revision: 6342 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java Log: JBREM-1285: New unit test. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java 2011-04-28 01:55:33 UTC (rev 6342) @@ -0,0 +1,189 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport.local.callback; + +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.MBeanServer; + +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.logging.XLevel; +import org.jboss.remoting.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.local.LocalServerInvoker; + + +public class LocalCallbackConnectorTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(LocalCallbackConnectorTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected TestInvocationHandler invocationHandler; + + + public void setUp() throws Exception + { + if (firstTime) + { + firstTime = false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.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 testLocalCallbackConnector() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Add callback handler. + TestCallbackHandler callbackHandler = new TestCallbackHandler(); + client.addListener(callbackHandler, new HashMap()); + + // Verify callback Connector has created a LocalServerInvoker. + Field field = Client.class.getDeclaredField("callbackConnectors"); + field.setAccessible(true); + Map callbackConnectors = (Map) field.get(client); + assertEquals(1, callbackConnectors.size()); + Set connectors = (Set) callbackConnectors.values().iterator().next(); + assertEquals(1, connectors.size()); + Connector connector = (Connector) connectors.iterator().next(); + ServerInvoker serverInvoker = connector.getServerInvoker(); + log.info("serverInvoker: " + serverInvoker); + assertTrue(serverInvoker instanceof LocalServerInvoker); + + client.removeListener(callbackHandler); + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "/?" + metadata; + } + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector = new Connector(serverLocator, config); + connector.create(); + invocationHandler = new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + + + protected void shutdownServer() throws Exception + { + if (connector != null) + connector.stop(); + } + + + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Throwable + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + + static class TestCallbackHandler implements InvokerCallbackHandler + { + public void handleCallback(Callback callback) throws HandleCallbackException + { + log.info("received callback"); + } + } +} \ No newline at end of file Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java ___________________________________________________________________ Added: svn:executable + *

13 years, 7 months

1
0
0 / 0

JBoss Remoting SVN: r6341 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local: callback and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-04-27 21:54:09 -0400 (Wed, 27 Apr 2011) New Revision: 6341 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java Log: JBREM-1285: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java 2011-04-28 01:54:09 UTC (rev 6341) @@ -0,0 +1,189 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.transport.local.callback; + +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.MBeanServer; + +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.logging.XLevel; +import org.jboss.remoting.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.local.LocalServerInvoker; + + +public class LocalCallbackConnectorTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(LocalCallbackConnectorTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected TestInvocationHandler invocationHandler; + + + public void setUp() throws Exception + { + if (firstTime) + { + firstTime = false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.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 testLocalCallbackConnector() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Add callback handler. + TestCallbackHandler callbackHandler = new TestCallbackHandler(); + client.addListener(callbackHandler, new HashMap()); + + // Verify callback Connector has created a LocalServerInvoker. + Field field = Client.class.getDeclaredField("callbackConnectors"); + field.setAccessible(true); + Map callbackConnectors = (Map) field.get(client); + assertEquals(1, callbackConnectors.size()); + Set connectors = (Set) callbackConnectors.values().iterator().next(); + assertEquals(1, connectors.size()); + Connector connector = (Connector) connectors.iterator().next(); + ServerInvoker serverInvoker = connector.getServerInvoker(); + log.info("serverInvoker: " + serverInvoker); + assertTrue(serverInvoker instanceof LocalServerInvoker); + + client.removeListener(callbackHandler); + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "/?" + metadata; + } + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector = new Connector(serverLocator, config); + connector.create(); + invocationHandler = new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + + + protected void shutdownServer() throws Exception + { + if (connector != null) + connector.stop(); + } + + + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Throwable + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + + static class TestCallbackHandler implements InvokerCallbackHandler + { + public void handleCallback(Callback callback) throws HandleCallbackException + { + log.info("received callback"); + } + } +} \ No newline at end of file Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/local/callback/LocalCallbackConnectorTestCase.java ___________________________________________________________________ Added: svn:executable + *

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits April 2011