[jboss-cvs] JBoss Messaging SVN: r1598 - in branches/Branch_HTTP_Experiment: . src/main/org/jboss/jms/client/remoting src/main/org/jboss/jms/server/remoting tests tests/bin tests/etc tests/src/org/jboss/test/messaging/jms tests/src/org/jboss/test/messaging/tools/jmx
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 20 22:22:51 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-11-20 22:22:44 -0500 (Mon, 20 Nov 2006)
New Revision: 1598
Removed:
branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/jms/CallbackServerFactoryTest.java
Modified:
branches/Branch_HTTP_Experiment/
branches/Branch_HTTP_Experiment/build-thirdparty.xml
branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/CallbackManager.java
branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java
branches/Branch_HTTP_Experiment/tests/bin/.testrc.example
branches/Branch_HTTP_Experiment/tests/bin/runtest
branches/Branch_HTTP_Experiment/tests/bin/start-rmi-server
branches/Branch_HTTP_Experiment/tests/build.xml
branches/Branch_HTTP_Experiment/tests/etc/container.xml
branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
Log:
minor reformatting; activating configurable remoting transport with the test framework
Property changes on: branches/Branch_HTTP_Experiment
___________________________________________________________________
Name: svn:ignore
- output
thirdparty
messaging.iws
+ output
thirdparty
messaging.iws
messaging-Branch_HTTP_Experiment.iml
messaging-Branch_HTTP_Experiment.ipr
messaging-Branch_HTTP_Experiment.iws
Modified: branches/Branch_HTTP_Experiment/build-thirdparty.xml
===================================================================
--- branches/Branch_HTTP_Experiment/build-thirdparty.xml 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/build-thirdparty.xml 2006-11-21 03:22:44 UTC (rev 1598)
@@ -90,7 +90,7 @@
<componentref name="jboss/common" version="snapshot"/>
<componentref name="jboss/aop" version="1.5.0.GA"/>
<componentref name="jboss/serialization" version="1.0.3.GA"/>
- <componentref name="jboss/remoting" version="2.2.0.Alpha2"/>
+ <componentref name="jboss/remoting" version="2.2.0.Alpha3"/>
<!-- Need this otherwise project doesn't build in Eclipse -->
<componentref name="apache-logging" version="1.0.5.GA-jboss"/>
@@ -105,7 +105,10 @@
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
<componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
+ <!-- TODO these must go away, Remoting must declare these dependencies -->
+ <componentref name="apache-tomcat" version="5.5.20"/>
+
</build>
<synchronizeinfo/>
Modified: branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/CallbackManager.java
===================================================================
--- branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -21,7 +21,6 @@
*/
package org.jboss.jms.client.remoting;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -38,71 +37,89 @@
*
* A CallbackManager.
*
- * The CallbackManager is an InvocationHandler used for handling callbacks to message consumers
- * The callback is received and dispatched off to the relevant consumer
+ * The CallbackManager is an InvocationHandler used for handling callbacks to message consumers.
+ * The callback is received and dispatched off to the relevant consumer.
*
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
* @version 1.1
*
* CallbackManager.java,v 1.1 2006/02/01 17:38:30 timfox Exp
*/
public class CallbackManager implements InvokerCallbackHandler
{
+ // Constants -----------------------------------------------------
+
protected static final Logger log = Logger.getLogger(CallbackManager.class);
+
+ // Static --------------------------------------------------------
+
protected static CallbackManager theManager;
- protected Map callbackHandlers;
-
+
+ // Attributes ----------------------------------------------------
+
+ protected Map callbackHandlers;
+
+ // Constructors --------------------------------------------------
+
public CallbackManager()
{
callbackHandlers = new ConcurrentReaderHashMap();
}
-
- public void registerHandler(int serverId, int consumerId, MessageCallbackHandler handler)
+
+ // InvokerCallbackHandler implementation -------------------------
+
+ public void handleCallback(Callback callback) throws HandleCallbackException
{
- Long lookup = calcLookup(serverId, consumerId);
-
+ MessagingMarshallable mm = (MessagingMarshallable)callback.getParameter();
+ ClientDelivery dr = (ClientDelivery)mm.getLoad();
+ Long lookup = computeLookup(dr.getServerId(), dr.getConsumerId());
+ List msgs = dr.getMessages();
+
+ MessageCallbackHandler handler = (MessageCallbackHandler)callbackHandlers.get(lookup);
+
+ if (handler == null)
+ {
+ throw new IllegalStateException("Cannot find handler for consumer: " + dr.getConsumerId() +
+ " and server " + dr.getServerId());
+ }
+
+ handler.handleMessage(msgs);
+ }
+
+ // Public --------------------------------------------------------
+
+ public void registerHandler(int serverID, int consumerID, MessageCallbackHandler handler)
+ {
+ Long lookup = computeLookup(serverID, consumerID);
+
callbackHandlers.put(lookup, handler);
}
-
- public void unregisterHandler(int serverId, int consumerId)
+
+ public void unregisterHandler(int serverID, int consumerID)
{
- Long lookup = calcLookup(serverId, consumerId);
-
+ Long lookup = computeLookup(serverID, consumerID);
+
callbackHandlers.remove(lookup);
}
-
- private Long calcLookup(int serverId, int consumerId)
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ private Long computeLookup(int serverID, int consumerID)
{
- long id1 = serverId;
-
+ long id1 = serverID;
+
id1 <<= 32;
-
- long id2 = consumerId;
-
- long lookup = id1 | id2;
-
+
+ long lookup = id1 | consumerID;
+
return new Long(lookup);
}
- public void handleCallback(Callback callback) throws HandleCallbackException
- {
-
- MessagingMarshallable mm = (MessagingMarshallable)callback.getParameter();
-
- ClientDelivery dr = (ClientDelivery)mm.getLoad();
+ // Inner classes -------------------------------------------------
- Long lookup = calcLookup(dr.getServerId(), dr.getConsumerId());
-
- List msgs = dr.getMessages();
-
- MessageCallbackHandler handler =
- (MessageCallbackHandler)callbackHandlers.get(lookup);
-
- if (handler == null)
- {
- throw new IllegalStateException("Cannot find handler for consumer: " + dr.getConsumerId() + " and server " + dr.getServerId());
- }
-
- handler.handleMessage(msgs);
- }
}
Modified: branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -86,8 +86,6 @@
if (log.isTraceEnabled()) { log.trace(this + " created client"); }
- // Get the callback server
-
callbackManager = new CallbackManager();
client.connect();
@@ -99,7 +97,6 @@
client.setMarshaller(new JMSWireFormat());
client.setUnMarshaller(new JMSWireFormat());
-
// For socket transport allow true push callbacks, with callback Connector.
// For http transport, simulate push callbacks.
boolean doPushCallbacks = "socket".equals(serverLocator.getProtocol());
Modified: branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java
===================================================================
--- branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/src/main/org/jboss/jms/server/remoting/JMSWireFormat.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -127,19 +127,11 @@
{
trace = log.isTraceEnabled();
}
-
-
// Marshaller implementation -------------------------------------
public void write(Object obj, OutputStream out) throws IOException
{
-// //Sanity check
-// if (!(out instanceof MessagingObjectOutputStream))
-// {
-// throw new IllegalStateException("Must be MessagingObjectOutputStream");
-// }
-
DataOutputStream dos = null;
// This won't be necessary: see JBREM-597.
@@ -149,7 +141,7 @@
}
else if (out instanceof DataOutputStream)
{
- dos = (DataOutputStream) out;
+ dos = (DataOutputStream)out;
}
else
{
@@ -447,12 +439,12 @@
if (trace) { log.trace("wrote browse message response"); }
}
- else if (res instanceof ArrayList
- && ((ArrayList) res).size() > 0
- && ((ArrayList) res).get(0) instanceof Callback)
+ else if (res instanceof ArrayList &&
+ ((ArrayList) res).size() > 0 &&
+ ((ArrayList) res).get(0) instanceof Callback)
{
// Comes from polled Callbacks.
- ArrayList callbackList = (ArrayList) res;
+ ArrayList callbackList = (ArrayList)res;
dos.write(CALLBACK_LIST);
dos.writeUTF(resp.getSessionId());
dos.writeInt(callbackList.size());
@@ -503,12 +495,6 @@
public Object read(InputStream in, Map map) throws IOException, ClassNotFoundException
{
-// // Sanity check
-// if (!(in instanceof MessagingObjectInputStream))
-// {
-// throw new IllegalStateException("Must be MessagingObjectInputStream");
-// }
-
DataInputStream dis = null;
// This won't be necessary: see JBREM-597.
@@ -805,8 +791,8 @@
callback.setReturnPayload(payload);
callbackList.add(callback);
}
- InvocationResponse response = new InvocationResponse(sessionId, callbackList, false, null);
- return response;
+
+ return new InvocationResponse(sessionId, callbackList, false, null);
}
default:
{
@@ -926,9 +912,7 @@
ois = new ObjectInputStream(is);
}
- Object obj = ois.readObject();
-
- return obj;
+ return ois.readObject();
}
// Inner classes -------------------------------------------------
Modified: branches/Branch_HTTP_Experiment/tests/bin/.testrc.example
===================================================================
--- branches/Branch_HTTP_Experiment/tests/bin/.testrc.example 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/bin/.testrc.example 2006-11-21 03:22:44 UTC (rev 1598)
@@ -14,7 +14,14 @@
#
TEST_DATABASE=hsqldb
#
+# The transport to run tests with. Valid values: "socket", "http". The value specified here
+# overrides the value specified in container.xml.
#
+TEST_REMOTING=socket
+
+
+#
+#
# util
#
#TARGET_CLASS=org.jboss.test.messaging.util.SelectiveIteratorTest
Modified: branches/Branch_HTTP_Experiment/tests/bin/runtest
===================================================================
--- branches/Branch_HTTP_Experiment/tests/bin/runtest 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/bin/runtest 2006-11-21 03:22:44 UTC (rev 1598)
@@ -21,6 +21,7 @@
ENV_TEST_DATABASE=$TEST_DATABASE
ENV_TEST_SERIALIZATION=$TEST_SERIALIZATION
+ENV_TEST_REMOTING=$TEST_REMOTING
if [ -z "$TARGET_CLASS" -a -f $reldir/.testrc ]; then
. $reldir/.testrc
@@ -34,10 +35,15 @@
if [ "$ENV_TEST_DATABASE" != "" ]; then
TEST_DATABASE=$ENV_TEST_DATABASE
fi
+
if [ "$ENV_TEST_SERIALIZATION" != "" ]; then
TEST_SERIALIZATION=$ENV_TEST_SERIALIZATION
fi
+if [ "$ENV_TEST_REMOTING" != "" ]; then
+ TEST_REMOTING=$ENV_TEST_REMOTING
+fi
+
#
# We should use the same test execution classpath as the ant <junit> task, so we run ant to get
# it from there.
@@ -94,14 +100,14 @@
shift
done
-JAVA_OPTS="-Xmx1024M $JAVA_OPTS -Dmodule.output=$reldir/../output $REMOTE_TEST -Dtest.database=$TEST_DATABASE -Dtest.serialization=$TEST_SERIALIZATION -Dbuild.lib=../../output/lib"
+JAVA_OPTS="-Xmx1024M $JAVA_OPTS -Dmodule.output=$reldir/../output $REMOTE_TEST -Dtest.database=$TEST_DATABASE -Dtest.serialization=$TEST_SERIALIZATION -Dtest.remoting=$TEST_REMOTING -Dbuild.lib=../../output/lib"
if [ "$TARGET_TEST" != "" ]; then
TARGET_TEST="-t $TARGET_TEST"
fi
if [ "$isRemote" = "true" ]; then
- export TEST_DATABASE TEST_SERIALIZATION
+ export TEST_DATABASE TEST_SERIALIZATION TEST_REMOTING
$reldir/start-rmi-server $REMOTE_DEBUG_FLAG -use-existent-test-classpath-file
fi
Modified: branches/Branch_HTTP_Experiment/tests/bin/start-rmi-server
===================================================================
--- branches/Branch_HTTP_Experiment/tests/bin/start-rmi-server 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/bin/start-rmi-server 2006-11-21 03:22:44 UTC (rev 1598)
@@ -45,6 +45,11 @@
JAVA_OPTS="$JAVA_OPTS -Dtest.serialization=$TEST_SERIALIZATION"
fi
+if [ "$TEST_REMOTING" != "" ]; then
+ JAVA_OPTS="$JAVA_OPTS -Dtest.remoting=$TEST_REMOTING"
+fi
+
+
if [ "$USE_EXISTENT_TEST_CLASSPATH_FILE" = "true" ]; then
CLASSPATH_FILE="$reldir/.test.execution.classpath"
else
Modified: branches/Branch_HTTP_Experiment/tests/build.xml
===================================================================
--- branches/Branch_HTTP_Experiment/tests/build.xml 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/build.xml 2006-11-21 03:22:44 UTC (rev 1598)
@@ -67,7 +67,13 @@
<property name="stress.tests.database" value="mysql"/>
<property name="stress.tests.serialization" value="jms"/>
+
<!--
+ Default remoting configuration (must be overrided by tasks that need it set otherwise).
+ -->
+ <property name="test.remoting" value="socket"/>
+
+ <!--
Project paths.
-->
@@ -181,7 +187,7 @@
<path refid="oracle.jdbc.driver.classpath"/>
<path refid="postgres.jdbc.driver.classpath"/>
<path refid="apache.tomcat.classpath"/>
- <path refid="apache.logging.classpath"/>
+ <path refid="apache.logging.classpath"/>
</path>
<path id="stress.test.execution.classpath">
@@ -264,6 +270,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+ <sysproperty key="test.remoting" value="${test.remoting}"/>
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=rmiserver"/>
-->
@@ -281,6 +288,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
+ <sysproperty key="test.remoting" value="${test.remoting}"/>
<!-- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=rmiserver"/> -->
<classpath refid="stress.test.execution.classpath"/>
</java>
@@ -299,12 +307,18 @@
<target name="tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
<antcall target="crash-tests"/>
<antcall target="invm-tests"/>
- <antcall target="remote-tests"/>
+ <antcall target="remote-tests"/> <!-- default remoting configuration (socket) -->
+ <antcall target="remote-tests">
+ <param name="test.remoting" value="http"/>
+ </antcall>
</target>
<target name="stress-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
<antcall target="invm-stress-tests"/>
- <antcall target="remote-stress-tests"/>
+ <antcall target="remote-stress-tests"/> <!-- default remoting configuration (socket) -->
+ <antcall target="remote-stress-tests">
+ <param name="test.remoting" value="http"/>
+ </antcall>
</target>
<target name="invm-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
@@ -473,7 +487,7 @@
<mkdir dir="${build.tests.reports}"/>
<echo message=""/>
- <echo message="Running remote tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message="Running remote tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}, remoting=${test.remoting}"/>
<echo message=""/>
<junit printsummary="${junit.printsummary}"
@@ -489,6 +503,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+ <sysproperty key="test.remoting" value="${test.remoting}"/>
<jvmarg value="-Xmx512M"/>
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
@@ -509,9 +524,9 @@
usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
-->
- <sysproperty key="messaging-test-configuration" value="Remote"/>
+ <sysproperty key="messaging-test-configuration" value="Remote-${test.remoting}"/>
<formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
+ usefile="${junit.formatter.usefile}" extension="-Remote-${test.remoting}.xml"/>
<batchtest fork="${junit.batchtest.fork}"
todir="${junit.batchtest.todir}"
@@ -562,6 +577,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
+ <sysproperty key="test.remoting" value="${test.remoting}"/>
<jvmarg value="-Xmx512M"/>
<!-- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=unittest"/> -->
<classpath>
@@ -579,9 +595,9 @@
usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
-->
- <sysproperty key="messaging-test-configuration" value="StressRemote"/>
+ <sysproperty key="messaging-test-configuration" value="StressRemote-${test.remoting}"/>
<formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-StressRemote.xml"/>
+ usefile="${junit.formatter.usefile}" extension="-StressRemote-${test.remoting}.xml"/>
<batchtest fork="${junit.batchtest.fork}"
todir="${junit.batchtest.todir}"
Modified: branches/Branch_HTTP_Experiment/tests/etc/container.xml
===================================================================
--- branches/Branch_HTTP_Experiment/tests/etc/container.xml 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/etc/container.xml 2006-11-21 03:22:44 UTC (rev 1598)
@@ -58,7 +58,10 @@
<!-- Must ALWAYS be jms -->
<serialization-type>jms</serialization-type>
-
+
+ <!--
+ Supported values: "socket", "http"
+ -->
<remoting-transport>http</remoting-transport>
</container>
Deleted: branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/jms/CallbackServerFactoryTest.java
===================================================================
--- branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/jms/CallbackServerFactoryTest.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/jms/CallbackServerFactoryTest.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.messaging.jms;
-
-import org.jboss.jms.client.remoting.CallbackServerFactory;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.test.messaging.MessagingTestCase;
-
-/**
- *
- * A CallbackServerFactoryTest.
- *
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @version $Revision$
- *
- * $Id$
- */
-public class CallbackServerFactoryTest extends MessagingTestCase
-{
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public CallbackServerFactoryTest(String name)
- {
- super(name);
- }
-
- // Public --------------------------------------------------------
-
- public void testCallbackServer() throws Exception
- {
-// String locatorURI1 = "socket://localhost:1234";
-//
-// String locatorURI2 = "sslsocket://localhost:4321";
-//
-// InvokerLocator locator1 = new InvokerLocator(locatorURI1);
-//
-// InvokerLocator locator2 = new InvokerLocator(locatorURI2);
-//
-// Connector server1 = CallbackServerFactory.instance.getCallbackServer(locator1);
-//
-// assertTrue(server1.isStarted());
-//
-// assertTrue(CallbackServerFactory.instance.containsCallbackServer(locator1.getProtocol()));
-//
-// Connector server2 = CallbackServerFactory.instance.getCallbackServer(locator1);
-//
-// assertTrue(server1 == server2);
-//
-// Connector server3 = CallbackServerFactory.instance.getCallbackServer(locator2);
-//
-// assertTrue(server3.isStarted());
-//
-// assertTrue(CallbackServerFactory.instance.containsCallbackServer(locator2.getProtocol()));
-//
-// Connector server4 = CallbackServerFactory.instance.getCallbackServer(locator2);
-//
-// assertTrue(server3 == server4);
-//
-// assertFalse(server1 == server3);
-//
-//
-// CallbackServerFactory.instance.stopCallbackServer(locator1.getProtocol());
-//
-// assertTrue(CallbackServerFactory.instance.containsCallbackServer(locator1.getProtocol()));
-//
-// CallbackServerFactory.instance.stopCallbackServer(locator2.getProtocol());
-//
-// assertTrue(CallbackServerFactory.instance.containsCallbackServer(locator2.getProtocol()));
-//
-// CallbackServerFactory.instance.stopCallbackServer(locator1.getProtocol());
-//
-// assertFalse(CallbackServerFactory.instance.containsCallbackServer(locator1.getProtocol()));
-//
-// CallbackServerFactory.instance.stopCallbackServer(locator2.getProtocol());
-//
-// assertFalse(CallbackServerFactory.instance.containsCallbackServer(locator2.getProtocol()));
-//
-// assertFalse(server1.isStarted());
-//
-// assertFalse(server3.isStarted());
-//
-//
- }
-
-
- // Inner classes -------------------------------------------------
-
-}
-
Modified: branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -990,10 +990,10 @@
"clientLeasePeriod=20000&" +
"callbackStore=org.jboss.remoting.callback.BlockingCallbackStore";
-// String locatorURI = transport + "://" + ipAddressOrHostName + ":9111" + params;
- int freePort = PortUtil.findFreePort(ipAddressOrHostName);
+// int freePort = PortUtil.findFreePort(ipAddressOrHostName);
+ int freePort = 9111;
String locatorURI = transport + "://" + ipAddressOrHostName + ":" + freePort + params;
- log.debug("Using the following locator uri:" + locatorURI);
+ log.debug("Using locator uri: " + locatorURI);
InvokerLocator locator = new InvokerLocator(locatorURI);
Modified: branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
===================================================================
--- branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2006-11-20 11:59:00 UTC (rev 1597)
+++ branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2006-11-21 03:22:44 UTC (rev 1598)
@@ -245,7 +245,7 @@
private void setCurrentRemotingTransport(String xmlRemotingTransport)
{
- remotingTransport = System.getProperty("test.remotingTransport");
+ remotingTransport = System.getProperty("test.remoting");
if (remotingTransport == null)
{
remotingTransport = xmlRemotingTransport;
More information about the jboss-cvs-commits
mailing list