https://jira.jboss.org/jira/browse/HORNETQ-278

hornetq · Apr 12, 2010 · 577b708 · 577b708
1 parent 9c67452
commit 577b708
Show file tree

Hide file tree

Showing 208 changed files with 404 additions and 475 deletions.
diff --git 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,28 +215,24 @@
 
    <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"/>
       <path refid="junit.junit.classpath"/>
       <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,14 +291,14 @@
       <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"/>
       <path refid="org.jboss.naming.classpath"/>
       <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
@@ -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
@@ -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,15 +729,15 @@ 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>
                 <para>the corresponding configuration in <literal
                         >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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"/>