[jboss-cvs] JBossAS SVN: r112408 - in tags/JBPAPP_5_1_2_ER2/hornetq-int/src: resources and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mbenitez
Date: 2011-11-03 10:18:44 -0400 (Thu, 03 Nov 2011)
New Revision: 112408

Modified:
   tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/build.xml
   tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/javaee-examples-build.xml
   tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/jms-examples-build.xml
   tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml
Log:
Merge from JBPAPP_5_1: JBPAPP-6659 / remove unwanted config (rev. 112402/112403)

Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/build.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/build.xml	2011-11-03 14:07:58 UTC (rev 112407)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/build.xml	2011-11-03 14:18:44 UTC (rev 112408)
@@ -15,6 +15,7 @@
 
    <property name="jboss_home" value="../../"/>
    <property name="lib.dir" value="lib"/>
+   <property name="examples.dir" value="examples"/>
    <property name="resources.dir" value="resources"/>
    <property name="backup.suffix" value="-backup"/>
    <property name="backup" value="false"/>
@@ -93,6 +94,13 @@
             <include name="netty.jar"/>
          </fileset>
       </copy>
+      <mkdir dir="${jboss_home}/docs/examples/hornetq-examples"/>
+      <copy todir="${jboss_home}/docs/examples/hornetq-examples" overwrite="true">
+         <fileset dir="${examples.dir}">
+            <exclude name="**/build.sh"/>
+            <exclude name="**/build.bat"/>
+         </fileset>
+      </copy>
    </target>
 
    <target  name="addClient">

Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/javaee-examples-build.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/javaee-examples-build.xml	2011-11-03 14:07:58 UTC (rev 112407)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/javaee-examples-build.xml	2011-11-03 14:18:44 UTC (rev 112408)
@@ -16,11 +16,11 @@
    <property name="example.config.dir" value="config"/>
    <property file="${example.config.dir}/ant.properties"/>
    <property name="hornetq.example.logserveroutput" value="true"/>
-   <property name="hornetq.jars.dir" value="../../../lib"/>
+   <property name="hornetq.jars.dir" value="../../../../../common/lib"/>
    <property name="jboss.common.jars.dir" value="../../../../../common/lib"/>
    <property name="jboss.client.jars.dir" value="../../../../../client"/>
    <property name="jboss.jars.dir" value="../../../../../lib"/>
-   <property name="aio.library.path" value="../../native/bin"/>
+   <property name="aio.library.path" value="../../../../../bin"/>
    <property name="example.server.dir" value="server"/>
    <property name="jboss.home" value="../../../../../"/>
 

Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/jms-examples-build.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/jms-examples-build.xml	2011-11-03 14:07:58 UTC (rev 112407)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/etc/jms-examples-build.xml	2011-11-03 14:18:44 UTC (rev 112408)
@@ -22,11 +22,11 @@
    <dirname property="imported.basedir" file="${ant.file.example}"/>
 
    <property name="hornetq.example.logserveroutput" value="true"/>
-   <property name="hornetq.jars.dir" value="../../../lib"/>
+   <property name="hornetq.jars.dir" value="../../../../../common/lib"/>
    <property name="jboss.common.jars.dir" value="../../../../../common/lib"/>
    <property name="jboss.client.jars.dir" value="../../../../../client"/>
    <property name="jboss.jars.dir" value="../../../../../lib"/>
-   <property name="aio.library.path" value="../../native/bin"/>
+   <property name="aio.library.path" value="../../../../../bin"/>
 
    <!--
        This module is based on Java 1.6

Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml	2011-11-03 14:07:58 UTC (rev 112407)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml	2011-11-03 14:18:44 UTC (rev 112408)
@@ -239,14 +239,6 @@
         <!--
 			com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
 			-->
-        <!--HornetQ recovery is now done automatically via the Resource Adapter configuration, however its still possible to add it here if need be-->
-			<!--<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
-                   value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>-->
-       <!--
-			<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
-                   value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>-->
-
-
 		   <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
     </properties>
     <properties depends="arjuna,txoj,jta" name="recoverymanager">