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

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