[jboss-cvs] JBoss Messaging SVN: r4019 - in trunk: tests and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 8 07:21:28 EDT 2008
Author: ataylor
Date: 2008-04-08 07:21:28 -0400 (Tue, 08 Apr 2008)
New Revision: 4019
Modified:
trunk/build-messaging.xml
trunk/build-thirdparty.xml
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java
Log:
removed remoting jar dependency
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2008-04-08 09:06:17 UTC (rev 4018)
+++ trunk/build-messaging.xml 2008-04-08 11:21:28 UTC (rev 4019)
@@ -152,11 +152,8 @@
<path id="jboss.dependencies.classpath">
<path refid="jboss.common.classpath"/>
<path refid="jboss.aop.classpath"/>
- <path refid="jboss.remoting.classpath"/>
<path refid="jboss.jbossts14.classpath"/>
<!--<path refid="jbossas.core.libs.classpath"/>-->
- <!-- some components at JBoss use JBossSerialization (JCA for instance) -->
- <path refid="jboss.serialization.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jboss.jaspi.api.classpath"/>
@@ -420,9 +417,6 @@
<fileset dir="${jgroups.jgroups.lib}">
<include name="jgroups.jar"/>
</fileset>
- <fileset dir="${jboss.remoting.lib}">
- <include name="jboss-remoting.jar"/>
- </fileset>
<fileset dir="${apache.logging.lib}">
<include name="commons-logging.jar"/>
</fileset>
@@ -467,7 +461,7 @@
<manifest>
<attribute name="Class-path"
- value="jboss-aop.jar jboss-remoting.jar javassist.jar trove.jar jboss-common-core.jar jboss-j2ee.jar jboss-j2se.jar jnp-client.jar concurrent.jar log4j.jar commons-logging.jar"/>
+ value="jboss-aop.jar javassist.jar trove.jar jboss-common-core.jar jboss-j2ee.jar jboss-j2se.jar jnp-client.jar concurrent.jar log4j.jar commons-logging.jar"/>
</manifest>
<fileset dir="${build.classes}">
<!-- TODO This structure is temporary until we partition the classes
Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml 2008-04-08 09:06:17 UTC (rev 4018)
+++ trunk/build-thirdparty.xml 2008-04-08 11:21:28 UTC (rev 4019)
@@ -90,7 +90,6 @@
<componentref name="jboss/common" version="1.2.1.GA"/>
<componentref name="jboss/common-core" version="2.2.2.GA"/>
<componentref name="jboss/aop" version="2.0.0.beta2"/>
- <componentref name="jboss/remoting" version="2.2.2.SP3-brew"/>
<componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
<!--<componentref name="jbossas/core-libs" version="4.2.1.GA"/>-->
<componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2008-04-08 09:06:17 UTC (rev 4018)
+++ trunk/tests/build.xml 2008-04-08 11:21:28 UTC (rev 4019)
@@ -77,12 +77,6 @@
<property name ="test-mask" value="*Test"/>
<!--
- Default remoting configuration (must be overrided by tasks that need it set otherwise).
- -->
- <property name="test.remoting" value="bisocket"/>
-
-
- <!--
By default, remote servers log file names should end in remote-server
-->
<property name="remote.server.test.logfile.suffix" value="remote-server"/>
@@ -192,7 +186,6 @@
<path refid="jboss.jbosssx.client.classpath"/>
<path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.jbossts14.classpath"/>
- <path refid="jboss.remoting.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.common.classpath"/>
<path refid="jboss.common.core.classpath"/>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java 2008-04-08 09:06:17 UTC (rev 4018)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java 2008-04-08 11:21:28 UTC (rev 4019)
@@ -42,14 +42,6 @@
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.profiler.jvmti.InventoryDataPoint;
import org.jboss.profiler.jvmti.JVMTIInterface;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.ConnectionListener;
-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.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
import org.jboss.test.messaging.JBMServerTestCase;
/**
@@ -703,98 +695,7 @@
//
// Thread.sleep(20 * 60 * 1000);
// }
-
- class SimpleConnectionListener implements ConnectionListener
- {
- public void handleConnectionException(Throwable arg0, Client arg1)
- {
- }
- }
- // this test is hanging.. that's why I have renamed it (Clebert)
- public void renamedtestRemotingMemLeaks() throws Throwable
- {
- log.info("Test remoting mem leaks");
-
- Thread.sleep(10 * 1000);
-
- Connector serverConnector = new Connector();
- InvokerLocator serverLocator = new InvokerLocator("socket://localhost:9099");
- serverConnector.setInvokerLocator(serverLocator.getLocatorURI());
-
- serverConnector.create();
-
- serverConnector.setLeasePeriod(5000);
-
- serverConnector.addConnectionListener(new SimpleConnectionListener());
-
- SimpleServerInvocationHandler invocationHandler = new SimpleServerInvocationHandler();
-
- serverConnector.addInvocationHandler("JMS", invocationHandler);
-
- serverConnector.start();
-
- InvokerLocator serverLocator2 = new InvokerLocator("socket://localhost:9099/forceRemoting=true&leasing=true");
-
- for (int i = 0; i < 500; i++)
- {
- Client cl = new Client(serverLocator2);
-
- cl.connect();
-
- for (int j = 0; j < 100; j++)
- {
- cl.invoke("pickled onions");
- }
-
- cl.disconnect();
- }
-
- serverConnector.stop();
-
- serverConnector.destroy();
-
- log.info("done");
- }
-
- // Public --------------------------------------------------------
-
- class SimpleServerInvocationHandler implements ServerInvocationHandler
- {
- InvokerCallbackHandler handler;
-
- public void addListener(InvokerCallbackHandler callbackHandler)
- {
- this.handler = callbackHandler;
-
- }
-
- public Object invoke(InvocationRequest invocation) throws Throwable
- {
- //log.info("Received invocation:" + invocation);
-
- return "Sausages";
- }
-
- public void removeListener(InvokerCallbackHandler callbackHandler)
- {
- // FIXME removeListener
-
- }
-
- public void setInvoker(ServerInvoker invoker)
- {
- // FIXME setInvoker
-
- }
-
- public void setMBeanServer(MBeanServer server)
- {
- // FIXME setMBeanServer
-
- }
-
- }
}
More information about the jboss-cvs-commits
mailing list