From 577b7080880fea9a736dfcd2fdeb060e358fb6e3 Mon Sep 17 00:00:00 2001
From: Tim Fox <timvolpe@gmail.com>
Date: Mon, 12 Apr 2010 12:08:00 +0000
Subject: [PATCH] https://jira.jboss.org/jira/browse/HORNETQ-278

---
 build-hornetq.xml                             | 54 ++-----------------
 build-maven.xml                               | 14 -----
 docs/user-manual/en/appserver-integration.xml | 10 ++--
 docs/user-manual/en/client-classpath.xml      |  2 +-
 .../user-manual/en/configuring-transports.xml | 20 +++----
 docs/user-manual/en/ha.xml                    |  4 +-
 docs/user-manual/en/interoperability.xml      |  2 +-
 docs/user-manual/en/using-server.xml          |  2 +-
 examples/common/build.xml                     |  3 +-
 examples/core/embedded-remote/build.xml       |  1 -
 examples/core/embedded-remote/readme.html     |  2 -
 .../core/example/EmbeddedRemoteExample.java   |  2 +-
 .../hornetq/core/example/EmbeddedServer.java  |  2 +-
 examples/core/embedded/build.xml              |  1 -
 examples/core/embedded/readme.html            |  3 +-
 examples/core/microcontainer/build.xml        |  1 -
 .../server0/hornetq-configuration.xml         |  2 +-
 .../EmbeddedMicroContainerExample.java        |  2 +-
 .../hornetq-configuration-messaging-lab.xml   |  2 +-
 .../perf/server0/hornetq-configuration.xml    |  2 +-
 .../org/hornetq/core/example/PerfBase.java    |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 examples/javaee/jca-config/readme.html        |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server2/hornetq-configuration.xml         |  4 +-
 .../jca-config/server2/jms-remote-ds.xml      |  2 +-
 examples/javaee/jca-config/server2/ra.xml     |  2 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../mdb-bmt/server/hornetq-configuration.xml  |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  4 +-
 .../server/hornetq-configuration.xml          |  6 +--
 .../server/hornetq-configuration.xml          |  6 +--
 .../server/hornetq-configuration.xml          |  4 +-
 examples/jms/applet/applet.html               |  2 +-
 examples/jms/applet/build.xml                 |  1 -
 .../applet/server0/hornetq-configuration.xml  |  4 +-
 .../hornetq/jms/example/AppletExample.java    |  2 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../bridge/server0/hornetq-configuration.xml  |  6 +--
 .../bridge/server1/hornetq-configuration.xml  |  4 +-
 .../browser/server0/hornetq-configuration.xml |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server2/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server2/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../divert/server0/hornetq-configuration.xml  |  6 +--
 .../divert/server1/hornetq-configuration.xml  |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 examples/jms/embedded/build.xml               |  1 -
 .../hornetq/jms/example/EmbeddedExample.java  |  4 +-
 .../expiry/server0/hornetq-configuration.xml  |  4 +-
 examples/jms/http-transport/readme.html       |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../InstantiateConnectionFactoryExample.java  |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../jaas/server0/hornetq-configuration.xml    |  4 +-
 examples/jms/jms-bridge/build.xml             |  1 -
 examples/jms/jms-bridge/readme.html           |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../jms/jmx/server0/hornetq-configuration.xml |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  6 +--
 .../paging/server0/hornetq-configuration.xml  |  4 +-
 .../hornetq-configuration-messaging-lab.xml   |  2 +-
 .../perf/server0/hornetq-configuration.xml    |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../queue/server0/hornetq-configuration.xml   |  4 +-
 .../server0/hornetq-configuration.xml         |  8 +--
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 examples/jms/ssl-enabled/readme.html          |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../stomp/server0/hornetq-configuration.xml   |  6 +--
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  4 +-
 .../server2/hornetq-configuration.xml         |  4 +-
 .../server3/hornetq-configuration.xml         |  4 +-
 .../server4/hornetq-configuration.xml         |  4 +-
 .../server5/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../topic/server0/hornetq-configuration.xml   |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server1/hornetq-configuration.xml         |  6 +--
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../xa-send/server0/hornetq-configuration.xml |  4 +-
 .../server0/hornetq-configuration.xml         |  4 +-
 .../normal/server0/hornetq-configuration.xml  |  4 +-
 src/config/jboss-as/build-as4.xml             |  1 -
 .../clustered/hornetq-configuration.xml       |  8 +--
 .../jboss-as/clustered/jboss-as-4/ra.xml      |  2 +-
 .../non-clustered/hornetq-configuration.xml   |  8 +--
 .../jboss-as/non-clustered/jboss-as-4/ra.xml  |  2 +-
 .../clustered/hornetq-configuration.xml       |  8 +--
 .../non-clustered/hornetq-configuration.xml   |  8 +--
 .../trunk/clustered/hornetq-configuration.xml |  8 +--
 .../non-clustered/hornetq-configuration.xml   |  8 +--
 .../impl}/netty/HornetQChannelHandler.java    |  2 +-
 .../impl}/netty/HornetQFrameDecoder.java      |  2 +-
 .../impl}/netty/HornetQFrameDecoder2.java     |  2 +-
 .../impl}/netty/HttpAcceptorHandler.java      |  2 +-
 .../impl}/netty/HttpKeepAliveRunnable.java    |  2 +-
 .../remoting/impl}/netty/NettyAcceptor.java   |  2 +-
 .../impl}/netty/NettyAcceptorFactory.java     |  2 +-
 .../remoting/impl}/netty/NettyConnection.java |  2 +-
 .../remoting/impl}/netty/NettyConnector.java  |  2 +-
 .../impl}/netty/NettyConnectorFactory.java    |  2 +-
 .../impl}/netty/TransportConstants.java       |  2 +-
 .../server/impl/RemotingServiceImpl.java      |  2 +-
 .../server-start-stop-backup-config1.xml      |  4 +-
 tests/config/server-start-stop-config1.xml    |  4 +-
 .../config/server-start-stop-live-config1.xml |  6 +--
 .../config/hornetq-configuration.xml          |  4 +-
 .../jms/tests/CTSMiscellaneousTest.java       |  2 +-
 .../org/hornetq/jms/tests/JMSTestCase.java    |  2 +-
 .../tools/container/LocalTestServer.java      |  2 +-
 .../src/org/hornetq/jms/HornetQAdmin.java     |  2 +-
 .../src/org/hornetq/jms/SpawnedJMSServer.java |  2 +-
 .../concurrent/stomp/ConcurrentStompTest.java |  4 +-
 .../integration/client/CoreClientTest.java    |  4 +-
 .../integration/client/NIOvsOIOTest.java      |  6 +--
 .../client/ProducerFlowControlTest.java       |  2 +-
 .../clientcrash/ClientCrashTest.java          |  2 +-
 .../clientcrash/ClientExitTest.java           |  2 +-
 .../integration/clientcrash/CrashClient.java  |  2 +-
 .../clientcrash/GracefulClient.java           |  2 +-
 .../cluster/bridge/BridgeReconnectTest.java   |  2 +-
 .../cluster/bridge/BridgeStartTest.java       | 10 ++--
 .../cluster/bridge/BridgeTest.java            |  4 +-
 .../cluster/bridge/BridgeTestBase.java        |  6 +--
 .../BridgeWithDiscoveryGroupStartTest.java    |  4 +-
 .../cluster/distribution/ClusterTestBase.java |  6 +--
 .../cluster/failover/FailoverTestBase.java    | 16 +++---
 .../cluster/failover/NettyFailoverTest.java   | 10 ++--
 .../NettyMultiThreadRandomReattachTest.java   |  4 +-
 .../http/CoreClientOverHttpTest.java          |  2 +-
 .../tests/integration/http/NettyHttpTest.java |  6 +--
 .../integration/jms/FloodServerTest.java      |  4 +-
 .../ManualReconnectionToSingleServerTest.java |  4 +-
 ...ClosedOnRemotingConnectionFailureTest.java |  2 +-
 .../jms/server/JMSServerDeployerTest.java     |  2 +-
 .../jms/server/JMSServerStartStopTest.java    |  2 +-
 .../management/JMSServerControl2Test.java     |  4 +-
 .../management/BroadcastGroupControlTest.java |  2 +-
 .../ClusterConnectionControl2Test.java        |  6 +--
 ...ectionFactoryConfigurationStorageTest.java |  4 +-
 ...sportConfigurationEncodingSupportTest.java |  4 +-
 .../integration/remoting/BatchDelayTest.java  |  6 +--
 .../remoting/NettyNetworkAddressTest.java     |  6 +--
 .../tests/integration/remoting/PingTest.java  |  8 +--
 .../remoting/SynchronousCloseTest.java        |  2 +-
 .../security/NettySecurityClientTest.java     |  4 +-
 .../ssl/CoreClientOverSSLTest.java            |  6 +--
 .../tests/integration/stomp/StompTest.java    |  4 +-
 .../netty/HornetQFrameDecoder2Test.java       |  2 +-
 tests/src/org/hornetq/tests/opt/SendTest.java |  6 +--
 .../tests/stress/remote/PingStressTest.java   |  2 +-
 .../tests/stress/stomp/StompStressTest.java   |  4 +-
 .../impl/netty/NettyAcceptorFactoryTest.java  |  4 +-
 .../impl/netty/NettyAcceptorTest.java         |  4 +-
 .../impl/netty/NettyConnectionTest.java       |  2 +-
 .../impl/netty/NettyConnectorTest.java        |  2 +-
 .../tests/unit/ra/ResourceAdapterTest.java    |  2 +-
 .../org/hornetq/tests/util/JMSTestBase.java   |  4 +-
 .../hornetq/tests/util/ServiceTestBase.java   |  4 +-
 .../org/hornetq/tests/util/UnitTestCase.java  |  4 +-
 208 files changed, 404 insertions(+), 475 deletions(-)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/HornetQChannelHandler.java (98%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/HornetQFrameDecoder.java (97%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/HornetQFrameDecoder2.java (99%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/HttpAcceptorHandler.java (99%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/HttpKeepAliveRunnable.java (97%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/NettyAcceptor.java (99%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/NettyAcceptorFactory.java (97%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/NettyConnection.java (99%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/NettyConnector.java (99%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/NettyConnectorFactory.java (97%)
 rename src/main/org/hornetq/{integration/transports => core/remoting/impl}/netty/TransportConstants.java (99%)

diff --git a/build-hornetq.xml b/build-hornetq.xml
index 8b560dc82a9..bd025e35c2d 100644
--- a/build-hornetq.xml
+++ b/build-hornetq.xml
@@ -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"/>
  	  <!-- we must include Apache commons logging   -->
  	  <!-- as a transitive dependency from JBoss TM -->
  	  <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"/>
 	  <!-- we must include Apache commons logging   -->
 	  <!-- as a transitive dependency from JBoss TM -->
    	  <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}"/>
@@ -1041,10 +999,6 @@
          <param name="artifact.name" value="hornetq-core-client"/>
       </antcall>
 
-      <antcall target="artifact">
-         <param name="artifact.name" value="hornetq-transports"/>
-      </antcall>
-
       <antcall target="artifact">
          <param name="artifact.name" value="hornetq-jms"/>
       </antcall>
diff --git a/build-maven.xml b/build-maven.xml
index d146becd385..e552d7c7d03 100644
--- a/build-maven.xml
+++ b/build-maven.xml
@@ -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">
diff --git a/docs/user-manual/en/appserver-integration.xml b/docs/user-manual/en/appserver-integration.xml
index c244b0ba3fc..fd95ffb8f75 100644
--- a/docs/user-manual/en/appserver-integration.xml
+++ b/docs/user-manual/en/appserver-integration.xml
@@ -609,7 +609,7 @@ public class MDBMessageSendTxExample implements MessageListener
       &lt;config-property name="SessionDefaultType" type="String">javax.jms.Topic
       &lt;/config-property>
       &lt;config-property name="ConnectorClassName" type="String">
-        org.hornetq.integration.transports.netty.NettyConnectorFactory
+        org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
       &lt;/config-property>
       &lt;config-property name="ConnectionParameters" type="String">
           port=5445&lt;/config-property>
@@ -691,7 +691,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
                         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 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
                 <para>If it is now configured with a netty acceptor on a non-default port:</para>
                 <programlisting>
 &lt;acceptor name="netty">
-    &lt;factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class>
+    &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
     &lt;param key="port" value="8888"/>
 &lt;/acceptor>
                 </programlisting>
@@ -737,7 +737,7 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
                         >conf/jbossts-properties.xml</literal> is:</para>
                 <programlisting>
 &lt;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 @@ initialContext = new InitialContext(jndiParameters);</programlisting>
                     configuration would have been:</para>
                 <programlisting>
                     &lt;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>
diff --git a/docs/user-manual/en/client-classpath.xml b/docs/user-manual/en/client-classpath.xml
index 951a4f4026d..41bc44d4484 100644
--- a/docs/user-manual/en/client-classpath.xml
+++ b/docs/user-manual/en/client-classpath.xml
@@ -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>
diff --git a/docs/user-manual/en/configuring-transports.xml b/docs/user-manual/en/configuring-transports.xml
index 54c0e61c1f2..e06e52652ea 100644
--- a/docs/user-manual/en/configuring-transports.xml
+++ b/docs/user-manual/en/configuring-transports.xml
@@ -33,7 +33,7 @@
 &lt;acceptors&gt;                
     &lt;acceptor name="netty"&gt;
         &lt;factory-class&gt;
-org.hornetq.integration.transports.netty.NettyAcceptorFactory
+org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
         &lt;/factory-class&gt;
         &lt;param key="port" value="5446"/&gt;
     &lt;/acceptor&gt;
@@ -71,7 +71,7 @@ org.hornetq.integration.transports.netty.NettyAcceptorFactory
 &lt;connectors&gt;
     &lt;connector name="netty"&gt;
         &lt;factory-class&gt;
-            org.hornetq.integration.transports.netty.NettyConnectorFactory
+            org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
         &lt;/factory-class&gt;
         &lt;param key="port" value="5446"/&gt;
     &lt;/connector&gt;
@@ -130,12 +130,12 @@ org.hornetq.integration.transports.netty.NettyAcceptorFactory
         <programlisting>
 Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
     
-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 @@ etc
         <programlisting>
 Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
 
-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 @@ etc
                 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 @@ etc
 
       &lt;acceptor name="netty-invm">
          &lt;factory-class>
-            org.hornetq.integration.transports.netty.NettyAcceptorFactory
+            org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory
          &lt;/factory-class>
          &lt;param key="use-invm" value="true"/>
          &lt;param key="host" value="org.hornetq"/>
@@ -389,7 +389,7 @@ etc
 
       &lt;connector name="netty-servlet">
          &lt;factory-class>
-            org.hornetq.integration.transports.netty.NettyConnectorFactory
+            org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
          &lt;/factory-class>
          &lt;param key="host" value="localhost"/>
          &lt;param key="port" value="8080"/>
@@ -415,7 +415,7 @@ etc
             <para>Its also possible to use the servlet transport over SSL. simply add the following
                 configuration to the
                 connector:<programlisting>    &lt;connector name="netty-servlet">
-         &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class>
+         &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
          &lt;param key="host" value="localhost"/>
          &lt;param key="port" value="8443"/>
          &lt;param key="use-servlet" value="true"/>
diff --git a/docs/user-manual/en/ha.xml b/docs/user-manual/en/ha.xml
index a40362d479a..92767153168 100644
--- a/docs/user-manual/en/ha.xml
+++ b/docs/user-manual/en/ha.xml
@@ -84,7 +84,7 @@
      &lt;!-- This connector specifies how to connect to the backup server    -->
      &lt;!-- backup server is located on host "192.168.0.11" and port "5445" -->
      &lt;connector name="backup-connector">
-       &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class>
+       &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
        &lt;param key="host" value="192.168.0.11"/>
        &lt;param key="port" value="5445"/>
      &lt;/connector>
@@ -99,7 +99,7 @@
   
   &lt;acceptors>
      &lt;acceptor name="acceptor">
-        &lt;factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class>
+        &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
         &lt;param key="host" value="192.168.0.11"/>
         &lt;param key="port" value="5445"/>
      &lt;/acceptor>
diff --git a/docs/user-manual/en/interoperability.xml b/docs/user-manual/en/interoperability.xml
index d44580aa3f8..50752f6c562 100644
--- a/docs/user-manual/en/interoperability.xml
+++ b/docs/user-manual/en/interoperability.xml
@@ -31,7 +31,7 @@
             parameter set to <literal>stomp</literal>:</para>
 <programlisting>
 	&lt;acceptor name="stomp-acceptor">
-		&lt;factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class>
+		&lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
 		&lt;param key="protocol"  value="stomp"/>
 		&lt;param key="port"  value="61613"/>
 	&lt;/acceptor>
diff --git a/docs/user-manual/en/using-server.xml b/docs/user-manual/en/using-server.xml
index 8a453b7259d..c5b5b14afe8 100644
--- a/docs/user-manual/en/using-server.xml
+++ b/docs/user-manual/en/using-server.xml
@@ -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>&lt;connector name="netty">
-         &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory
+         &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory
            &lt;/factory-class>
          &lt;param key="host"  value="${hornetq.remoting.netty.host:localhost}" type="String"/>
          &lt;param key="port"  value="${hornetq.remoting.netty.port:5445}" type="Integer"/>
diff --git a/examples/common/build.xml b/examples/common/build.xml
index 2b844a43b76..0b8bfbe098d 100644
--- a/examples/common/build.xml
+++ b/examples/common/build.xml
@@ -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"/>
diff --git a/examples/core/embedded-remote/build.xml b/examples/core/embedded-remote/build.xml
index f3cf2be97d3..c5984e5a8d6 100644
--- a/examples/core/embedded-remote/build.xml
+++ b/examples/core/embedded-remote/build.xml
@@ -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"/>
diff --git a/examples/core/embedded-remote/readme.html b/examples/core/embedded-remote/readme.html
index 7f347eba5e2..61ad376634f 100644
--- a/examples/core/embedded-remote/readme.html
+++ b/examples/core/embedded-remote/readme.html
@@ -13,7 +13,6 @@ <h1>Embedded Example</h1>
      
      <ol>
        <li>hornetq-core.jar</li>
-       <li>hornetq-transports.jar</li>
        <li>netty.jar</li>
      </ol>
 
@@ -21,7 +20,6 @@ <h1>Embedded Example</h1>
      
      <ol>
        <li>hornetq-core-client.jar</li>
-       <li>hornetq-transports.jar</li>
        <li>netty.jar</li>
      </ol>
      
diff --git a/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java
index 681f4bad7cb..4fb06ef62dc 100644
--- a/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java
@@ -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;
 
 /**
  * 
diff --git a/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java
index d2844ca9a66..494ab5c7f17 100644
--- a/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java
+++ b/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java
@@ -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
diff --git a/examples/core/embedded/build.xml b/examples/core/embedded/build.xml
index b3d534f3594..6e2c4c972b3 100644
--- a/examples/core/embedded/build.xml
+++ b/examples/core/embedded/build.xml
@@ -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"/>
diff --git a/examples/core/embedded/readme.html b/examples/core/embedded/readme.html
index 816852f7326..91bfe297539 100644
--- a/examples/core/embedded/readme.html
+++ b/examples/core/embedded/readme.html
@@ -10,10 +10,9 @@ <h1>Embedded Example</h1>
 
      <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>
      
diff --git a/examples/core/microcontainer/build.xml b/examples/core/microcontainer/build.xml
index 5fcd3331178..e82706a18ec 100644
--- a/examples/core/microcontainer/build.xml
+++ b/examples/core/microcontainer/build.xml
@@ -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>
diff --git a/examples/core/microcontainer/server0/hornetq-configuration.xml b/examples/core/microcontainer/server0/hornetq-configuration.xml
index f06d5a19e4a..4f3b659ba9e 100644
--- a/examples/core/microcontainer/server0/hornetq-configuration.xml
+++ b/examples/core/microcontainer/server0/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Acceptors -->
    <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"/>
diff --git a/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java b/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java
index 64bedc2b0ee..7fa75538b0a 100644
--- a/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java
+++ b/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java
@@ -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;
 
 /**
  * 
diff --git a/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml
index f7af716d513..9c016e0fafb 100644
--- a/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml
@@ -6,7 +6,7 @@
    <!-- Acceptors -->
    <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"/>
diff --git a/examples/core/perf/server0/hornetq-configuration.xml b/examples/core/perf/server0/hornetq-configuration.xml
index 8b37cf58114..5d390d82937 100644
--- a/examples/core/perf/server0/hornetq-configuration.xml
+++ b/examples/core/perf/server0/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Acceptors -->
    <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"/>
diff --git a/examples/core/perf/src/org/hornetq/core/example/PerfBase.java b/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
index 48881f045f5..3d901bcb22d 100644
--- a/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
+++ b/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
@@ -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;
 
diff --git a/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml b/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
index 8dc82fe3025..4cb150a1b46 100644
--- a/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
+++ b/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
 
diff --git a/examples/javaee/jca-config/readme.html b/examples/javaee/jca-config/readme.html
index 78b65197acb..0878bafac77 100644
--- a/examples/javaee/jca-config/readme.html
+++ b/examples/javaee/jca-config/readme.html
@@ -29,7 +29,7 @@ <h2>MDB Properties</h2>
                         @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 @@ <h2>Connection Factory Properties</h2>
       &lt;rar-name&gt;jms-ra.rar&lt;/rar-name&gt;
       &lt;connection-definition&gt;org.hornetq.ra.HornetQRAConnectionFactory&lt;/connection-definition&gt;
       &lt;config-property name="SessionDefaultType" type="java.lang.String"&gt;javax.jms.Topic&lt;/config-property&gt;
-      &lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/config-property&gt;
+      &lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property&gt;
       &lt;config-property name="ConnectionParameters" type="java.lang.String"&gt;hornetq.remoting.netty.port=5545&lt;/config-property&gt;
       &lt;max-pool-size>20&lt;/max-pool-size&gt;
    &lt;/tx-connection-factory&gt;
diff --git a/examples/javaee/jca-config/server/hornetq-configuration.xml b/examples/javaee/jca-config/server/hornetq-configuration.xml
index 9eedc6e6833..2bb6b91051e 100644
--- a/examples/javaee/jca-config/server/hornetq-configuration.xml
+++ b/examples/javaee/jca-config/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/jca-config/server2/hornetq-configuration.xml b/examples/javaee/jca-config/server2/hornetq-configuration.xml
index 937929b6f16..eef27efd393 100644
--- a/examples/javaee/jca-config/server2/hornetq-configuration.xml
+++ b/examples/javaee/jca-config/server2/hornetq-configuration.xml
@@ -21,7 +21,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/jca-config/server2/jms-remote-ds.xml b/examples/javaee/jca-config/server2/jms-remote-ds.xml
index d8660ab9792..e112d3b9624 100644
--- a/examples/javaee/jca-config/server2/jms-remote-ds.xml
+++ b/examples/javaee/jca-config/server2/jms-remote-ds.xml
@@ -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>
diff --git a/examples/javaee/jca-config/server2/ra.xml b/examples/javaee/jca-config/server2/ra.xml
index f461002cdf3..ccec342ef58 100644
--- a/examples/javaee/jca-config/server2/ra.xml
+++ b/examples/javaee/jca-config/server2/ra.xml
@@ -39,7 +39,7 @@ Copyright 2009 Red Hat, Inc.
          <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>
diff --git a/examples/javaee/jms-bridge/server/hornetq-configuration.xml b/examples/javaee/jms-bridge/server/hornetq-configuration.xml
index 13109a3ab61..d1bfbc6e9a3 100644
--- a/examples/javaee/jms-bridge/server/hornetq-configuration.xml
+++ b/examples/javaee/jms-bridge/server/hornetq-configuration.xml
@@ -5,7 +5,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
 
diff --git a/examples/javaee/mdb-bmt/server/hornetq-configuration.xml b/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml b/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml b/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml b/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml b/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml b/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml b/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
index d687e17ccbf..da966d65323 100644
--- a/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
+++ b/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
diff --git a/examples/javaee/servlet-ssl/server/hornetq-configuration.xml b/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
index 2630ff9bd2d..b39c73c131f 100644
--- a/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
+++ b/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
@@ -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>
diff --git a/examples/javaee/servlet-transport/server/hornetq-configuration.xml b/examples/javaee/servlet-transport/server/hornetq-configuration.xml
index cde3b0d6e73..27ad2eb3b48 100644
--- a/examples/javaee/servlet-transport/server/hornetq-configuration.xml
+++ b/examples/javaee/servlet-transport/server/hornetq-configuration.xml
@@ -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>
diff --git a/examples/javaee/xarecovery/server/hornetq-configuration.xml b/examples/javaee/xarecovery/server/hornetq-configuration.xml
index 48dfc35c42a..a592af937bd 100644
--- a/examples/javaee/xarecovery/server/hornetq-configuration.xml
+++ b/examples/javaee/xarecovery/server/hornetq-configuration.xml
@@ -13,7 +13,7 @@
    <!-- Connectors -->
    <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 @@
 
       <!-- Netty TCP Acceptor -->
       <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>
 
diff --git a/examples/jms/applet/applet.html b/examples/jms/applet/applet.html
index 82fcc9fffd1..f7b7b803808 100644
--- a/examples/jms/applet/applet.html
+++ b/examples/jms/applet/applet.html
@@ -11,7 +11,7 @@ <h1>HornetQ Applet Example</h1>
      
      <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
diff --git a/examples/jms/applet/build.xml b/examples/jms/applet/build.xml
index 738c2a46107..25713379f55 100644
--- a/examples/jms/applet/build.xml
+++ b/examples/jms/applet/build.xml
@@ -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>
diff --git a/examples/jms/applet/server0/hornetq-configuration.xml b/examples/jms/applet/server0/hornetq-configuration.xml
index 1c81b07e557..373eb33adae 100644
--- a/examples/jms/applet/server0/hornetq-configuration.xml
+++ b/examples/jms/applet/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java b/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java
index de4fe60b67d..a5fd9812d26 100644
--- a/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java
+++ b/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java
@@ -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
diff --git a/examples/jms/application-layer-failover/server0/hornetq-configuration.xml b/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
index b73146c2d00..fa87cee5501 100644
--- a/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
+++ b/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
@@ -5,7 +5,7 @@
    <!-- Connectors -->
    <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>
diff --git a/examples/jms/application-layer-failover/server1/hornetq-configuration.xml b/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
index 09bda87c5fb..0e11193f54f 100644
--- a/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
+++ b/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/bridge/server0/hornetq-configuration.xml b/examples/jms/bridge/server0/hornetq-configuration.xml
index c6db1a4c653..5ead90a7aff 100644
--- a/examples/jms/bridge/server0/hornetq-configuration.xml
+++ b/examples/jms/bridge/server0/hornetq-configuration.xml
@@ -5,13 +5,13 @@
    <!-- Connectors -->
    <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 to the other node -->
       <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 -->     
    <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>
diff --git a/examples/jms/bridge/server1/hornetq-configuration.xml b/examples/jms/bridge/server1/hornetq-configuration.xml
index 42d0844bf25..5903ef8c728 100644
--- a/examples/jms/bridge/server1/hornetq-configuration.xml
+++ b/examples/jms/bridge/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/browser/server0/hornetq-configuration.xml b/examples/jms/browser/server0/hornetq-configuration.xml
index b00133d3d11..7ec19221fe7 100644
--- a/examples/jms/browser/server0/hornetq-configuration.xml
+++ b/examples/jms/browser/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/client-kickoff/server0/hornetq-configuration.xml b/examples/jms/client-kickoff/server0/hornetq-configuration.xml
index c8362b7656a..44073078805 100644
--- a/examples/jms/client-kickoff/server0/hornetq-configuration.xml
+++ b/examples/jms/client-kickoff/server0/hornetq-configuration.xml
@@ -7,14 +7,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
index 61b6cb256b1..a9ec7ca28d8 100644
--- a/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
index 17303818426..2d91006cbe7 100644
--- a/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
index b3d197c09c7..5df42191461 100644
--- a/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
index 706c39ede0e..90c20fddf0f 100644
--- a/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
index b9504263e83..dba68987785 100644
--- a/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-grouping/server0/hornetq-configuration.xml b/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
index 5b0019af9e8..ea047a2911c 100644
--- a/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/clustered-grouping/server1/hornetq-configuration.xml b/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
index 23257bc41fd..99949c19310 100644
--- a/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-grouping/server2/hornetq-configuration.xml b/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
index a9dec5437ac..b77a2656535 100644
--- a/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
+++ b/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-queue/server0/hornetq-configuration.xml b/examples/jms/clustered-queue/server0/hornetq-configuration.xml
index 342417ff599..1a524dddcdc 100644
--- a/examples/jms/clustered-queue/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/clustered-queue/server1/hornetq-configuration.xml b/examples/jms/clustered-queue/server1/hornetq-configuration.xml
index 6bd03645847..39b294cc088 100644
--- a/examples/jms/clustered-queue/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-queue/server1/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/clustered-topic/server0/hornetq-configuration.xml b/examples/jms/clustered-topic/server0/hornetq-configuration.xml
index fef113a4ba7..0e085fe2a95 100644
--- a/examples/jms/clustered-topic/server0/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/clustered-topic/server1/hornetq-configuration.xml b/examples/jms/clustered-topic/server1/hornetq-configuration.xml
index 0ce888b2599..43b3ae4f341 100644
--- a/examples/jms/clustered-topic/server1/hornetq-configuration.xml
+++ b/examples/jms/clustered-topic/server1/hornetq-configuration.xml
@@ -6,7 +6,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml b/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
index 70b03331c00..ac627ead2e1 100644
--- a/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/dead-letter/server0/hornetq-configuration.xml b/examples/jms/dead-letter/server0/hornetq-configuration.xml
index 26639fcf54b..14acaafed2c 100644
--- a/examples/jms/dead-letter/server0/hornetq-configuration.xml
+++ b/examples/jms/dead-letter/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml b/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
index 1f2fb2eb9b8..edf3b0afade 100644
--- a/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
+++ b/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/divert/server0/hornetq-configuration.xml b/examples/jms/divert/server0/hornetq-configuration.xml
index 6b325c2305f..b627110cd02 100644
--- a/examples/jms/divert/server0/hornetq-configuration.xml
+++ b/examples/jms/divert/server0/hornetq-configuration.xml
@@ -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>
    
       <!-- This connector corresponds to the New York server -->
       
       <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>
diff --git a/examples/jms/divert/server1/hornetq-configuration.xml b/examples/jms/divert/server1/hornetq-configuration.xml
index 4ba6d39adfa..9a0fdd14bb2 100644
--- a/examples/jms/divert/server1/hornetq-configuration.xml
+++ b/examples/jms/divert/server1/hornetq-configuration.xml
@@ -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>
diff --git a/examples/jms/durable-subscription/server0/hornetq-configuration.xml b/examples/jms/durable-subscription/server0/hornetq-configuration.xml
index 52f57f8f317..06a497805ef 100644
--- a/examples/jms/durable-subscription/server0/hornetq-configuration.xml
+++ b/examples/jms/durable-subscription/server0/hornetq-configuration.xml
@@ -5,7 +5,7 @@
    <!-- Connectors -->
    <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>
diff --git a/examples/jms/embedded/build.xml b/examples/jms/embedded/build.xml
index 7bd04dac8ff..3023cb61ffd 100644
--- a/examples/jms/embedded/build.xml
+++ b/examples/jms/embedded/build.xml
@@ -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}">
diff --git a/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
index ed9e68df14f..6a64b227a38 100644
--- a/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
@@ -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;
diff --git a/examples/jms/expiry/server0/hornetq-configuration.xml b/examples/jms/expiry/server0/hornetq-configuration.xml
index c6921922345..526c55b19f9 100644
--- a/examples/jms/expiry/server0/hornetq-configuration.xml
+++ b/examples/jms/expiry/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/http-transport/readme.html b/examples/jms/http-transport/readme.html
index 0fd71d00c5e..5c416eeee0d 100644
--- a/examples/jms/http-transport/readme.html
+++ b/examples/jms/http-transport/readme.html
@@ -19,7 +19,7 @@ <h1>JMS HTTP Example</h1>
       <pre class="prettyprint">
       <code>
       &lt;connector name=&quot;netty-connector&quot;&gt;
-         &lt;factory-class&gt;org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.http-enabled&quot; value=&quot;true&quot; type=&quot;Boolean&quot;/&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;8080&quot; type=&quot;Integer&quot;/&gt;
       &lt;/connector&gt;
@@ -27,7 +27,7 @@ <h1>JMS HTTP Example</h1>
       &lt;!-- Acceptors --&gt;
 
       &lt;acceptor name=&quot;netty-acceptor&quot;&gt;
-         &lt;factory-class&gt;org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.http-enabled&quot; value=&quot;true&quot; type=&quot;Boolean&quot;/&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;8080&quot; type=&quot;Integer&quot;/&gt;
       &lt;/acceptor&gt;
diff --git a/examples/jms/http-transport/server0/hornetq-configuration.xml b/examples/jms/http-transport/server0/hornetq-configuration.xml
index dfa9ec3d9ad..e5be2deab4b 100644
--- a/examples/jms/http-transport/server0/hornetq-configuration.xml
+++ b/examples/jms/http-transport/server0/hornetq-configuration.xml
@@ -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>
diff --git a/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml b/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
index d09578fc441..a9d015eab2b 100644
--- a/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java b/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java
index c2ccc5a4bd6..73ef15c5ad1 100644
--- a/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java
+++ b/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java
@@ -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;
 
 /**
  * 
diff --git a/examples/jms/interceptor/server0/hornetq-configuration.xml b/examples/jms/interceptor/server0/hornetq-configuration.xml
index 535d206a470..dddddb3cb2d 100644
--- a/examples/jms/interceptor/server0/hornetq-configuration.xml
+++ b/examples/jms/interceptor/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/jaas/server0/hornetq-configuration.xml b/examples/jms/jaas/server0/hornetq-configuration.xml
index 87f0f5966df..b746a2c0508 100644
--- a/examples/jms/jaas/server0/hornetq-configuration.xml
+++ b/examples/jms/jaas/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/jms-bridge/build.xml b/examples/jms/jms-bridge/build.xml
index 2a5775d9cb6..144227d8f8b 100644
--- a/examples/jms/jms-bridge/build.xml
+++ b/examples/jms/jms-bridge/build.xml
@@ -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}">
diff --git a/examples/jms/jms-bridge/readme.html b/examples/jms/jms-bridge/readme.html
index 560badd6c0a..5520a232e74 100644
--- a/examples/jms/jms-bridge/readme.html
+++ b/examples/jms/jms-bridge/readme.html
@@ -69,7 +69,7 @@ <h3>Source Server Configuration</h3>
      <pre class="prettyprint">
         &lt;connectors>
            &lt;connector name="netty">
-              &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class>
+              &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
               &lt;!-- **************************************** -->
               &lt;!-- Replace with the *source* server address -->
               &lt;!-- **************************************** -->
@@ -106,7 +106,7 @@ <h3>Target Server Configuration</h3>
      <pre class="prettyprint">
         &lt;connectors>
            &lt;connector name="netty">
-              &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class>
+              &lt;factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
               &lt;!-- **************************************** -->
               &lt;!-- Replace with the *target* server address -->
               &lt;!-- **************************************** -->
diff --git a/examples/jms/jms-bridge/server0/hornetq-configuration.xml b/examples/jms/jms-bridge/server0/hornetq-configuration.xml
index 634ffd15e08..28490330dcc 100644
--- a/examples/jms/jms-bridge/server0/hornetq-configuration.xml
+++ b/examples/jms/jms-bridge/server0/hornetq-configuration.xml
@@ -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>
          <!-- **************************************** -->
          <!-- Replace with the *source* server address -->
          <!-- **************************************** -->
@@ -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>
          <!-- the server accepts connections on all the server addresses -->
          <param key="host" value="0.0.0.0"/>
       </acceptor>
diff --git a/examples/jms/jms-bridge/server1/hornetq-configuration.xml b/examples/jms/jms-bridge/server1/hornetq-configuration.xml
index d7f94f53ab1..07d1247838f 100644
--- a/examples/jms/jms-bridge/server1/hornetq-configuration.xml
+++ b/examples/jms/jms-bridge/server1/hornetq-configuration.xml
@@ -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>
          <!-- **************************************** -->
          <!-- Replace with the *target* server address -->
          <!-- **************************************** -->
@@ -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>
          <!-- the server accepts connections on all the server addresses -->
          <param key="host" value="0.0.0.0"/>
       </acceptor>
diff --git a/examples/jms/jmx/server0/hornetq-configuration.xml b/examples/jms/jmx/server0/hornetq-configuration.xml
index e09c719993c..b32b05a70f0 100644
--- a/examples/jms/jmx/server0/hornetq-configuration.xml
+++ b/examples/jms/jmx/server0/hornetq-configuration.xml
@@ -8,14 +8,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/large-message/server0/hornetq-configuration.xml b/examples/jms/large-message/server0/hornetq-configuration.xml
index 3b71bf9166b..3a2872ac383 100644
--- a/examples/jms/large-message/server0/hornetq-configuration.xml
+++ b/examples/jms/large-message/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/last-value-queue/server0/hornetq-configuration.xml b/examples/jms/last-value-queue/server0/hornetq-configuration.xml
index 1535c634d34..bc84485c2c8 100644
--- a/examples/jms/last-value-queue/server0/hornetq-configuration.xml
+++ b/examples/jms/last-value-queue/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/management-notifications/server0/hornetq-configuration.xml b/examples/jms/management-notifications/server0/hornetq-configuration.xml
index 1fe0a70ea4b..27f41d56100 100644
--- a/examples/jms/management-notifications/server0/hornetq-configuration.xml
+++ b/examples/jms/management-notifications/server0/hornetq-configuration.xml
@@ -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>
    
    <!-- Netty standard TCP acceptor -->
    <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>
 
diff --git a/examples/jms/management/server0/hornetq-configuration.xml b/examples/jms/management/server0/hornetq-configuration.xml
index b4e805a2d52..290e036061a 100644
--- a/examples/jms/management/server0/hornetq-configuration.xml
+++ b/examples/jms/management/server0/hornetq-configuration.xml
@@ -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>
    
    <!-- Netty standard TCP acceptor -->
    <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>
 
diff --git a/examples/jms/message-counters/server0/hornetq-configuration.xml b/examples/jms/message-counters/server0/hornetq-configuration.xml
index 89ab89ae4aa..3be2b2301cf 100644
--- a/examples/jms/message-counters/server0/hornetq-configuration.xml
+++ b/examples/jms/message-counters/server0/hornetq-configuration.xml
@@ -10,14 +10,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/message-group/server0/hornetq-configuration.xml b/examples/jms/message-group/server0/hornetq-configuration.xml
index 3b71bf9166b..3a2872ac383 100644
--- a/examples/jms/message-group/server0/hornetq-configuration.xml
+++ b/examples/jms/message-group/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/message-group2/server0/hornetq-configuration.xml b/examples/jms/message-group2/server0/hornetq-configuration.xml
index 3b71bf9166b..3a2872ac383 100644
--- a/examples/jms/message-group2/server0/hornetq-configuration.xml
+++ b/examples/jms/message-group2/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/message-priority/server0/hornetq-configuration.xml b/examples/jms/message-priority/server0/hornetq-configuration.xml
index 3b71bf9166b..3a2872ac383 100644
--- a/examples/jms/message-priority/server0/hornetq-configuration.xml
+++ b/examples/jms/message-priority/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml b/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
index 87f0f5966df..b746a2c0508 100644
--- a/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
+++ b/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml b/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
index 117e0679892..f6ae658ef9f 100644
--- a/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
+++ b/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml b/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
index f12d37c02c3..af69267fceb 100644
--- a/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
+++ b/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/paging/server0/hornetq-configuration.xml b/examples/jms/paging/server0/hornetq-configuration.xml
index d69d61a869f..e9628b2fd93 100644
--- a/examples/jms/paging/server0/hornetq-configuration.xml
+++ b/examples/jms/paging/server0/hornetq-configuration.xml
@@ -5,7 +5,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml
index f7af716d513..9c016e0fafb 100644
--- a/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml
@@ -6,7 +6,7 @@
    <!-- Acceptors -->
    <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"/>
diff --git a/examples/jms/perf/server0/hornetq-configuration.xml b/examples/jms/perf/server0/hornetq-configuration.xml
index 51223c47165..60d19c5beca 100644
--- a/examples/jms/perf/server0/hornetq-configuration.xml
+++ b/examples/jms/perf/server0/hornetq-configuration.xml
@@ -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 -->
    <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"/>
diff --git a/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml b/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
index dca530abfd9..97a4709e3a7 100644
--- a/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
+++ b/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml b/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
index 53400afd0a0..4b0e0c41d3b 100644
--- a/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
+++ b/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
index f9bff6544c7..4374edddb53 100644
--- a/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
index 8b7d7bde672..4022285e8a3 100644
--- a/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/queue-requestor/server0/hornetq-configuration.xml b/examples/jms/queue-requestor/server0/hornetq-configuration.xml
index 0a228a8e95b..1375daf5f0c 100644
--- a/examples/jms/queue-requestor/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-requestor/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/queue-selector/server0/hornetq-configuration.xml b/examples/jms/queue-selector/server0/hornetq-configuration.xml
index f7dc89e471c..f91fcee99d8 100644
--- a/examples/jms/queue-selector/server0/hornetq-configuration.xml
+++ b/examples/jms/queue-selector/server0/hornetq-configuration.xml
@@ -4,14 +4,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/queue/server0/hornetq-configuration.xml b/examples/jms/queue/server0/hornetq-configuration.xml
index 018da7c1705..03d68c7eb2d 100644
--- a/examples/jms/queue/server0/hornetq-configuration.xml
+++ b/examples/jms/queue/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/reattach-node/server0/hornetq-configuration.xml b/examples/jms/reattach-node/server0/hornetq-configuration.xml
index 0ebdfef2b63..f32ccafb571 100644
--- a/examples/jms/reattach-node/server0/hornetq-configuration.xml
+++ b/examples/jms/reattach-node/server0/hornetq-configuration.xml
@@ -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>
       
       <!-- We just use this connector so we can send management operations while the other acceptor
       is stopped -->
      <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 -->
    <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>
 
       <!-- We just use this acceptor so we can send management operations while the other acceptor
       is stopped -->
       <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>
diff --git a/examples/jms/request-reply/server0/hornetq-configuration.xml b/examples/jms/request-reply/server0/hornetq-configuration.xml
index 3e97d2a9ab7..c98be142dfb 100644
--- a/examples/jms/request-reply/server0/hornetq-configuration.xml
+++ b/examples/jms/request-reply/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/scheduled-message/server0/hornetq-configuration.xml b/examples/jms/scheduled-message/server0/hornetq-configuration.xml
index 60cb705d4e0..3e95ea9fcc5 100644
--- a/examples/jms/scheduled-message/server0/hornetq-configuration.xml
+++ b/examples/jms/scheduled-message/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/security/server0/hornetq-configuration.xml b/examples/jms/security/server0/hornetq-configuration.xml
index a1da299befc..c06ed0ab5c7 100644
--- a/examples/jms/security/server0/hornetq-configuration.xml
+++ b/examples/jms/security/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml b/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
index 87f0f5966df..b746a2c0508 100644
--- a/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
+++ b/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/ssl-enabled/readme.html b/examples/jms/ssl-enabled/readme.html
index 736de8a30b1..63e2d19e962 100644
--- a/examples/jms/ssl-enabled/readme.html
+++ b/examples/jms/ssl-enabled/readme.html
@@ -19,7 +19,7 @@ <h1>JMS SSL Example</h1>
       &lt;!-- Connector --&gt;
 
       &lt;connector name=&quot;netty-ssl-connector&quot;&gt;
-         &lt;factory-class&gt;org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.host&quot; value=&quot;localhost&quot; type=&quot;String&quot;/&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;5500&quot; type=&quot;Integer&quot;/&gt;	                     
          &lt;param key=&quot;hornetq.remoting.netty.ssl-enabled&quot; value=&quot;true&quot; type=&quot;Boolean&quot;/&gt;
@@ -30,7 +30,7 @@ <h1>JMS SSL Example</h1>
       &lt;!-- Acceptor --&gt;
 
       &lt;acceptor name=&quot;netty-ssl-acceptor&quot;&gt;
-         &lt;factory-class&gt;org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class&gt;
+         &lt;factory-class&gt;org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class&gt;
          &lt;param key=&quot;hornetq.remoting.netty.host&quot; value=&quot;localhost&quot; type=&quot;String&quot;/&gt;
          &lt;param key=&quot;hornetq.remoting.netty.port&quot; value=&quot;5500&quot; type=&quot;Integer&quot;/&gt;	                     
          &lt;param key=&quot;hornetq.remoting.netty.ssl-enabled&quot; value=&quot;true&quot; type=&quot;Boolean&quot;/&gt;
diff --git a/examples/jms/ssl-enabled/server0/hornetq-configuration.xml b/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
index 4d7ee9c0e02..ee3ea4ae4ab 100644
--- a/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
+++ b/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
@@ -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 -->
    <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"/>
diff --git a/examples/jms/static-selector-jms/server0/hornetq-configuration.xml b/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
index 2905074a41b..119c84327bc 100644
--- a/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
+++ b/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/static-selector/server0/hornetq-configuration.xml b/examples/jms/static-selector/server0/hornetq-configuration.xml
index beff81f7e27..2abe5803f8f 100644
--- a/examples/jms/static-selector/server0/hornetq-configuration.xml
+++ b/examples/jms/static-selector/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/stomp/server0/hornetq-configuration.xml b/examples/jms/stomp/server0/hornetq-configuration.xml
index 34afc905a45..242bece2987 100644
--- a/examples/jms/stomp/server0/hornetq-configuration.xml
+++ b/examples/jms/stomp/server0/hornetq-configuration.xml
@@ -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>
       <!-- a regular Netty acceptor used by the JMS client -->
       <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>
       <!-- the stomp-acceptor is configured for the Stomp protocol and -->
       <!-- will listen on port 61613 (default Stomp port)              -->
       <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>
diff --git a/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
index 7ba2151eca8..af03ab14760 100644
--- a/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
index 9c77656c5a5..1a1f480dd71 100644
--- a/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
index d510eb906d6..48868ac43bb 100644
--- a/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
index 4576b1214cc..a1211af924d 100644
--- a/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
index 365e38671d8..144ffd0b82f 100644
--- a/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml b/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
index 125a98e33ff..e2dc3710175 100644
--- a/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
+++ b/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
@@ -7,7 +7,7 @@
    <!-- Connectors -->
    <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 -->
    <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>
diff --git a/examples/jms/temp-queue/server0/hornetq-configuration.xml b/examples/jms/temp-queue/server0/hornetq-configuration.xml
index 8926318803b..e272719f822 100644
--- a/examples/jms/temp-queue/server0/hornetq-configuration.xml
+++ b/examples/jms/temp-queue/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml b/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
index 42dee637c93..637bf3b4d57 100644
--- a/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
 
diff --git a/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
index 1c81b07e557..373eb33adae 100644
--- a/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
index 1c81b07e557..373eb33adae 100644
--- a/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
+++ b/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/topic/server0/hornetq-configuration.xml b/examples/jms/topic/server0/hornetq-configuration.xml
index 1c81b07e557..373eb33adae 100644
--- a/examples/jms/topic/server0/hornetq-configuration.xml
+++ b/examples/jms/topic/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/transaction-failover/server0/hornetq-configuration.xml b/examples/jms/transaction-failover/server0/hornetq-configuration.xml
index 117e0679892..f6ae658ef9f 100644
--- a/examples/jms/transaction-failover/server0/hornetq-configuration.xml
+++ b/examples/jms/transaction-failover/server0/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/transaction-failover/server1/hornetq-configuration.xml b/examples/jms/transaction-failover/server1/hornetq-configuration.xml
index f12d37c02c3..af69267fceb 100644
--- a/examples/jms/transaction-failover/server1/hornetq-configuration.xml
+++ b/examples/jms/transaction-failover/server1/hornetq-configuration.xml
@@ -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 -->
    <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>
diff --git a/examples/jms/transactional/server0/hornetq-configuration.xml b/examples/jms/transactional/server0/hornetq-configuration.xml
index 60cb705d4e0..3e95ea9fcc5 100644
--- a/examples/jms/transactional/server0/hornetq-configuration.xml
+++ b/examples/jms/transactional/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/xa-heuristic/server0/hornetq-configuration.xml b/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
index 60cb705d4e0..3e95ea9fcc5 100644
--- a/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/xa-receive/server0/hornetq-configuration.xml b/examples/jms/xa-receive/server0/hornetq-configuration.xml
index 60cb705d4e0..3e95ea9fcc5 100644
--- a/examples/jms/xa-receive/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-receive/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/xa-send/server0/hornetq-configuration.xml b/examples/jms/xa-send/server0/hornetq-configuration.xml
index 5d0565a4d86..15e933aafab 100644
--- a/examples/jms/xa-send/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-send/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/jms/xa-with-jta/server0/hornetq-configuration.xml b/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
index c87eda64cd1..2f0aa12ff12 100644
--- a/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
+++ b/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
@@ -5,14 +5,14 @@
    <!-- Connectors -->
    <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 -->
    <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>
 
diff --git a/examples/soak/normal/server0/hornetq-configuration.xml b/examples/soak/normal/server0/hornetq-configuration.xml
index 58f403723dc..da4e1afe700 100644
--- a/examples/soak/normal/server0/hornetq-configuration.xml
+++ b/examples/soak/normal/server0/hornetq-configuration.xml
@@ -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 -->
    <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"/>
diff --git a/src/config/jboss-as/build-as4.xml b/src/config/jboss-as/build-as4.xml
index 0b693d3cf40..11231f6609d 100644
--- a/src/config/jboss-as/build-as4.xml
+++ b/src/config/jboss-as/build-as4.xml
@@ -89,7 +89,6 @@ Copyright 2009 Red Hat, Inc.
       <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>
diff --git a/src/config/jboss-as/clustered/hornetq-configuration.xml b/src/config/jboss-as/clustered/hornetq-configuration.xml
index c1ca36707e0..adb7799e2c7 100644
--- a/src/config/jboss-as/clustered/hornetq-configuration.xml
+++ b/src/config/jboss-as/clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/config/jboss-as/clustered/jboss-as-4/ra.xml b/src/config/jboss-as/clustered/jboss-as-4/ra.xml
index 2cf37d61aa7..d72655b119d 100644
--- a/src/config/jboss-as/clustered/jboss-as-4/ra.xml
+++ b/src/config/jboss-as/clustered/jboss-as-4/ra.xml
@@ -37,7 +37,7 @@ Copyright 2009 Red Hat, Inc.
          <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>
diff --git a/src/config/jboss-as/non-clustered/hornetq-configuration.xml b/src/config/jboss-as/non-clustered/hornetq-configuration.xml
index 0e2cfe6f7bd..a1f7456e09d 100644
--- a/src/config/jboss-as/non-clustered/hornetq-configuration.xml
+++ b/src/config/jboss-as/non-clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml b/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml
index a93049b803c..96b71cd4b0f 100644
--- a/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml
+++ b/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml
@@ -37,7 +37,7 @@ Copyright 2009 Red Hat, Inc.
          <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>
diff --git a/src/config/stand-alone/clustered/hornetq-configuration.xml b/src/config/stand-alone/clustered/hornetq-configuration.xml
index 228b7135bee..6ac5e379113 100644
--- a/src/config/stand-alone/clustered/hornetq-configuration.xml
+++ b/src/config/stand-alone/clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/config/stand-alone/non-clustered/hornetq-configuration.xml b/src/config/stand-alone/non-clustered/hornetq-configuration.xml
index 0eb642aed91..eacdc204989 100644
--- a/src/config/stand-alone/non-clustered/hornetq-configuration.xml
+++ b/src/config/stand-alone/non-clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/config/trunk/clustered/hornetq-configuration.xml b/src/config/trunk/clustered/hornetq-configuration.xml
index 554db3e8354..950a946785f 100644
--- a/src/config/trunk/clustered/hornetq-configuration.xml
+++ b/src/config/trunk/clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/config/trunk/non-clustered/hornetq-configuration.xml b/src/config/trunk/non-clustered/hornetq-configuration.xml
index 610c382d737..9f5a87cfeed 100644
--- a/src/config/trunk/non-clustered/hornetq-configuration.xml
+++ b/src/config/trunk/non-clustered/hornetq-configuration.xml
@@ -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"/>
diff --git a/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java b/src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java
similarity index 98%
rename from src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java
rename to src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java
index f1a87f65277..5a60e9809dd 100644
--- a/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/HornetQChannelHandler.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder.java b/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java
similarity index 97%
rename from src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder.java
rename to src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java
index 2b7b4d4f689..afa313db0a8 100644
--- a/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java b/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
rename to src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java
index 95194de5447..cc60c8c2d5d 100644
--- a/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/HornetQFrameDecoder2.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java b/src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
rename to src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java
index 466ace9d730..c5a74786b2a 100644
--- a/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/HttpAcceptorHandler.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/HttpKeepAliveRunnable.java b/src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
similarity index 97%
rename from src/main/org/hornetq/integration/transports/netty/HttpKeepAliveRunnable.java
rename to src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
index f0d979f1732..cb10bf97414 100644
--- a/src/main/org/hornetq/integration/transports/netty/HttpKeepAliveRunnable.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/HttpKeepAliveRunnable.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java b/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
rename to src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java
index 3b8f13bb437..7a4729d7e77 100644
--- a/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/NettyAcceptorFactory.java b/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java
similarity index 97%
rename from src/main/org/hornetq/integration/transports/netty/NettyAcceptorFactory.java
rename to src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java
index 40bffbc0659..d1abac2ad7f 100644
--- a/src/main/org/hornetq/integration/transports/netty/NettyAcceptorFactory.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptorFactory.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/NettyConnection.java b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/NettyConnection.java
rename to src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java
index 843b2bd57f4..c43501a718b 100644
--- a/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnection.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/NettyConnector.java b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/NettyConnector.java
rename to src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java
index b57e310e20e..049ad3aa418 100644
--- a/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/NettyConnectorFactory.java b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java
similarity index 97%
rename from src/main/org/hornetq/integration/transports/netty/NettyConnectorFactory.java
rename to src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java
index 4a96545d3ae..aa0dbb1bd3b 100644
--- a/src/main/org/hornetq/integration/transports/netty/NettyConnectorFactory.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/NettyConnectorFactory.java
@@ -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;
diff --git a/src/main/org/hornetq/integration/transports/netty/TransportConstants.java b/src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java
similarity index 99%
rename from src/main/org/hornetq/integration/transports/netty/TransportConstants.java
rename to src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java
index e0bbb1d55e9..9df3d829cd1 100644
--- a/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
+++ b/src/main/org/hornetq/core/remoting/impl/netty/TransportConstants.java
@@ -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;
diff --git a/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java b/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
index d219f4843d7..856def74d69 100644
--- a/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
@@ -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;
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 9e793a1af2a..8fbd84d321c 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -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 -->
    <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>
diff --git a/tests/config/server-start-stop-config1.xml b/tests/config/server-start-stop-config1.xml
index 63f6c5c4366..5646c76c544 100644
--- a/tests/config/server-start-stop-config1.xml
+++ b/tests/config/server-start-stop-config1.xml
@@ -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>
 
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 8f75637438e..7e5d79a9248 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -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 -->
    <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>
diff --git a/tests/jms-tests/config/hornetq-configuration.xml b/tests/jms-tests/config/hornetq-configuration.xml
index 141e267d790..fd4b2f8ebd9 100644
--- a/tests/jms-tests/config/hornetq-configuration.xml
+++ b/tests/jms-tests/config/hornetq-configuration.xml
@@ -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 @@
 
          <!-- Netty TCP Acceptor -->
          <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>
diff --git a/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java
index f359f8682e8..776a62e59d2 100644
--- a/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java
+++ b/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java
@@ -60,7 +60,7 @@ protected void setUp() throws Exception
 
          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));
 
 
diff --git a/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java b/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java
index 2c93852172f..e9994662038 100644
--- a/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java
+++ b/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java
@@ -56,7 +56,7 @@ protected void setUp() throws Exception
 
       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));
 
 
diff --git a/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java
index 7f99a9a8c75..7bdc1ee24ea 100644
--- a/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java
@@ -287,7 +287,7 @@ public void deployConnectionFactory(final String clientId,
    {
       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,
diff --git a/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java b/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java
index 64391b75e28..6415e930a09 100644
--- a/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java
+++ b/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java
@@ -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;
 
diff --git a/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java b/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java
index d1a9ee282d8..2bf77ea24ce 100644
--- a/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java
+++ b/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java b/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java
index 1677bcd1b30..63dbf2f5e20 100644
--- a/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java
+++ b/tests/src/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java b/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
index f30a1385e35..f9075745ec6 100644
--- a/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
+++ b/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
@@ -43,8 +43,8 @@ public class CoreClientTest extends UnitTestCase
 
    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
diff --git a/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java b/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java
index f80f02f393b..2868b9e7904 100644
--- a/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java
+++ b/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java
@@ -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 @@ private void doTest(String dest) throws Exception
    {
       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 doTest(String dest) throws Exception
 
    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();
 
diff --git a/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java b/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
index e3eda98b85a..de754a1eded 100644
--- a/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
+++ b/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java b/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
index c15bfb8c51b..92b7f88c6b8 100644
--- a/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
@@ -118,7 +118,7 @@ protected void setUp() throws Exception
    {
       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);
diff --git a/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java b/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java
index 54d767b586d..2fb2e8abd53 100644
--- a/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java b/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
index 0671eea2c76..ccfb4f08aa4 100644
--- a/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
+++ b/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
@@ -44,7 +44,7 @@ public static void main(final String[] args) throws Exception
       {
          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);
diff --git a/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java b/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java
index 1fffbce74fe..aacb6700463 100644
--- a/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java
+++ b/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
index 1797fad343d..c881052643e 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
index 877bd8895d4..1a956c07495 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
@@ -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 @@ public void testStartStop() throws Exception
       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 @@ public void testTargetServerUpAndDown() throws Exception
       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 @@ public void testTargetServerNotAvailableNoReconnectTries() throws Exception
       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 @@ public void testManualStopStart() throws Exception
       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
       {
diff --git a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
index 0f9e56b6ab8..1ee404f0b96 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
@@ -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 @@ private void addTargetParameters(final Map<String, Object> server1Params)
    {
       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
       {
diff --git a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
index 4f730bd590a..29839d88c1c 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
@@ -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 @@ protected HornetQServer createHornetQServer(final int id,
 
       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));
 
diff --git a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
index a35b7ce4c0f..e6699316fdd 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
index bd0e722678f..40a90628acb 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -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 @@ protected Map<String, Object> generateParams(final int node, final boolean netty
 
       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
       {
diff --git a/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java b/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
index 192ac9aa0a1..2fe5f29d05e 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
@@ -190,16 +190,16 @@ protected TransportConfiguration getNettyAcceptorTransportConfiguration(final bo
    {
       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 @@ protected TransportConfiguration getNettyConnectorTransportConfiguration(final b
    {
       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);
       }
    }
diff --git a/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java b/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java
index f49ff1f3aa7..18f1c35be03 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java
@@ -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 @@ protected TransportConfiguration getAcceptorTransportConfiguration(final boolean
    {
       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 @@ protected TransportConfiguration getAcceptorTransportConfiguration(final boolean
 
          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 @@ protected TransportConfiguration getConnectorTransportConfiguration(final boolea
    {
       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 @@ protected TransportConfiguration getConnectorTransportConfiguration(final boolea
 
          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);
       }
    }
diff --git a/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java b/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
index c0d2fe979c7..c48b28edd29 100644
--- a/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
+++ b/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
@@ -40,7 +40,7 @@ protected void start() throws Exception
       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 @@ protected void start() throws Exception
    @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);
diff --git a/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java b/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
index 9ee4b29129c..3c5b12946cc 100644
--- a/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
+++ b/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java b/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java
index 10131c16b9b..c2185b6c5a9 100644
--- a/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java
+++ b/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java b/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
index 91416a348a4..0928303fcc0 100644
--- a/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
+++ b/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 97b67e9c8fa..70554496591 100644
--- a/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ b/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
index 05dcc73f962..b272eb9941b 100644
--- a/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
index 95a9c0bef05..7e8a5168bb4 100644
--- a/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
+++ b/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
index e4a4c1e1820..a0e624773d4 100644
--- a/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
+++ b/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java
index 1e181225522..8fa24b99f66 100644
--- a/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java
+++ b/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java b/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
index a325fcace04..c952957ff14 100644
--- a/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
+++ b/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java b/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
index b89f01bbec8..febb029f119 100644
--- a/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
+++ b/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
index 37329ecf132..ad45a7ce3ea 100644
--- a/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
+++ b/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index 96ba0ecaaa1..af6d59b0420 100644
--- a/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/src/org/hornetq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java b/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java
index ce6cb4bde4c..49d4897604d 100644
--- a/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java
+++ b/tests/src/org/hornetq/tests/integration/remoting/BatchDelayTest.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java
index fa6d379f913..92f0c200132 100644
--- a/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java
+++ b/tests/src/org/hornetq/tests/integration/remoting/NettyNetworkAddressTest.java
@@ -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
diff --git a/tests/src/org/hornetq/tests/integration/remoting/PingTest.java b/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
index 98b4c398d97..806e529977a 100644
--- a/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
+++ b/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
@@ -106,7 +106,7 @@ public void beforeReconnect(final HornetQException exception)
     */
    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 testNoFailureWithPinging() throws Exception
     */
    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 testNoFailureNoPinging() throws Exception
     */
    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 @@ public boolean intercept(final Packet packet, final RemotingConnection connectio
          }
       });
 
-      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);
 
diff --git a/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java b/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
index 8b5d6c5b3b3..5176b86b1ca 100644
--- a/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
+++ b/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
@@ -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;
 
 /**
diff --git a/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java b/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java
index 912767a3cd0..1554e10cf2c 100644
--- a/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java
+++ b/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java b/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
index 82398f6f244..7dfa3dfb275 100644
--- a/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
+++ b/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/integration/stomp/StompTest.java b/tests/src/org/hornetq/tests/integration/stomp/StompTest.java
index 33d3075b689..57d61bc0a40 100644
--- a/tests/src/org/hornetq/tests/integration/stomp/StompTest.java
+++ b/tests/src/org/hornetq/tests/integration/stomp/StompTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java b/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java
index 0c2b85725a1..90c32627a2f 100644
--- a/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java
+++ b/tests/src/org/hornetq/tests/integration/transports/netty/HornetQFrameDecoder2Test.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/opt/SendTest.java b/tests/src/org/hornetq/tests/opt/SendTest.java
index 917fea84952..28e7f4e2857 100644
--- a/tests/src/org/hornetq/tests/opt/SendTest.java
+++ b/tests/src/org/hornetq/tests/opt/SendTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java b/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java
index 3ff3c2e828d..5609947131f 100644
--- a/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java
+++ b/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java
@@ -100,7 +100,7 @@ public void testMultiThreadOpenAndCloses() throws Exception
     */
    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()
       {
diff --git a/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java b/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java
index a8b9990cc22..6bb2354b70d 100644
--- a/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java
+++ b/tests/src/org/hornetq/tests/stress/stomp/StompStressTest.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
index 93ffb5adbcd..b1b0e1b6ff9 100644
--- a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
+++ b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
index 760ad2d4a1e..14fc034161c 100644
--- a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
+++ b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
index d40af3bc8f4..4e1b2b55900 100644
--- a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
+++ b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
index 952e75ceab4..ac0e4bf9462 100644
--- a/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
+++ b/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java b/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
index 643d54ef966..7015d65d75b 100644
--- a/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
+++ b/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/util/JMSTestBase.java b/tests/src/org/hornetq/tests/util/JMSTestBase.java
index febc3130985..adef69207b2 100644
--- a/tests/src/org/hornetq/tests/util/JMSTestBase.java
+++ b/tests/src/org/hornetq/tests/util/JMSTestBase.java
@@ -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;
 
diff --git a/tests/src/org/hornetq/tests/util/ServiceTestBase.java b/tests/src/org/hornetq/tests/util/ServiceTestBase.java
index 2be1a18d178..f055b75c0ed 100644
--- a/tests/src/org/hornetq/tests/util/ServiceTestBase.java
+++ b/tests/src/org/hornetq/tests/util/ServiceTestBase.java
@@ -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;
diff --git a/tests/src/org/hornetq/tests/util/UnitTestCase.java b/tests/src/org/hornetq/tests/util/UnitTestCase.java
index c7db8bbf079..afb1579810b 100644
--- a/tests/src/org/hornetq/tests/util/UnitTestCase.java
+++ b/tests/src/org/hornetq/tests/util/UnitTestCase.java
@@ -86,9 +86,9 @@ public class UnitTestCase extends TestCase
 
    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 ----------------------------------------------------