April 2010 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r9101 - trunk/tests/src/org/hornetq/tests/integration/cluster/restart.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-12 11:39:30 -0400 (Mon, 12 Apr 2010) New Revision: 9101 Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java Log: fixed clusterrestarttest Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2010-04-12 13:17:10 UTC (rev 9100) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2010-04-12 15:39:30 UTC (rev 9101) @@ -76,12 +76,15 @@ System.out.println("stopped******************************************************"); startServers(0); - waitForBindings(0, "queues.testaddress", 1, 0, true); - + addConsumer(1, 0, "queue10", null); + + waitForBindings(0, "queues.testaddress", 1, 1, true); + waitForBindings(1, "queues.testaddress", 1, 0, true); waitForBindings(0, "queues.testaddress", 1, 0, false); waitForBindings(1, "queues.testaddress", 1, 1, false); + printBindings(2); sendInRange(1, "queues.testaddress", 10, 20, false, null); @@ -151,9 +154,10 @@ startServers(0); waitForBindings(0, "queues.testaddress", 1, 0, true); - + waitForBindings(1, "queues.testaddress", 1, 0, true); waitForBindings(0, "queues.testaddress", 1, 0, false); waitForBindings(1, "queues.testaddress", 1, 0, false); + printBindings(2); addConsumer(0, 1, "queue10", null); addConsumer(1, 0, "queue10", null);

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9100 - trunk/src/main/org/hornetq/integration/bootstrap.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-04-12 09:17:10 -0400 (Mon, 12 Apr 2010) New Revision: 9100 Modified: trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java Log: https://jira.jboss.org/jira/browse/HORNETQ-270: Add standalone server shutdown logging messages * add info logging when stopping server started from HornetQBootstrapServer: [main] 15:13:17,524 INFO [org.hornetq.core.server.impl.HornetQServerImpl] HornetQ Server version 2.1.0.BETA1 (Horny Hornet, 115) started ^C [hornetq-shutdown-thread] 15:14:05,793 INFO [org.hornetq.integration.bootstrap.HornetQBootstrapServer] Stopping HornetQ Server... Modified: trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java =================================================================== --- trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java 2010-04-12 12:08:00 UTC (rev 9099) +++ trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java 2010-04-12 13:17:10 UTC (rev 9100) @@ -96,7 +96,6 @@ { try { - HornetQBootstrapServer.log.info("Stopping HornetQ Server"); shutDown(); timer.cancel(); } @@ -242,6 +241,8 @@ public void shutDown() { + log.info("Stopping HornetQ Server..."); + ListIterator<KernelDeployment> iterator = deployments.listIterator(deployments.size()); while (iterator.hasPrevious()) {

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9099 - in trunk: docs/user-manual/en and 156 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-12 08:08:00 -0400 (Mon, 12 Apr 2010) New Revision: 9099 Added: trunk/src/main/org/hornetq/core/remoting/impl/netty/ Removed: trunk/src/main/org/hornetq/integration/transports/netty/ Modified: trunk/build-hornetq.xml trunk/build-maven.xml trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/client-classpath.xml trunk/docs/user-manual/en/configuring-transports.xml trunk/docs/user-manual/en/ha.xml trunk/docs/user-manual/en/interoperability.xml trunk/docs/user-manual/en/using-server.xml trunk/examples/common/build.xml trunk/examples/core/embedded-remote/build.xml trunk/examples/core/embedded-remote/readme.html trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java trunk/examples/core/embedded/build.xml trunk/examples/core/embedded/readme.html trunk/examples/core/microcontainer/build.xml trunk/examples/core/microcontainer/server0/hornetq-configuration.xml trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml trunk/examples/core/perf/server0/hornetq-configuration.xml trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml trunk/examples/javaee/jca-config/readme.html trunk/examples/javaee/jca-config/server/hornetq-configuration.xml trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml trunk/examples/javaee/jca-config/server2/ra.xml trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml trunk/examples/jms/applet/applet.html trunk/examples/jms/applet/build.xml trunk/examples/jms/applet/server0/hornetq-configuration.xml trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml trunk/examples/jms/bridge/server0/hornetq-configuration.xml trunk/examples/jms/bridge/server1/hornetq-configuration.xml trunk/examples/jms/browser/server0/hornetq-configuration.xml trunk/examples/jms/client-kickoff/server0/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml trunk/examples/jms/divert/server0/hornetq-configuration.xml trunk/examples/jms/divert/server1/hornetq-configuration.xml trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml trunk/examples/jms/embedded/build.xml trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/examples/jms/expiry/server0/hornetq-configuration.xml trunk/examples/jms/http-transport/readme.html trunk/examples/jms/http-transport/server0/hornetq-configuration.xml trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java trunk/examples/jms/interceptor/server0/hornetq-configuration.xml trunk/examples/jms/jaas/server0/hornetq-configuration.xml trunk/examples/jms/jms-bridge/build.xml trunk/examples/jms/jms-bridge/readme.html trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml trunk/examples/jms/jmx/server0/hornetq-configuration.xml trunk/examples/jms/large-message/server0/hornetq-configuration.xml trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml trunk/examples/jms/management/server0/hornetq-configuration.xml trunk/examples/jms/message-counters/server0/hornetq-configuration.xml trunk/examples/jms/message-group/server0/hornetq-configuration.xml trunk/examples/jms/message-group2/server0/hornetq-configuration.xml trunk/examples/jms/message-priority/server0/hornetq-configuration.xml trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml trunk/examples/jms/paging/server0/hornetq-configuration.xml trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml trunk/examples/jms/perf/server0/hornetq-configuration.xml trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml trunk/examples/jms/queue/server0/hornetq-configuration.xml trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml trunk/examples/jms/request-reply/server0/hornetq-configuration.xml trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml trunk/examples/jms/security/server0/hornetq-configuration.xml trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml trunk/examples/jms/ssl-enabled/readme.html trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml trunk/examples/jms/static-selector/server0/hornetq-configuration.xml trunk/examples/jms/stomp/server0/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml trunk/examples/jms/topic/server0/hornetq-configuration.xml trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml trunk/examples/jms/transactional/server0/hornetq-configuration.xml trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml trunk/examples/jms/xa-send/server0/hornetq-configuration.xml trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml trunk/examples/soak/normal/server0/hornetq-configuration.xml trunk/src/config/jboss-as/build-as4.xml trunk/src/config/jboss-as/clustered/hornetq-configuration.xml trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml trunk/src/config/stand-alone/clustered/hornetq-configuration.xml trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml trunk/src/config/trunk/clustered/hornetq-configuration.xml trunk/src/config/trunk/non-clustered/hornetq-configuration.xml trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java trunk/src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/tests/config/server-start-stop-backup-config1.xml trunk/tests/config/server-start-stop-config1.xml trunk/tests/config/server-start-stop-live-config1.xml trunk/tests/jms-tests/config/hornetq-configuration.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java trunk/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java trunk/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java trunk/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java trunk/tests/src/org/hornetq/tests/opt/SendTest.java trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java trunk/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: https://jira.jboss.org/jira/browse/HORNETQ-278 Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/build-hornetq.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -58,7 +58,6 @@ <property name="jms.jar.name" value="hornetq-jms.jar"/> <property name="jms.client.jar.name" value="hornetq-jms-client.jar"/> <property name="jnp.client.jar.name" value="jnp-client.jar"/> - <property name="transports.jar.name" value="hornetq-transports.jar"/> <property name="jboss.integration.jar.name" value="hornetq-jboss-as-integration.jar"/> <property name="bootstrap.jar.name" value="hornetq-bootstrap.jar"/> <property name="logging.jar.name" value="hornetq-logging.jar"/> @@ -75,7 +74,6 @@ <property name="build.classes.dir" value="${build.dir}/classes"/> <property name="build.core.classes.dir" value="${build.dir}/classes/core"/> <property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/> - <property name="build.transports.classes.dir" value="${build.dir}/classes/transports"/> <property name="build.jboss.integration.classes.dir" value="${build.dir}/classes/jboss-integration"/> <property name="build.service.classes.dir" value="${build.dir}/classes/service"/> <property name="build.bootstrap.classes.dir" value="${build.dir}/classes/bootstrap"/> @@ -178,18 +176,13 @@ <path id="jms.compilation.classpath"> <path location="${build.core.classes.dir}"/> + <path refid="org.jboss.netty.classpath"/> <path refid="org.jboss.javaee.classpath"/> <path refid="org.jboss.integration.classpath"/> <path refid="jboss.jbossts.classpath"/> <path refid="org.jboss.naming.classpath"/> </path> - <path id="transports.compilation.classpath"> - <path location="${build.core.classes.dir}"/> - <path refid="org.jboss.javaee.classpath"/> - <path refid="org.jboss.netty.classpath"/> - </path> - <path id="jboss.integration.compilation.classpath"> <path location="${build.core.classes.dir}"/> <path refid="org.jboss.security.classpath"/> @@ -222,20 +215,17 @@ <path id="test.compilation.classpath"> <path refid="jms.compilation.classpath"/> - <path refid="transports.compilation.classpath"/> <path refid="jboss.integration.compilation.classpath"/> <path refid="bootstrap.compilation.classpath"/> <path refid="junit.junit.classpath"/> <path location="${build.jars.dir}/${ra.jar.name}"/> <path location="${build.jars.dir}/${jms.jar.name}"/> - <path location="${build.jars.dir}/${transports.jar.name}"/> <path location="${build.jars.dir}/${jboss.integration.jar.name}"/> <path location="${build.jars.dir}/${bootstrap.jar.name}"/> <path location="${build.jars.dir}/${logging.jar.name}"/> </path> <path id="jms.test.compilation.classpath"> - <path refid="transports.compilation.classpath"/> <path refid="jboss.integration.compilation.classpath"/> <path refid="bootstrap.compilation.classpath"/> <path refid="jms.compilation.classpath"/> @@ -243,7 +233,6 @@ <path refid="org.jboss.security.classpath"/> <path location="${build.jars.dir}/${core.jar.name}"/> <path location="${build.jars.dir}/${jms.jar.name}"/> - <path location="${build.jars.dir}/${transports.jar.name}"/> <path location="${build.jars.dir}/${jboss.integration.jar.name}"/> <path location="${build.jars.dir}/${bootstrap.jar.name}"/> <path location="${build.jars.dir}/${logging.jar.name}"/> @@ -282,6 +271,7 @@ <path refid="jboss.jbossts.classpath"/> <path refid="apache.xerces.classpath"/> <path refid="log4j.log4j.classpath"/> + <path refid="org.jboss.netty.classpath"/>   <path refid="apache.logging.classpath"/> @@ -301,7 +291,6 @@ <pathelement location="${src.schema.dir}"/> <pathelement location="${test.jms.dir}/config"/> <pathelement location="${test.jms.classes.dir}"/> - <path location="${build.jars.dir}/${transports.jar.name}"/> <path refid="jms.test.compilation.classpath"/> <path refid="sun.jaxb.classpath"/> <path refid="org.jboss.logging.classpath"/> @@ -309,6 +298,7 @@ <path refid="jboss.jbossts.classpath"/> <path refid="apache.xerces.classpath"/> <path refid="log4j.log4j.classpath"/> + <path refid="org.jboss.netty.classpath"/>   <path refid="apache.logging.classpath"/> @@ -325,9 +315,7 @@ <path id="jms.standalone.server.classpath"> <pathelement location="${src.schema.dir}"/> - <path location="${build.jars.dir}/${transports.jar.name}"/> <pathelement location="${src.schema.dir}"/> - <path location="${build.jars.dir}/${transports.jar.name}"/> <path refid="jms.test.compilation.classpath"/> <path refid="sun.jaxb.classpath"/> <path refid="org.jboss.logging.classpath"/> @@ -360,7 +348,6 @@ <mkdir dir="${build.classes.dir}"/> <mkdir dir="${build.core.classes.dir}"/> <mkdir dir="${build.jms.classes.dir}"/> - <mkdir dir="${build.transports.classes.dir}"/> <mkdir dir="${build.jboss.integration.classes.dir}"/> <mkdir dir="${build.service.classes.dir}"/> <mkdir dir="${build.bootstrap.classes.dir}"/> @@ -456,26 +443,6 @@ </javac> </target> - <target name="compile-transports" depends="compile-core"> - <javac destdir="${build.transports.classes.dir}" - target="${javac.target}" - source="${javac.source}" - optimize="${javac.optimize}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src> - <pathelement path="${src.main.dir}"/> - </src> - <include name="org/hornetq/integration/transports/**/*.java"/> - <classpath refid="transports.compilation.classpath"/> - </javac> - </target> - <target name="compile-jboss-integration" depends="compile-core"> <javac destdir="${build.jboss.integration.classes.dir}" target="${javac.target}" @@ -631,7 +598,7 @@  <target name="jar" - depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-transports, jar-jboss-integration, jar-jboss-service, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client, jar-resources"> + depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-jboss-integration, jar-jboss-service, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client, jar-resources"> </target> <target name="jar-jnp-client" depends="init"> @@ -697,14 +664,6 @@ </target> - <target name="jar-transports" depends="compile-transports"> - - <jar jarfile="${build.jars.dir}/${transports.jar.name}"> - <fileset dir="${build.transports.classes.dir}" includes="**"/> - </jar> - - </target> - <target name="jar-jboss-integration" depends="compile-jboss-integration"> <jar jarfile="${build.jars.dir}/${jboss.integration.jar.name}"> @@ -821,7 +780,6 @@ <fileset dir="${build.jars.dir}"> <include name="${core.jar.name}"/> <include name="${jms.jar.name}"/> - <include name="${transports.jar.name}"/> <include name="${jboss.integration.jar.name}"/> <include name="${service.sar.name}"/> <include name="${bootstrap.jar.name}"/> @@ -1042,10 +1000,6 @@ </antcall> <antcall target="artifact"> - <param name="artifact.name" value="hornetq-transports"/> - </antcall> - - <antcall target="artifact"> <param name="artifact.name" value="hornetq-jms"/> </antcall> Modified: trunk/build-maven.xml =================================================================== --- trunk/build-maven.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/build-maven.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -38,13 +38,6 @@ </antcall> </target> - <target name="uploadHornetQTransports"> - <antcall target="upload"> - <param name="artifact.id" value="hornetq-transports"/> - <param name="artifact.type" value="jar"/> - </antcall> - </target> - <target name="uploadHornetQCoreClient"> <antcall target="upload"> <param name="artifact.id" value="hornetq-core-client"/> @@ -148,10 +141,6 @@ <param name="artifact.id" value="hornetq-ra"/> </antcall> - <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-transports"/> - </antcall> - </target> <target name="upload-local-target"> @@ -221,9 +210,6 @@ <param name="artifact.id" value="hornetq-ra"/> </antcall> - <antcall target="deploy-jar"> - <param name="artifact.id" value="hornetq-transports"/> - </antcall> </target> <target name="deploy-jar"> Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/appserver-integration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -609,7 +609,7 @@ <config-property name="SessionDefaultType" type="String">javax.jms.Topic </config-property> <config-property name="ConnectorClassName" type="String"> - org.hornetq.integration.transports.netty.NettyConnectorFactory + org.hornetq.core.remoting.impl.netty.NettyConnectorFactory </config-property> <config-property name="ConnectionParameters" type="String"> port=5445</config-property> @@ -691,7 +691,7 @@ Values can be <literal >org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> or <literal - >org.hornetq.integration.transports.netty.NettyConnectorFactory</literal></para> + >org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</literal></para> </listitem> <listitem> <para><literal>[user name]</literal> is the user name to create a client @@ -729,7 +729,7 @@ <para>If it is now configured with a netty acceptor on a non-default port:</para> <programlisting> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="8888"/> </acceptor> </programlisting> @@ -737,7 +737,7 @@ >conf/jbossts-properties.xml</literal> is:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, , , port=8888"/> </programlisting> <note> <para>Note the additional commas to skip the user and password before connector @@ -747,7 +747,7 @@ configuration would have been:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory, admin, adminpass, port=8888"/> </programlisting> <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager with an invm connector is the recommended way to enable XA Recovery.</para> Modified: trunk/docs/user-manual/en/client-classpath.xml =================================================================== --- trunk/docs/user-manual/en/client-classpath.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/client-classpath.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -30,7 +30,7 @@ <section> <title>HornetQ Core Client</title> <para>If you are using just a pure HornetQ Core client (i.e. no JMS) then you need <literal - >hornetq-core-client.jar</literal>, <literal>hornetq-transports.jar</literal> and + >hornetq-core-client.jar</literal> and <literal>netty.jar</literal> on your client classpath.</para> </section> <section> Modified: trunk/docs/user-manual/en/configuring-transports.xml =================================================================== --- trunk/docs/user-manual/en/configuring-transports.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/configuring-transports.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -33,7 +33,7 @@ <acceptors> <acceptor name="netty"> <factory-class> -org.hornetq.integration.transports.netty.NettyAcceptorFactory +org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory </factory-class> <param key="port" value="5446"/> </acceptor> @@ -71,7 +71,7 @@ <connectors> <connector name="netty"> <factory-class> - org.hornetq.integration.transports.netty.NettyConnectorFactory + org.hornetq.core.remoting.impl.netty.NettyConnectorFactory </factory-class> <param key="port" value="5446"/> </connector> @@ -130,12 +130,12 @@ <programlisting> Map<String, Object> connectionParams = new HashMap<String, Object>(); -connectionParams.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, +connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.hornetq.integration.transports.netty.NettyConnectorFactory", + "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory", connectionParams); ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration); @@ -150,11 +150,11 @@ <programlisting> Map<String, Object> connectionParams = new HashMap<String, Object>(); -connectionParams.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, 5446); +connectionParams.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446); TransportConfiguration transportConfiguration = new TransportConfiguration( - "org.hornetq.integration.transports.netty.NettyConnectorFactory", + "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory", connectionParams); ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactory(transportConfiguration); @@ -188,7 +188,7 @@ with firewall policies that typically only allow connections to be initiated in one direction.</para> <para>All the valid Netty transport keys are defined in the class <literal - >org.hornetq.integration.transports.netty.TransportConstants</literal>. The + >org.hornetq.core.remoting.impl.netty.TransportConstants</literal>. The parameters can be used either with acceptors or connectors. The following parameters can be used to configure Netty for simple TCP:</para> <itemizedlist> @@ -373,7 +373,7 @@ <acceptor name="netty-invm"> <factory-class> - org.hornetq.integration.transports.netty.NettyAcceptorFactory + org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory </factory-class> <param key="use-invm" value="true"/> <param key="host" value="org.hornetq"/> @@ -389,7 +389,7 @@ <connector name="netty-servlet"> <factory-class> - org.hornetq.integration.transports.netty.NettyConnectorFactory + org.hornetq.core.remoting.impl.netty.NettyConnectorFactory </factory-class> <param key="host" value="localhost"/> <param key="port" value="8080"/> @@ -415,7 +415,7 @@ <para>Its also possible to use the servlet transport over SSL. simply add the following configuration to the connector:<programlisting> <connector name="netty-servlet"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="localhost"/> <param key="port" value="8443"/> <param key="use-servlet" value="true"/> Modified: trunk/docs/user-manual/en/ha.xml =================================================================== --- trunk/docs/user-manual/en/ha.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/ha.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -84,7 +84,7 @@   <connector name="backup-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="192.168.0.11"/> <param key="port" value="5445"/> </connector> @@ -99,7 +99,7 @@ <acceptors> <acceptor name="acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="192.168.0.11"/> <param key="port" value="5445"/> </acceptor> Modified: trunk/docs/user-manual/en/interoperability.xml =================================================================== --- trunk/docs/user-manual/en/interoperability.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/interoperability.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -31,7 +31,7 @@ parameter set to <literal>stomp</literal>:</para> <programlisting> <acceptor name="stomp-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocol" value="stomp"/> <param key="port" value="61613"/> </acceptor> Modified: trunk/docs/user-manual/en/using-server.xml =================================================================== --- trunk/docs/user-manual/en/using-server.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/docs/user-manual/en/using-server.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -171,7 +171,7 @@ files. by replacing a value with the name of a system property. Here is an example of this with a connector configuration:</para> <programlisting><connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory </factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> <param key="port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> Modified: trunk/examples/common/build.xml =================================================================== --- trunk/examples/common/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/common/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -86,8 +86,7 @@ <pathelement location="${example.config.dir}"/> <pathelement location="${classes.dir}"/> <fileset dir="${hornetq.jars.dir}"> - <include name="**/hornetq-transports.jar"/> - <include name="**/*client*.jar"/> + <include name="**/*client*.jar"/> </fileset> <fileset dir="${jars.dir}"> <include name="**/netty*.jar"/> Modified: trunk/examples/core/embedded/build.xml =================================================================== --- trunk/examples/core/embedded/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -23,7 +23,6 @@ <path id="local.classpath"> <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> - <include name="hornetq-transports.jar"/> </fileset> <fileset dir="${jars.dir}"> <include name="**/netty*jar"/> Modified: trunk/examples/core/embedded/readme.html =================================================================== --- trunk/examples/core/embedded/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,10 +10,9 @@ <p>This example shows how to setup and run HornetQ embedded.</p> <p>HornetQ was designed to use POJOs (Plain Old Java Objects), what makes embedding HornetQ as simple as instantiating a few objects.</p> - <p>On this example, we are using three jars:</p> + <p>In this example, we are using two jars:</p> <ul> <li>hornetq-core.jar</li> - <li>hornetq-transports.jar</li> <li>netty.jar</li> </ul> Modified: trunk/examples/core/embedded-remote/build.xml =================================================================== --- trunk/examples/core/embedded-remote/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded-remote/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,7 +22,6 @@ <path id="remote.classpath"> <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> - <include name="hornetq-transports.jar"/> </fileset> <fileset dir="${jars.dir}"> <include name="**/netty*jar"/> Modified: trunk/examples/core/embedded-remote/readme.html =================================================================== --- trunk/examples/core/embedded-remote/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded-remote/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,6 @@ <ol> <li>hornetq-core.jar</li> - <li>hornetq-transports.jar</li> <li>netty.jar</li> </ol> @@ -21,7 +20,6 @@ <ol> <li>hornetq-core-client.jar</li> - <li>hornetq-transports.jar</li> <li>netty.jar</li> </ol> Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -17,7 +17,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.common.example.SpawnedVMSupport; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; /** * Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -18,9 +18,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; /** * A EmbeddedServer Modified: trunk/examples/core/microcontainer/build.xml =================================================================== --- trunk/examples/core/microcontainer/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/microcontainer/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -23,7 +23,6 @@ <path id="local.classpath"> <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> - <include name="hornetq-transports.jar"/> <include name="hornetq-bootstrap.jar"/> <include name="hornetq-jbossas-security.jar"/> </fileset> Modified: trunk/examples/core/microcontainer/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java =================================================================== --- trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -16,8 +16,8 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; /** * Modified: trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml =================================================================== --- trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/examples/core/perf/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/core/perf/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/perf/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java =================================================================== --- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -25,8 +25,8 @@ import org.hornetq.api.core.Message; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.utils.TokenBucketLimiter; import org.hornetq.utils.TokenBucketLimiterImpl; Modified: trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> <connector name="in-vm"> @@ -32,7 +32,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/javaee/jca-config/readme.html =================================================================== --- trunk/examples/javaee/jca-config/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jca-config/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -29,7 +29,7 @@ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"), @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"), - @ActivationConfigProperty(propertyName = "ConnectorClassName", propertyValue = "org.hornetq.integration.transports.netty.NettyConnectorFactory"), + @ActivationConfigProperty(propertyName = "ConnectorClassName", propertyValue = "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), @ActivationConfigProperty(propertyName = "ConnectionParameters", propertyValue = "hornetq.remoting.netty.port=5545") }) public class MDBRemoteExample implements MessageListener @@ -73,7 +73,7 @@ <rar-name>jms-ra.rar</rar-name> <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> - <config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">hornetq.remoting.netty.port=5545</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory> Modified: trunk/examples/javaee/jca-config/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> <connector name="in-vm"> @@ -32,7 +32,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -21,7 +21,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> <connector name="in-vm"> @@ -40,7 +40,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="${hornetq.remoting.netty.port:5446}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -15,7 +15,7 @@ <rar-name>hornetq-ra.rar</rar-name> <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> - <config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property> + <config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</config-property> <config-property name="ConnectionParameters" type="java.lang.String">port=5445</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory> Modified: trunk/examples/javaee/jca-config/server2/ra.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/ra.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jca-config/server2/ra.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -39,7 +39,7 @@ <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> Modified: trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> <connector name="in-vm"> @@ -24,7 +24,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> @@ -34,7 +34,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> Modified: trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@ <connectors> <connector name="netty-servlet"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="localhost"/> <param key="port" value="8443"/> <param key="use-servlet" value="true"/> @@ -28,13 +28,13 @@ <acceptors> <acceptor name="netty-servlet"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="use-invm" value="true"/> <param key="host" value="org.hornetq"/> </acceptor> <acceptor name="netty-invm"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="use-invm" value="true"/> <param key="host" value="org.hornetq"/> </acceptor> Modified: trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@ <connectors> <connector name="netty-servlet"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="localhost"/> <param key="port" value="8080"/> <param key="use-servlet" value="true"/> @@ -25,13 +25,13 @@ <acceptors> <acceptor name="netty-servlet"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="use-invm" value="true"/> <param key="host" value="org.hornetq"/> </acceptor> <acceptor name="netty-invm"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="use-invm" value="true"/> <param key="host" value="org.hornetq"/> </acceptor> Modified: trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,7 +13,7 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> <connector name="in-vm"> @@ -32,7 +32,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/applet/applet.html =================================================================== --- trunk/examples/jms/applet/applet.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/applet/applet.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ <applet code="org.hornetq.jms.example.AppletExample.class" codebase="build/classes/" - archive="hornetq-core-client.jar,hornetq-jms-client.jar,jboss-jms-api.jar,hornetq-transports.jar,netty.jar" + archive="hornetq-core-client.jar,hornetq-jms-client.jar,jboss-jms-api.jar,netty.jar" width="640" height="480"></applet> </body> </html> \ No newline at end of file Modified: trunk/examples/jms/applet/build.xml =================================================================== --- trunk/examples/jms/applet/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/applet/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -36,7 +36,6 @@ <mkdir dir="build/classes" /> <copy todir="build/classes" flatten="true"> <fileset dir="${hornetq.jars.dir}"> - <include name="hornetq-transports.jar"/> <include name="hornetq-core-client.jar"/> <include name="hornetq-jms-client.jar"/> </fileset> Modified: trunk/examples/jms/applet/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java =================================================================== --- trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -47,7 +47,7 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; /** * A AppletExample Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -14,7 +14,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/bridge/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,13 +5,13 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector>  <connector name="remote-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -19,7 +19,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/bridge/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/browser/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/client-kickoff/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-kickoff/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/client-kickoff/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,14 +7,14 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -16,7 +16,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5447"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5447"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/divert/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -9,14 +9,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector>  <connector name="newyork-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -25,7 +25,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/divert/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors> @@ -13,7 +13,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/embedded/build.xml =================================================================== --- trunk/examples/jms/embedded/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/embedded/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -35,7 +35,6 @@ <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> <include name="hornetq-jms.jar"/> - <include name="hornetq-transports.jar"/> </fileset> <fileset dir="${jars.dir}"> Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -28,10 +28,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; import org.hornetq.jms.server.config.JMSConfiguration; Modified: trunk/examples/jms/expiry/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/http-transport/readme.html =================================================================== --- trunk/examples/jms/http-transport/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/http-transport/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -19,7 +19,7 @@ <pre class="prettyprint"> <code> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="hornetq.remoting.netty.http-enabled" value="true" type="Boolean"/> <param key="hornetq.remoting.netty.port" value="8080" type="Integer"/> </connector> @@ -27,7 +27,7 @@  <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="hornetq.remoting.netty.http-enabled" value="true" type="Boolean"/> <param key="hornetq.remoting.netty.port" value="8080" type="Integer"/> </acceptor> Modified: trunk/examples/jms/http-transport/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="http-enabled" value="true"/> <param key="port" value="8080"/> </connector> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="http-enabled" value="true"/> <param key="port" value="8080"/> </acceptor> Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java =================================================================== --- trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -26,8 +26,8 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; /** * Modified: trunk/examples/jms/interceptor/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,14 +10,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/jaas/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/jms-bridge/build.xml =================================================================== --- trunk/examples/jms/jms-bridge/build.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jms-bridge/build.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -47,7 +47,6 @@ <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-core.jar"/> <include name="hornetq-jms.jar"/> - <include name="hornetq-transports.jar"/> <include name="hornetq-bootstrap.jar"/> </fileset> <fileset dir="${jars.dir}"> Modified: trunk/examples/jms/jms-bridge/readme.html =================================================================== --- trunk/examples/jms/jms-bridge/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jms-bridge/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -69,7 +69,7 @@ <pre class="prettyprint"> <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>    @@ -106,7 +106,7 @@ <pre class="prettyprint"> <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>    Modified: trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,7 +4,7 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>    @@ -14,7 +14,7 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>  <param key="host" value="0.0.0.0"/> </acceptor> Modified: trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,7 +4,7 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>    @@ -14,7 +14,7 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>  <param key="host" value="0.0.0.0"/> </acceptor> Modified: trunk/examples/jms/jmx/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,14 +8,14 @@  <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/large-message/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/management/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/message-counters/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,14 +10,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/message-group/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/message-group2/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/message-priority/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,12 +7,12 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> <connector name="backup-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -20,7 +20,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/paging/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,7 +5,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml =================================================================== --- trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/examples/jms/perf/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/perf/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/perf/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,7 +4,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> @@ -14,7 +14,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/queue/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -16,7 +16,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,14 +4,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector>  <connector name="netty-connector2"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -21,14 +21,14 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor>  <acceptor name="netty-acceptor2"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/request-reply/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/security/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/ssl-enabled/readme.html =================================================================== --- trunk/examples/jms/ssl-enabled/readme.html 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/ssl-enabled/readme.html 2010-04-12 12:08:00 UTC (rev 9099) @@ -19,7 +19,7 @@  <connector name="netty-ssl-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/> <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> @@ -30,7 +30,7 @@  <acceptor name="netty-ssl-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/> <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/> Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-ssl-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="localhost"/> <param key="port" value="5500"/> <param key="ssl-enabled" value="true"/> @@ -18,7 +18,7 @@  <acceptors> <acceptor name="netty-ssl-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="localhost"/> <param key="port" value="5500"/> <param key="ssl-enabled" value="true"/> Modified: trunk/examples/jms/static-selector/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/stomp/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors> @@ -14,12 +14,12 @@ <acceptors>  <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor>   <acceptor name="stomp-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="protocol" value="stomp" /> <param key="port" value="61613" /> </acceptor> Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -9,7 +9,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> @@ -18,7 +18,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -16,7 +16,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5447"/> </connector> </connectors> @@ -16,7 +16,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5448"/> </connector> </connectors> @@ -16,7 +16,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5448"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5449"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5449"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5450"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5450"/> </acceptor> </acceptors> Modified: trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/topic/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,14 +6,14 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -7,12 +7,12 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> <connector name="backup-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> </connectors> @@ -20,7 +20,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/transactional/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/xa-send/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -5,14 +5,14 @@  <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors>  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/examples/soak/normal/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/soak/normal/server0/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/examples/soak/normal/server0/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,7 +4,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> @@ -15,7 +15,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="tcp-no-delay" value="false"/> <param key="tcp-send-buffer-size" value="1048576"/> <param key="tcp-receive-buffer-size" value="1048576"/> Modified: trunk/src/config/jboss-as/build-as4.xml =================================================================== --- trunk/src/config/jboss-as/build-as4.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/jboss-as/build-as4.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -89,7 +89,6 @@ <copy todir="${jms-ra.rar.dir}/META-INF/" file="${hornetq.config.dir}/jboss-as-4/ra.xml"/> <copy todir="${jms-ra.rar.dir}"> <fileset dir="${lib.dir}"> - <include name="hornetq-transports.jar"/> <include name="netty*.jar"/> </fileset> </copy> Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -18,13 +18,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -38,13 +38,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5445}"/> <param key="batch-delay" value="50"/> Modified: trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -37,7 +37,7 @@ <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -16,13 +16,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> @@ -36,13 +36,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5445}"/> <param key="batch-delay" value="50"/> Modified: trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -37,7 +37,7 @@ <description>The transport type</description> <config-property-name>ConnectorClassName</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property-value> + <config-property-value>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</config-property-value> </config-property> <config-property> <description>The transport configuration. These values must be in the form of key=val;key=val;</description> Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -16,13 +16,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> @@ -31,13 +31,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -14,13 +14,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> @@ -29,13 +29,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -8,13 +8,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> @@ -23,13 +23,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,13 +6,13 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> @@ -21,13 +21,13 @@ <acceptors> <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> Copied: trunk/src/main/org/hornetq/core/remoting/impl/netty (from rev 9095, trunk/src/main/org/hornetq/integration/transports/netty) Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import org.hornetq.api.core.HornetQException; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import org.hornetq.utils.DataConstants; import org.jboss.netty.buffer.ChannelBuffer; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executor; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HttpKeepAliveRunnable.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.util.ArrayList; import java.util.List; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.net.InetSocketAddress; import java.net.SocketAddress; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptorFactory.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.util.Map; import java.util.Set; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.net.ConnectException; import java.net.InetSocketAddress; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnectorFactory.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.util.Map; import java.util.Set; Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.hornetq.integration.transports.netty; +package org.hornetq.core.remoting.impl.netty; import java.util.Collections; import java.util.HashSet; Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -35,10 +35,10 @@ import org.hornetq.core.protocol.core.impl.CoreProtocolManagerFactory; import org.hornetq.core.protocol.stomp.StompProtocolManagerFactory; import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.management.ManagementService; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.spi.core.protocol.ConnectionEntry; import org.hornetq.spi.core.protocol.ProtocolManager; import org.hornetq.spi.core.protocol.ProtocolType; Modified: trunk/tests/config/server-start-stop-backup-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-backup-config1.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/config/server-start-stop-backup-config1.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,7 +11,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -19,7 +19,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/tests/config/server-start-stop-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-config1.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/config/server-start-stop-config1.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -4,7 +4,7 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> </connectors> @@ -12,7 +12,7 @@ <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/tests/config/server-start-stop-live-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-live-config1.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/config/server-start-stop-live-config1.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -11,12 +11,12 @@ <connectors> <connector name="netty-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> <connector name="backup-connector"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> </connectors> @@ -24,7 +24,7 @@  <acceptors> <acceptor name="netty-acceptor"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/tests/jms-tests/config/hornetq-configuration.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-configuration.xml 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/jms-tests/config/hornetq-configuration.xml 2010-04-12 12:08:00 UTC (rev 9099) @@ -6,7 +6,7 @@ <connectors> <connector name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> </connector> @@ -26,7 +26,7 @@  <acceptor name="netty"> - <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> </acceptor> </acceptors> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -60,7 +60,7 @@ List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"), + connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), null)); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -56,7 +56,7 @@ List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"), + connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), null)); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -287,7 +287,7 @@ { List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"), + connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), null)); getJMSServerManager().createConnectionFactory(objectName, Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -34,7 +34,7 @@ import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.tests.util.SpawnedVMSupport; import org.objectweb.jtests.jms.admin.Admin; Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,9 +22,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.jnp.server.Main; Modified: trunk/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -31,10 +31,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.stomp.Stomp; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -43,8 +43,8 @@ public void testCoreClientNetty() throws Exception { - testCoreClient("org.hornetq.integration.transports.netty.NettyAcceptorFactory", - "org.hornetq.integration.transports.netty.NettyConnectorFactory"); + testCoreClient("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory", + "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); } public void testCoreClientInVM() throws Exception Modified: trunk/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -32,12 +32,12 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressFullMessagePolicy; import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.UUIDGenerator; @@ -76,7 +76,7 @@ { System.getProperties().put("hq.batchHQ", "true"); - String connectorFactoryClassName = "org.hornetq.integration.transports.netty.NettyConnectorFactory"; + String connectorFactoryClassName = "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"; final int numSenders = 1; @@ -156,7 +156,7 @@ private void testPerf(boolean nio) throws Exception { - String acceptorFactoryClassName = "org.hornetq.integration.transports.netty.NettyAcceptorFactory"; + String acceptorFactoryClassName = "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"; Configuration conf = new ConfigurationImpl(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -34,11 +34,11 @@ import org.hornetq.core.client.impl.ClientProducerInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressFullMessagePolicy; import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -118,7 +118,7 @@ { super.setUp(); - sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -20,7 +20,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.SpawnedVMSupport; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -44,7 +44,7 @@ { CrashClient.log.debug("args = " + Arrays.asList(args)); - ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -16,7 +16,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQTextMessage; /** Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -31,10 +31,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; import org.hornetq.core.server.cluster.impl.BridgeImpl; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.spi.core.protocol.RemotingConnection; /** Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -29,9 +29,9 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; /** @@ -72,7 +72,7 @@ Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -224,7 +224,7 @@ Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -423,7 +423,7 @@ Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { @@ -560,7 +560,7 @@ Map<String, Object> server1Params = new HashMap<String, Object>(); if (isNetty()) { - server1Params.put("port", org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -29,8 +29,8 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; @@ -241,7 +241,7 @@ { if (isNetty()) { - server1Params.put("port", org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put("port", org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); } else { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -20,9 +20,9 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.tests.util.UnitTestCase; /** @@ -98,8 +98,8 @@ if (netty) { - params.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + id); + params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); serviceConf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -30,10 +30,10 @@ import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -45,6 +45,7 @@ import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.postoffice.QueueBinding; import org.hornetq.core.postoffice.impl.LocalQueueBinding; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; @@ -52,7 +53,6 @@ import org.hornetq.core.server.cluster.RemoteQueueBinding; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; @@ -1434,8 +1434,8 @@ if (netty) { - params.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + node); + params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + node); } else { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -190,16 +190,16 @@ { if (live) { - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory"); + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"); } else { Map<String, Object> server1Params = new HashMap<String, Object>(); - server1Params.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory", + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory", server1Params); } } @@ -208,16 +208,16 @@ { if (live) { - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); } else { Map<String, Object> server1Params = new HashMap<String, Object>(); - server1Params.put(org.hornetq.integration.transports.netty.TransportConstants.PORT_PROP_NAME, - org.hornetq.integration.transports.netty.TransportConstants.DEFAULT_PORT + 1); + server1Params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, + org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + 1); - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory", + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory", server1Params); } } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -17,7 +17,7 @@ import java.util.Map; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.TransportConstants; /** * A NettyFailoverTest @@ -48,7 +48,7 @@ { if (live) { - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory"); + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"); } else { @@ -56,7 +56,7 @@ server1Params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_PORT + 1); - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory", + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory", server1Params); } } @@ -66,7 +66,7 @@ { if (live) { - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); } else { @@ -74,7 +74,7 @@ server1Params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_PORT + 1); - return new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory", + return new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory", server1Params); } } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -40,7 +40,7 @@ liveConf.setSecurityEnabled(false); liveConf.getAcceptorConfigurations().clear(); liveConf.getAcceptorConfigurations() - .add(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory")); + .add(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory")); liveServer = HornetQServers.newHornetQServer(liveConf, false); liveServer.start(); } @@ -48,7 +48,7 @@ @Override protected ClientSessionFactoryInternal createSessionFactory() { - final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); sf.setAckBatchSize(0); Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -21,9 +21,9 @@ import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -25,9 +25,9 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.integration.transports.netty.NettyAcceptor; -import org.hornetq.integration.transports.netty.NettyConnector; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyAcceptor; +import org.hornetq.core.remoting.impl.netty.NettyConnector; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -31,10 +31,10 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -36,10 +36,10 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; import org.hornetq.jms.server.config.JMSConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -32,7 +32,7 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -27,8 +27,8 @@ import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerDeployer; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -26,9 +26,9 @@ import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -31,10 +31,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -25,9 +25,9 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -34,11 +34,11 @@ import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,8 +22,8 @@ import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.jms.persistence.config.PersistedConnectionFactory; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,8 +22,8 @@ import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.jms.server.config.impl.TransportConfigurationEncodingSupport; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -26,10 +26,10 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -13,9 +13,9 @@ package org.hornetq.tests.integration.remoting; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; /** * A NettyNetworkAddressTest Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -106,7 +106,7 @@ */ public void testNoFailureWithPinging() throws Exception { - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); @@ -165,7 +165,7 @@ */ public void testNoFailureNoPinging() throws Exception { - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(-1); @@ -221,7 +221,7 @@ */ public void testServerFailureNoPing() throws Exception { - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); ClientSessionFactoryImpl csf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(transportConfig); @@ -314,7 +314,7 @@ } }); - TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,8 +22,8 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,10 +22,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.SpawnedVMSupport; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -25,11 +25,11 @@ import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -52,10 +52,10 @@ import org.hornetq.core.protocol.stomp.Stomp; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.JMSConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -19,7 +19,7 @@ import junit.framework.Assert; -import org.hornetq.integration.transports.netty.HornetQFrameDecoder2; +import org.hornetq.core.remoting.impl.netty.HornetQFrameDecoder2; import org.hornetq.tests.util.UnitTestCase; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -34,12 +34,12 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.HornetQSession; Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -100,7 +100,7 @@ */ private void internalTest() throws Exception { - final TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); + final TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); Interceptor noPongInterceptor = new Interceptor() { Modified: trunk/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -29,10 +29,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.stomp.Stomp; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -21,8 +21,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.integration.transports.netty.NettyAcceptor; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptor; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,8 +22,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.integration.transports.netty.NettyAcceptor; -import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.core.remoting.impl.netty.NettyAcceptor; +import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -22,7 +22,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; -import org.hornetq.integration.transports.netty.NettyConnection; +import org.hornetq.core.remoting.impl.netty.NettyConnection; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -21,7 +21,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; -import org.hornetq.integration.transports.netty.NettyConnector; +import org.hornetq.core.remoting.impl.netty.NettyConnector; import org.hornetq.spi.core.protocol.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -36,8 +36,8 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnector; +import org.hornetq.core.remoting.impl.netty.NettyConnector; import org.hornetq.core.server.HornetQServer; -import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; import org.hornetq.ra.ConnectionFactoryProperties; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -25,10 +25,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -32,12 +32,12 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.core.settings.impl.AddressSettings; -import org.hornetq.integration.transports.netty.NettyAcceptorFactory; -import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQBytesMessage; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.spi.core.security.HornetQSecurityManager; Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-04-12 10:32:05 UTC (rev 9098) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-04-12 12:08:00 UTC (rev 9099) @@ -86,9 +86,9 @@ public static final String INVM_CONNECTOR_FACTORY = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"; - public static final String NETTY_ACCEPTOR_FACTORY = "org.hornetq.integration.transports.netty.NettyAcceptorFactory"; + public static final String NETTY_ACCEPTOR_FACTORY = "org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory"; - public static final String NETTY_CONNECTOR_FACTORY = "org.hornetq.integration.transports.netty.NettyConnectorFactory"; + public static final String NETTY_CONNECTOR_FACTORY = "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"; // Attributes ----------------------------------------------------

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9098 - trunk.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-12 06:32:05 -0400 (Mon, 12 Apr 2010) New Revision: 9098 Modified: trunk/build-hornetq.xml Log: removed some commented out stuff Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-04-12 10:29:16 UTC (rev 9097) +++ trunk/build-hornetq.xml 2010-04-12 10:32:05 UTC (rev 9098) @@ -340,10 +340,6 @@ <path refid="apache.logging.classpath"/> <pathelement location="${src.config.dir}/common"/> <path refid="org.jboss.naming.classpath"/> -  </path> <target name="clean"> @@ -521,8 +517,6 @@ </javac> <copy file="${src.config.service.dir}/jboss-service.xml" tofile="${build.service.classes.dir}/META-INF/jboss-service.xml" overwrite="true" /> -  </target> <target name="compile-bootstrap" depends="compile-core"> @@ -611,7 +605,7 @@ file="${src.schema.dir}/hornetq-users.xsd"/> </schemavalidate> -  +  <antcall target="-validate-configuration"> <param name="conf.dir" value="${src.config.jbossas.non-clustered.dir}"/> </antcall> @@ -818,7 +812,6 @@ <mkdir dir="${build.distro.dir}"/> <mkdir dir="${build.distro.lib.dir}"/> -  <mkdir dir="${build.distro.config.dir}"/> <mkdir dir="${build.distro.bin.dir}"/> <mkdir dir="${build.distro.api.dir}"/> @@ -847,15 +840,6 @@ </fileset> </copy> <copy file="${org.jboss.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/> -  <copy todir="${build.distro.config.dir}"> <fileset dir="${src.config.dir}"> <include name="*.xml"/> @@ -1257,7 +1241,7 @@ failureproperty="tests.failed"> <formatter type="plain" usefile="${junit.formatter.usefile}"/> <fileset dir="${test.classes.dir}"> -  +  <exclude name="**/cluster/failover/*StaticClusterWithBackupFailoverTest.class" /> <include name="${tests.param}"/> </fileset>

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9097 - in trunk: docs/quickstart-guide/en and 4 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-12 06:29:16 -0400 (Mon, 12 Apr 2010) New Revision: 9097 Modified: trunk/build-hornetq.xml trunk/docs/quickstart-guide/en/running.xml trunk/examples/common/build.xml trunk/examples/common/config/ant.properties trunk/examples/jms/applet/build.xml trunk/src/config/examples-ant.properties trunk/src/config/javaee-examples-ant.properties Log: https://jira.jboss.org/jira/browse/HORNETQ-282 Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/build-hornetq.xml 2010-04-12 10:29:16 UTC (rev 9097) @@ -110,7 +110,7 @@ value="${build.dir}/${build.artifact}"/> <property name="build.distro.lib.dir" value="${build.distro.dir}/lib"/> <property name="build.distro.native.dir" value="${build.distro.dir}/native-src"/> - <property name="build.distro.client.dir" value="${build.distro.dir}/client"/> +  <property name="build.distro.config.dir" value="${build.distro.dir}/config"/> <property name="build.distro.schema.dir" value="${build.distro.dir}/schemas"/> <property name="build.distro.bin.dir" value="${build.distro.dir}/bin"/> @@ -818,7 +818,7 @@ <mkdir dir="${build.distro.dir}"/> <mkdir dir="${build.distro.lib.dir}"/> - <mkdir dir="${build.distro.client.dir}"/> +  <mkdir dir="${build.distro.config.dir}"/> <mkdir dir="${build.distro.bin.dir}"/> <mkdir dir="${build.distro.api.dir}"/> @@ -835,6 +835,9 @@ <include name="${logging.jar.name}"/> <include name="${mc.jar.name}"/> <include name="${ra.rar.name}"/> + <include name="${core.client.jar.name}"/> + <include name="${jms.client.jar.name}"/> + <include name="${jnp.client.jar.name}"/> </fileset> <fileset dir="${org.jboss.naming.lib}"> <include name="jnpserver.jar"/> @@ -844,6 +847,7 @@ </fileset> </copy> <copy file="${org.jboss.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/> +  <copy todir="${build.distro.config.dir}"> <fileset dir="${src.config.dir}"> <include name="*.xml"/> Modified: trunk/docs/quickstart-guide/en/running.xml =================================================================== --- trunk/docs/quickstart-guide/en/running.xml 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/docs/quickstart-guide/en/running.xml 2010-04-12 10:29:16 UTC (rev 9097) @@ -64,4 +64,8 @@ forgetting to create the <link linkend="installation.jboss.as4">AS 4 profiles for HornetQ</link> first. </para> </section> + <section id="running.jboss.as6"> + <title>HornetQ In JBoss AS 6.0</title> + <para>From JBoss AS 6.0 M3 onwards, HornetQ is the default (built-in) JMS provider in JBoss AS, so there's no need to install it - it's already there.</para> + </section> </chapter> Modified: trunk/examples/common/build.xml =================================================================== --- trunk/examples/common/build.xml 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/examples/common/build.xml 2010-04-12 10:29:16 UTC (rev 9097) @@ -85,11 +85,9 @@ <pathelement location="${config.dir}"/> <pathelement location="${example.config.dir}"/> <pathelement location="${classes.dir}"/> - <fileset dir="${client.jars.dir}"> - <include name="**/*client*.jar"/> - </fileset> <fileset dir="${hornetq.jars.dir}"> <include name="**/hornetq-transports.jar"/> + <include name="**/*client*.jar"/> </fileset> <fileset dir="${jars.dir}"> <include name="**/netty*.jar"/> Modified: trunk/examples/common/config/ant.properties =================================================================== --- trunk/examples/common/config/ant.properties 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/examples/common/config/ant.properties 2010-04-12 10:29:16 UTC (rev 9097) @@ -1,5 +1,4 @@ hornetq.example.logserveroutput=true hornetq.jars.dir=${imported.basedir}/../../build/jars jars.dir=${imported.basedir}/../../thirdparty -client.jars.dir=${imported.basedir}/../../build/jars aio.library.path=${imported.basedir}/../../native/bin Modified: trunk/examples/jms/applet/build.xml =================================================================== --- trunk/examples/jms/applet/build.xml 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/examples/jms/applet/build.xml 2010-04-12 10:29:16 UTC (rev 9097) @@ -35,12 +35,10 @@ <target name="init"> <mkdir dir="build/classes" /> <copy todir="build/classes" flatten="true"> - <fileset dir="${client.jars.dir}"> - <include name="hornetq-core-client.jar"/> - <include name="hornetq-jms-client.jar"/> - </fileset> <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-transports.jar"/> + <include name="hornetq-core-client.jar"/> + <include name="hornetq-jms-client.jar"/> </fileset> <fileset dir="${jars.dir}"> <include name="**/netty.jar" /> Modified: trunk/src/config/examples-ant.properties =================================================================== --- trunk/src/config/examples-ant.properties 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/src/config/examples-ant.properties 2010-04-12 10:29:16 UTC (rev 9097) @@ -1,5 +1,4 @@ hornetq.example.logserveroutput=true hornetq.jars.dir=${imported.basedir}/../../lib jars.dir=${imported.basedir}/../../lib -client.jars.dir=${imported.basedir}/../../client aio.library.path=${imported.basedir}/../../bin \ No newline at end of file Modified: trunk/src/config/javaee-examples-ant.properties =================================================================== --- trunk/src/config/javaee-examples-ant.properties 2010-04-12 09:44:44 UTC (rev 9096) +++ trunk/src/config/javaee-examples-ant.properties 2010-04-12 10:29:16 UTC (rev 9097) @@ -1,5 +1,4 @@ hornetq.example.logserveroutput=true hornetq.jars.dir=${imported.basedir}/../../../lib jars.dir=${imported.basedir}/../../../lib -client.jars.dir=${imported.basedir}/../../../client aio.library.path=${imported.basedir}/../../native/bin

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9096 - in trunk/src/main/org/hornetq/core: server/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-12 05:44:44 -0400 (Mon, 12 Apr 2010) New Revision: 9096 Modified: trunk/src/main/org/hornetq/core/logging/Logger.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java Log: some tweaks to logger Modified: trunk/src/main/org/hornetq/core/logging/Logger.java =================================================================== --- trunk/src/main/org/hornetq/core/logging/Logger.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/logging/Logger.java 2010-04-12 09:44:44 UTC (rev 9096) @@ -33,7 +33,7 @@ { public static final String LOGGER_DELEGATE_FACTORY_CLASS_NAME = "org.hornetq.logger-delegate-factory-class-name"; - private static LogDelegateFactory delegateFactory; + private static volatile LogDelegateFactory delegateFactory; private static final ConcurrentMap<Class<?>, Logger> loggers = new ConcurrentHashMap<Class<?>, Logger>(); @@ -42,7 +42,7 @@ Logger.initialise(); } - public static void setDelegateFactory(final LogDelegateFactory delegateFactory) + public static synchronized void setDelegateFactory(final LogDelegateFactory delegateFactory) { Logger.clear(); @@ -54,14 +54,14 @@ Logger.loggers.clear(); } - public static void reset() + public static synchronized void reset() { Logger.clear(); Logger.initialise(); } - public static void initialise() + public static synchronized void initialise() { LogDelegateFactory delegateFactory; Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-12 08:50:36 UTC (rev 9095) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-12 09:44:44 UTC (rev 9096) @@ -1427,7 +1427,7 @@ } catch (Exception e) { - throw new IllegalArgumentException("Error instantiating transformer class \"" + className + "\"", e); + throw new IllegalArgumentException("Error instantiating class \"" + className + "\"", e); } }

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9095 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-04-12 04:50:36 -0400 (Mon, 12 Apr 2010) New Revision: 9095 Modified: trunk/docs/user-manual/en/ha.xml Log: https://jira.jboss.org/jira/browse/HORNETQ-330: Shared HA configuration documentation clarification * state explicitly that backup server with shared store must sill specify <backup>true</backup> Modified: trunk/docs/user-manual/en/ha.xml =================================================================== --- trunk/docs/user-manual/en/ha.xml 2010-04-12 08:27:07 UTC (rev 9094) +++ trunk/docs/user-manual/en/ha.xml 2010-04-12 08:50:36 UTC (rev 9095) @@ -162,6 +162,10 @@ <programlisting> <shared-store>true<shared-store> </programlisting> + <para>Additionally, the backup server must be flagged explicitly as a backup:</para> + <programlisting> + <backup>true</backup> + </programlisting> <para>In order for live - backup pairs to operate properly with a shared store, both servers must have configured the location of journal directory to point to the <emphasis>same shared location</emphasis> (as explained in <xref

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9094 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-04-12 04:27:07 -0400 (Mon, 12 Apr 2010) New Revision: 9094 Modified: trunk/docs/user-manual/en/flow-control.xml Log: doc: added xref link to paging chapter Modified: trunk/docs/user-manual/en/flow-control.xml =================================================================== --- trunk/docs/user-manual/en/flow-control.xml 2010-04-12 08:21:13 UTC (rev 9093) +++ trunk/docs/user-manual/en/flow-control.xml 2010-04-12 08:27:07 UTC (rev 9094) @@ -263,8 +263,8 @@ <para>Note the policy must be set to <literal>BLOCK</literal> to enable blocking producer flow control.</para> <para>Please note the default value for <literal>address-full-policy</literal> is to - <literal>PAGE</literal>. Please see the chapter on paging for more information on - paging.</para> + <literal>PAGE</literal> (see <xref linkend="paging" /> for more information on + paging).</para> </section> </section> <section>

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9093 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-04-12 04:21:13 -0400 (Mon, 12 Apr 2010) New Revision: 9093 Modified: trunk/docs/user-manual/en/flow-control.xml Log: https://jira.jboss.org/jira/browse/HORNETQ-306: User manual example has wrong address-full-policy value * fixed blocking producer window based flow control config snippet Modified: trunk/docs/user-manual/en/flow-control.xml =================================================================== --- trunk/docs/user-manual/en/flow-control.xml 2010-04-10 12:51:46 UTC (rev 9092) +++ trunk/docs/user-manual/en/flow-control.xml 2010-04-12 08:21:13 UTC (rev 9093) @@ -254,13 +254,13 @@ <address-settings> <address-setting match="jms.queue.exampleQueue"> <max-size-bytes>100000</max-size-bytes> - <address-full-policy>DROP</address-full-policy> + <address-full-policy>BLOCK</address-full-policy> </address-setting> </address-settings></programlisting> <para>The above example would set the max size of the JMS queue "exampleQueue" to be 100000 bytes and would block any producers sending to that address to prevent that max size being exceeded.</para> - <para>Note the policy must be set to <literal>DROP</literal> to enable blocking producer + <para>Note the policy must be set to <literal>BLOCK</literal> to enable blocking producer flow control.</para> <para>Please note the default value for <literal>address-full-policy</literal> is to <literal>PAGE</literal>. Please see the chapter on paging for more information on

14 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r9092 - trunk/tests/src/org/hornetq/tests/integration/client.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-04-10 08:51:46 -0400 (Sat, 10 Apr 2010) New Revision: 9092 Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java Log: oops removed endless loop Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-04-10 10:47:48 UTC (rev 9091) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-04-10 12:51:46 UTC (rev 9092) @@ -35,20 +35,6 @@ public final SimpleString queueA = new SimpleString("queueA"); - public void test() throws Exception - { - for (int i = 0; i < 100000; i++) - { - log.info("**** ITER " + i + "\n\n\n\n\n\n"); - - this.testConsumersRoundRobinCorrectly(); - - tearDown(); - - setUp(); - } - } - public void testConsumersRoundRobinCorrectly() throws Exception { HornetQServer server = createServer(false);

14 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits April 2010