JBoss Remoting SVN: r5471 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-14 12:19:38 -0400 (Mon, 14 Sep 2009)
New Revision: 5471
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: Extended wait for server side notification.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-09-14 16:07:08 UTC (rev 5470)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-09-14 16:19:38 UTC (rev 5471)
@@ -35,7 +35,6 @@
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.ClientDisconnectedException;
import org.jboss.remoting.ConnectionListener;
@@ -81,7 +80,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ 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);
@@ -246,7 +245,7 @@
client.addConnectionListener(clientConnectionListener, new HashMap());
// Wait for broken connection and test.
- Thread.sleep(8000);
+ Thread.sleep(12000);
assertTrue(serverConnectionListener.notified);
assertNull(serverConnectionListener.throwable);
assertTrue(clientConnectionListener.notified);
@@ -330,7 +329,7 @@
client.addConnectionListener(clientConnectionListener, new HashMap());
// Wait for broken connection and test.
- Thread.sleep(8000);
+ Thread.sleep(12000);
assertTrue(serverConnectionListener.notified);
assertNull(serverConnectionListener.throwable);
assertTrue(clientConnectionListener.notified);
14 years, 7 months
JBoss Remoting SVN: r5470 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-14 12:07:08 -0400 (Mon, 14 Sep 2009)
New Revision: 5470
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
Log:
JBREM-1102: Added another log call.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-09-13 16:28:31 UTC (rev 5469)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-09-14 16:07:08 UTC (rev 5470)
@@ -47,6 +47,7 @@
log.info(this + "writing Wrapper");
super.write(new Wrapper(dataObject), output, version);
wrote++;
+ log.info("wrote: " + wrote + ", cloned: " + cloned);
}
public Marshaller cloneMarshaller() throws CloneNotSupportedException
14 years, 7 months
JBoss Remoting SVN: r5469 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-13 12:28:31 -0400 (Sun, 13 Sep 2009)
New Revision: 5469
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/LeaseCreationFailureTestCase.java
Log:
JBREM-1154: Reduced log level.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/LeaseCreationFailureTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/LeaseCreationFailureTestCase.java 2009-09-13 16:24:17 UTC (rev 5468)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/LeaseCreationFailureTestCase.java 2009-09-13 16:28:31 UTC (rev 5469)
@@ -80,7 +80,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(Level.TRACE);
+ 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);
14 years, 7 months
JBoss Remoting SVN: r5468 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/timeout.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-13 12:24:17 -0400 (Sun, 13 Sep 2009)
New Revision: 5468
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/timeout/LeasePingerTimeoutTestCase.java
Log:
JBREM-956, JBREM-1154: Causing LeasePinger to throw exception necessitated changes in this old unit test.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/timeout/LeasePingerTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/timeout/LeasePingerTimeoutTestCase.java 2009-09-13 15:51:39 UTC (rev 5467)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/timeout/LeasePingerTimeoutTestCase.java 2009-09-13 16:24:17 UTC (rev 5468)
@@ -35,7 +35,6 @@
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.ConnectionListener;
import org.jboss.remoting.InvocationRequest;
@@ -80,7 +79,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ 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);
@@ -234,9 +233,11 @@
// Verify that PING has been sent but not answered.
log.info("pingInvoked: " + pingInvoked);
Thread.sleep(5000);
- assertFalse(((Boolean) invokedField.get(pinger)).booleanValue());
+ log.info("ping invoked: " + ((Boolean)invokedField.get(pinger)).booleanValue());
+ log.info("ping succeeded: " + ((Boolean)succeedField.get(pinger)).booleanValue());
+ assertTrue(((Boolean) invokedField.get(pinger)).booleanValue());
assertFalse(((Boolean) succeedField.get(pinger)).booleanValue());
- log.info("LeasePinger has timed out withing 5000 ms");
+ log.info("LeasePinger has timed out within 5000 ms");
client.setDisconnectTimeout(0);
client.disconnect();
14 years, 7 months
JBoss Remoting SVN: r5467 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-13 11:51:39 -0400 (Sun, 13 Sep 2009)
New Revision: 5467
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java
Log:
JBREM-794, JBREM-1154: Causing LeasePinger to throw exception necessitated changes in this old unit test.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java 2009-09-13 15:51:06 UTC (rev 5466)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java 2009-09-13 15:51:39 UTC (rev 5467)
@@ -22,16 +22,29 @@
package org.jboss.test.remoting.lease;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.util.HashMap;
import java.util.TimerTask;
+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.ConnectionListener;
+import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.LeasePinger;
+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.transport.PortUtil;
import org.jboss.remoting.transport.socket.SocketClientInvoker;
@@ -48,6 +61,13 @@
{
private static Logger log = Logger.getLogger(UniquePingerTaskTestCase.class);
private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
/**
@@ -80,10 +100,14 @@
{
log.info("entering " + getName());
- InvokerLocator locator = new InvokerLocator("socket://localhost:8888");
- SocketClientInvoker clientInvoker = new SocketClientInvoker(locator);
+ setupServer();
+ SocketClientInvoker clientInvoker = new SocketClientInvoker(serverLocator);
+ clientInvoker.connect();
LeasePinger leasePinger = new LeasePinger(clientInvoker, "abc", 2000);
log.info("expect WARN \"failed to ping to server\"");
+ Method method = LeasePinger.class.getDeclaredMethod("setLeasePingerId", new Class[]{String.class});
+ method.setAccessible(true);
+ method.invoke(leasePinger, new Object[]{"dummyID"});
leasePinger.addClient("def", null, 1000);
// Verify LeasePingerTimerTask has not been created.
@@ -103,4 +127,55 @@
log.info(getName() + " PASSES");
}
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = "socket://" + 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");
+ config.put("leasePeriod", "1000");
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.addConnectionListener(new TestConnectionListener());
+ 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 TestConnectionListener implements ConnectionListener
+ {
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ }
+ }
}
\ No newline at end of file
14 years, 7 months
JBoss Remoting SVN: r5466 - 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: 2009-09-13 11:51:06 -0400 (Sun, 13 Sep 2009)
New Revision: 5466
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java
Log:
JBREM-794, JBREM-1154: Causing LeasePinger to throw exception necessitated changes in this old unit test.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java 2009-09-12 23:19:12 UTC (rev 5465)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/lease/UniquePingerTaskTestCase.java 2009-09-13 15:51:06 UTC (rev 5466)
@@ -22,16 +22,29 @@
package org.jboss.test.remoting.lease;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.util.HashMap;
import java.util.TimerTask;
+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.ConnectionListener;
+import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.LeasePinger;
+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.transport.PortUtil;
import org.jboss.remoting.transport.socket.SocketClientInvoker;
@@ -48,6 +61,13 @@
{
private static Logger log = Logger.getLogger(UniquePingerTaskTestCase.class);
private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
/**
@@ -80,10 +100,14 @@
{
log.info("entering " + getName());
- InvokerLocator locator = new InvokerLocator("socket://localhost:8888");
- SocketClientInvoker clientInvoker = new SocketClientInvoker(locator);
+ setupServer();
+ SocketClientInvoker clientInvoker = new SocketClientInvoker(serverLocator);
+ clientInvoker.connect();
LeasePinger leasePinger = new LeasePinger(clientInvoker, "abc", 2000);
log.info("expect WARN \"failed to ping to server\"");
+ Method method = LeasePinger.class.getDeclaredMethod("setLeasePingerId", new Class[]{String.class});
+ method.setAccessible(true);
+ method.invoke(leasePinger, new Object[]{"dummyID"});
leasePinger.addClient("def", null, 1000);
// Verify LeasePingerTimerTask has not been created.
@@ -103,4 +127,55 @@
log.info(getName() + " PASSES");
}
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = "socket://" + 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");
+ config.put("leasePeriod", "1000");
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.addConnectionListener(new TestConnectionListener());
+ 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 TestConnectionListener implements ConnectionListener
+ {
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ }
+ }
}
\ No newline at end of file
14 years, 7 months
JBoss Remoting SVN: r5465 - remoting2/branches/2.2.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-12 19:19:12 -0400 (Sat, 12 Sep 2009)
New Revision: 5465
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1151: modified contents of component jars.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2009-09-12 23:15:34 UTC (rev 5464)
+++ remoting2/branches/2.2/build.xml 2009-09-12 23:19:12 UTC (rev 5465)
@@ -368,6 +368,7 @@
manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/**"/>
+ <include name="org/jboss/remoting/transport/web/WebUtil.class"/>
<exclude name="org/jboss/remoting/detection/**"/>
<!--<exclude name="org/jboss/remoting/marshal/http/**"/>-->
<!--<exclude name="org/jboss/remoting/marshal/rmi/**"/>-->
@@ -386,7 +387,7 @@
<exclude name="org/jboss/remoting/transport/sslrmi/**"/>
<exclude name="org/jboss/remoting/transport/sslservlet/**"/>
<exclude name="org/jboss/remoting/transport/sslsocket/**"/>
- <exclude name="org/jboss/remoting/transport/web/**"/>
+ <exclude name="org/jboss/remoting/transport/web/WebServerInvoker*"/>
</fileset>
<fileset dir="${output.etc.dir}">
<include name="org/jboss/**/*.xml"/>
@@ -417,6 +418,7 @@
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
<include name="org/jboss/remoting/transport/sslsocket/*Client*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
</fileset>
</jar>
@@ -425,6 +427,19 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/**"/>
<include name="org/jboss/remoting/transport/sslbisocket/**"/>
+ <include name="org/jboss/remoting/transport/bisocket/**"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
+ <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
</fileset>
</jar>
@@ -433,6 +448,18 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/*Client*"/>
<include name="org/jboss/remoting/transport/sslbisocket/*Client*"/>
+ <include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
</fileset>
</jar>
@@ -450,6 +477,7 @@
<include name="org/jboss/remoting/transport/http/**"/>
<include name="org/jboss/remoting/transport/https/**"/>
<include name="org/jboss/remoting/transport/web/**"/>
+ <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
</fileset>
</jar>
@@ -464,6 +492,7 @@
<include name="org/jboss/remoting/transport/web/*WebUtil*"/>
<include name="org/jboss/remoting/transport/servlet/*Client*"/>
<include name="org/jboss/remoting/transport/sslservlet/*Client*"/>
+ <include name="org/jboss/remoting/transport/servlet/ServletThrowable*"/>
</fileset>
</jar>
@@ -493,6 +522,7 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/multiplex/**"/>
<include name="org/jboss/remoting/transport/sslmultiplex/**"/>
+ <include name="org/jboss/remoting/transport/socket/*"/>
</fileset>
</jar>
14 years, 7 months
JBoss Remoting SVN: r5464 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-12 19:15:34 -0400 (Sat, 12 Sep 2009)
New Revision: 5464
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1151: modified contents of component jars.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-09-12 22:52:50 UTC (rev 5463)
+++ remoting2/branches/2.x/build.xml 2009-09-12 23:15:34 UTC (rev 5464)
@@ -644,6 +644,7 @@
manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/**"/>
+ <include name="org/jboss/remoting/transport/web/WebUtil.class"/>
<exclude name="org/jboss/remoting/detection/**"/>
<!--<exclude name="org/jboss/remoting/marshal/http/**"/>-->
<!--<exclude name="org/jboss/remoting/marshal/rmi/**"/>-->
@@ -662,7 +663,7 @@
<exclude name="org/jboss/remoting/transport/sslrmi/**"/>
<exclude name="org/jboss/remoting/transport/sslservlet/**"/>
<exclude name="org/jboss/remoting/transport/sslsocket/**"/>
- <exclude name="org/jboss/remoting/transport/web/**"/>
+ <exclude name="org/jboss/remoting/transport/web/WebServerInvoker*"/>
</fileset>
<fileset dir="${output.etc.dir}">
<include name="org/jboss/**/*.xml"/>
@@ -693,6 +694,7 @@
<include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
<include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
<include name="org/jboss/remoting/transport/sslsocket/*Client*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
</fileset>
</jar>
@@ -701,6 +703,19 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/**"/>
<include name="org/jboss/remoting/transport/sslbisocket/**"/>
+ <include name="org/jboss/remoting/transport/bisocket/**"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
+ <include name="org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean*"/>
</fileset>
</jar>
@@ -709,6 +724,18 @@
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/transport/bisocket/*Client*"/>
<include name="org/jboss/remoting/transport/sslbisocket/*Client*"/>
+ <include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ClientSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerSocketWrapper*"/>
+ <include name="org/jboss/remoting/transport/socket/TimedOutputStream*"/>
+ <include name="org/jboss/remoting/transport/socket/LRUPool*"/>
+ <include name="org/jboss/remoting/transport/socket/MicroSocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/OpenConnectionChecker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerAddress*"/>
+ <include name="org/jboss/remoting/transport/socket/SocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/socket/ServerThread*"/>
</fileset>
</jar>
@@ -716,6 +743,9 @@
manifest="${manifest.file}">
<fileset dir="${compile.dir}">
<include name="org/jboss/remoting/samples/**"/>
+ <include name="org/jboss/remoting/transport/bisocket/BisocketClientInvoker*"/>
+ <include name="org/jboss/remoting/transport/bisocket/BisocketServerInvoker*"/>
+ <include name="org/jboss/remoting/transport/multiplex/**"/>
</fileset>
</jar>
14 years, 7 months
JBoss Remoting SVN: r5463 - remoting2/branches/2.x/docs/guide/en.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-12 18:52:50 -0400 (Sat, 12 Sep 2009)
New Revision: 5463
Modified:
remoting2/branches/2.x/docs/guide/en/chap4.xml
Log:
JBREM-1151: Updated dependencies.
Modified: remoting2/branches/2.x/docs/guide/en/chap4.xml
===================================================================
--- remoting2/branches/2.x/docs/guide/en/chap4.xml 2009-09-12 21:14:16 UTC (rev 5462)
+++ remoting2/branches/2.x/docs/guide/en/chap4.xml 2009-09-12 22:52:50 UTC (rev 5463)
@@ -9,7 +9,8 @@
<para><emphasis role="bold">jboss-remoting.jar</emphasis> - this binary
contains all the remoting classes. This is the only remoting jar that is
- needed to perform any remoting function within JBoss Remoting.</para>
+ needed to perform any remoting function within JBoss Remoting. Of course,
+ third party jars will be required.</para>
<para>Since some may want to better control size of the binary footprint
needed to use remoting, the remoting classes have been broken out into
@@ -82,71 +83,176 @@
functions.</para>
<section>
- <title>Thirdparty libraries</title>
+ <title>Third party libraries</title>
<para>This section covers which thirdparty jars are required based on
- the feature or transport to be used. Remember, whenever see
- jboss-remoting-XXX.jar mentioned, they can all be replaced with just the
+ the feature or transport to be used. Remember, any
+ jboss-remoting-XXX.jar can be replaced with just the
jboss-remoting.jar.</para>
+
+ <para> Table 1 gives the direct dependencies of the Remoting jars on
+ third party jars (and jboss-remoting-core.jar, in most cases). Table 2
+ gives the transitive closure of Table 1.</para>
- <para><emphasis role="bold">All remoting servers:</emphasis>
- jboss-remoting-core.jar, jboss-common.jar, jboss-jmx.jar,
- log4j.jar</para>
+ <para>The information in Tables 1 and 2 was derived with the use of the
+ extremely useful <emphasis role="bold">Tattletale</emphasis> tool,
+ available on the jboss.org website:
+ <ulink url="http://www.jboss.org/tattletale">
+ http://www.jboss.org/tattletale</ulink></para>
+
+ <table frame="all" id="JarDependencyTable" xreflabel="Table 1">
+ <title>Jar dependencies.</title>
- <para><emphasis role="bold">All remoting clients:
- </emphasis>jboss-remoting-core.jar, jboss-common.jar, jboss-jmx.jar,
- log4j.jar, concurrent.jar</para>
+ <tgroup cols="2">
+ <colspec align="left" colname="c1" colnum="1" />
+ <colspec align="left" colname="c2" colnum="2" />
- <para>Note: concurrent.jar needed because of org.jboss.util.id.GUID used
- to create session id within Client
- (http://jira.jboss.com/jira/browse/JBREM-549)</para>
+ <thead>
+ <row>
+ <entry align="center"><para>jar</para></entry>
+ <entry align="center"><para>depends on</para></entry>
+ </row>
+ </thead>
- <para>Remoting requires the use of JMX classes. It does not require the
- JBoss implementation (jboss-jmx.jar) of JMX in order to function
- correctly, so can replace jboss-jmx.jar with another JMX implementation
- library (or exclude it if using jdk 1.5 or higher, which has JMX
- implementation built in).</para>
+ <tbody>
+ <row>
+ <entry><para>jboss-remoting-bisocket-client.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-bisocket.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-core.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-detection.jar, jboss-serialization.jar, log4j.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-detection.jar:</para></entry>
+ <entry><para>jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jnpserver.jar, log4j.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-http-client.jar:</para></entry>
+ <entry><para>jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-http.jar:</para></entry>
+ <entry><para>jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jbossweb.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-rmi.jar:</para></entry>
+ <entry><para>jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-samples.jar:</para></entry>
+ <entry><para>jboss-common-core.jar, jboss-logging-log4j.jar, jboss-logging-spi.jar, jboss-remoting-bisocket-client.jar, jboss-remoting-core.jar, jboss-remoting-detection.jar, jboss-remoting.jar, jnpserver.jar, junit.jar, log4j.jar, servlet-api.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-serialization.jar:</para></entry>
+ <entry><para>jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-servlet.jar:</para></entry>
+ <entry><para>jboss-logging-spi.jar, jboss-remoting-core.jar, servlet-api.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-socket-client.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-socket.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-log4j.jar, jboss-logging-spi.jar, jboss-serialization.jar, jbossweb.jar, jnpserver.jar, junit.jar, log4j.jar, servlet-api.jar</para></entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+
+ <table frame="all" id="JarTransitiveDependencyTable" xreflabel="Table 1">
+ <title>Transitive closure of jar dependencies.</title>
- <para><emphasis role="bold">Multicast detection:
- </emphasis>jboss-remoting-detection.jar, concurrent.jar,
- dom4j.jar</para>
+ <tgroup cols="2">
+ <colspec align="left" colname="c1" colnum="1" />
+ <colspec align="left" colname="c2" colnum="2" />
- <para><emphasis role="bold">JNDI detection:</emphasis>
- jboss-remoting-detection.jar, concurrent.jar, dom4j.jar, jnpserver.jar
- (for jndi api classes)</para>
+ <thead>
+ <row>
+ <entry align="center"><para>jar</para></entry>
+ <entry align="center"><para>depends on</para></entry>
+ </row>
+ </thead>
- <para>The dom4j.jar for use of detection is required because using
- jboss-jmx.jar.</para>
-
- <para><emphasis role="bold">Socket server:</emphasis>
- jboss-remoting-socket.jar</para>
-
- <para><emphasis role="bold">Socket client:</emphasis>
- jboss-remoting-socket-client.jar</para>
-
- <para><emphasis role="bold">HTTP server:</emphasis>
- jboss-remoting-http.jar, tomcat-coyote.jar, tomcat-util.jar,
- tomcat-http.jar, commons-logging-api.jar; alternatively, the tomcat jars
- can be replaced by jbossweb.jar</para>
-
- <para>Note: need tomcat-apr.jar (if using tomcat jars) and
- tcnative-1.dll/tcnative-1.so on system path to use APR based tomcat
- connector</para>
+ <tbody>
+ <row>
+ <entry><para>jboss-remoting-bisocket-client.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-bisocket.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-core.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-detection.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, jboss-serialization.jar, jnpserver.jar, log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-http-client.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-http.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, jbossweb.jar, [jnpserver.jar], log4j.jar, servlet-api.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-rmi.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-samples.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-log4j.jar, jboss-logging-spi.jar, jboss-remoting-bisocket-client.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], junit.jar, log4j.jar, servlet-api.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-serialization.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-servlet.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, servlet-api.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-socket-client.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting-socket.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-spi.jar, jboss-remoting-core.jar, [jboss-remoting-detection.jar], jboss-serialization.jar, [jnpserver.jar], log4j.jar, trove.jar</para></entry>
+ </row>
+ <row>
+ <entry><para>jboss-remoting.jar:</para></entry>
+ <entry><para>concurrent.jar, jboss-common-core.jar, jboss-j2se.jar, jboss-logging-log4j.jar, jboss-logging-spi.jar, jboss-serialization.jar, jbossweb.jar, jnpserver.jar, junit.jar, log4j.jar, servlet-api.jar, trove.jar</para></entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
- <para><emphasis role="bold">HTTP client:</emphasis>
- jboss-remoting-http-client.jar</para>
+ <para><emphasis role="bold">Notes.</emphasis></para>
+
+ <para>1. jboss-remoting-core contains the transporter classes, and some of those
+ need jboss-remoting-detection.jar, which explains the proliferation of
+ jboss-remoting-detection.jar in Table 2. If transporters are not used,
+ then jboss-remoting-detection.jar can be omitted. Moreover, JNDI detection
+ requires jnpserver.jar, so that, if transporters are not used, jnpserver.jar
+ can be omitted.</para>
- <para><emphasis role="bold">Servlet server:</emphasis>
- servlet-invoker.war (deployed in web container),
- jboss-remoting-servlet.jar</para>
-
- <para><emphasis role="bold">Servlet client:</emphasis>
- jboss-remoting-http-client.jar</para>
-
- <para><emphasis role="bold">RMI server and client:</emphasis>
- jboss-remoting-rmi.jar</para>
-
- <para><emphasis role="bold">JBoss serialization:</emphasis>
- jboss-serialization.jar, trove.jar</para>
</section>
</chapter>
\ No newline at end of file
14 years, 7 months
JBoss Remoting SVN: r5462 - remoting2/branches/2.2/docs/guide/en.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-12 17:14:16 -0400 (Sat, 12 Sep 2009)
New Revision: 5462
Modified:
remoting2/branches/2.2/docs/guide/en/chap4.xml
Log:
JBREM-1151: A few more changes.
Modified: remoting2/branches/2.2/docs/guide/en/chap4.xml
===================================================================
--- remoting2/branches/2.2/docs/guide/en/chap4.xml 2009-09-12 21:03:11 UTC (rev 5461)
+++ remoting2/branches/2.2/docs/guide/en/chap4.xml 2009-09-12 21:14:16 UTC (rev 5462)
@@ -98,6 +98,12 @@
third party jars (and jboss-remoting-core.jar, in most cases). Table 2
gives the transitive closure of Table 1.</para>
+ <para>The information in Tables 1 and 2 was derived with the use of the
+ extremely useful <emphasis role="bold">Tattletale</emphasis> tool,
+ available on the jboss.org website:
+ <ulink url="http://www.jboss.org/tattletale">
+ http://www.jboss.org/tattletale</ulink></para>
+
<table frame="all" id="JarDependencyTable" xreflabel="Table 1">
<title>Jar dependencies.</title>
@@ -253,28 +259,28 @@
<para><emphasis role="bold">Notes.</emphasis></para>
- <para>1. jboss-common.jar needs commons-httpclient.jar, which explains
+ <para>1. jboss-remoting-core contains the transporter classes, and some of those
+ need jboss-remoting-detection.jar, which explains the proliferation of
+ jboss-remoting-detection.jar in Table 2. If transporters are not used,
+ then jboss-remoting-detection.jar can be omitted. Moreover, JNDI detection
+ requires jnpserver.jar, so that, if transporters are not used, jnpserver.jar
+ can be omitted.</para>
+
+ <para>2. jboss-common.jar needs commons-httpclient.jar, which explains
the transitive dependency of all Remoting jars on commons-httpclient.jar.
Also, commons-httpclient.jar needs commons-logging-api.jar.</para>
- <para>2. Remoting requires the use of JMX classes. It does not require the
+ <para>3. Remoting requires the use of JMX classes. It does not require the
JBoss implementation (jboss-jmx.jar) of JMX in order to function
correctly, so can replace jboss-jmx.jar with another JMX implementation
library (or exclude it if using jdk 1.5 or higher, which has JMX
implementation built in).</para>
- <para>3. Multicast detection requires jboss-remoting-detection.jar, concurrent.jar,
+ <para>4. Multicast detection requires jboss-remoting-detection.jar, concurrent.jar,
dom4j.jar. JNDI detection: requires
jboss-remoting-detection.jar, concurrent.jar, dom4j.jar, jnpserver.jar
(for jndi api classes). dom4j.jar for use of detection is required by
jboss-jmx.jar.</para>
-
- <para>4. jboss-remoting-core contains the transporter classes, and some of those
- need jboss-remoting-detection.jar, which explains the proliferation of
- jboss-remoting-detection.jar in Table 2. If transporters are not used,
- then jboss-remoting-detection.jar can be omitted. Moreover, JNDI detection
- requires jnpserver.jar, so that, if transporters are not used, jnpserver.jar
- can be omitted.</para>
</section>
</chapter>
\ No newline at end of file
14 years, 7 months