[jboss-cvs] JBossAS SVN: r90496 - in branches/JBPAPP_5_0_JBPAPP-2043: messaging2 and 1 other directories.

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

Author: ataylor
Date: 2009-06-22 08:33:32 -0400 (Mon, 22 Jun 2009)
New Revision: 90496

Modified:
   branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
   branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
Log:
updated to messaging 2 beta 3 libs

Modified: branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml	2009-06-22 12:05:52 UTC (rev 90495)
+++ branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml	2009-06-22 12:33:32 UTC (rev 90496)
@@ -41,7 +41,7 @@
     <version.jboss.jbossws>3.1.2.GA</version.jboss.jbossws>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
-    <version.org.jboss.messaging>2.0.0.BETA2</version.org.jboss.messaging>
+    <version.org.jboss.messaging>2.0.0.BETA3</version.org.jboss.messaging>
     <version.org.jboss.netty>3.1.0.BETA3</version.org.jboss.netty>
     <version.jboss.web>2.1.3.GA</version.jboss.web>
     <version.jgroups>2.6.10.GA</version.jgroups>

Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml	2009-06-22 12:05:52 UTC (rev 90495)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml	2009-06-22 12:33:32 UTC (rev 90496)
@@ -114,29 +114,11 @@
      <copy  todir="${JBossMessaging2.dir}" overwrite="true">
       <fileset dir="output/etc">
          <include  name="examples/**"/>
-         <include name="*.so"/>
+         <!--<include name="*.so"/>-->
       </fileset>
      </copy>
      <copy tofile="${JBossMessaging2.dir}/examples/javaee/common/build.xml" file="output/etc/java-ee-common-build.xml" overwrite="true"/>
      <copy tofile="${JBossMessaging2.dir}/examples/common/build.xml" file="output/etc/jms-common-build.xml" overwrite="true"/>
-     <replaceregexp match="^(.+)MessagingServerImpl(.+)\n(.+)start(.+)\n(.+)stop(.+)$"
-                    replace="    &lt;bean name=&quot;MessagingServer&quot; class=&quot;org.jboss.messaging.core.server.impl.MessagingServerImpl&quot;>"
-                    flags="m">
-      <fileset dir="${JBossMessaging2.dir}/examples/jms/">
-         <include name="**/*/jbm-jboss-beans.xml"/>
-      </fileset>
-     </replaceregexp>
-     <replaceregexp match="^(.+)JBMSecurityManager(.+)\n(.+)parameter(.+)\n(.+)constructor(.+)$"
-                    replace="              &lt;inject bean=&quot;JBMSecurityManager&quot;/&gt;${line.separator}
-         &lt;/parameter&gt;${line.separator}
-      &lt;/constructor&gt;${line.separator}
-      &lt;start ignored=&quot;true&quot;/&gt;${line.separator}
-   &lt;stop ignored=&quot;true&quot;/&gt;${line.separator}    "
-                    flags="m">
-      <fileset dir="${JBossMessaging2.dir}/examples/jms/">
-         <include name="**/*/jbm-jboss-beans.xml"/>
-      </fileset>
-     </replaceregexp>
   </target>
 
   <target name="sar">

Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml	2009-06-22 12:05:52 UTC (rev 90495)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml	2009-06-22 12:33:32 UTC (rev 90496)
@@ -27,12 +27,12 @@
             <include name="netty.jar"/>
          </fileset>
       </copy>
-      <mkdir dir="${bin.dir}/META-INF/lib/linux2/x86"/>
+      <!--<mkdir dir="${bin.dir}/META-INF/lib/linux2/x86"/>
       <mkdir dir="${bin.dir}/META-INF/lib/linux2/x64"/>
       <mkdir dir="${bin.dir}/META-INF/lib/linux2/i64"/>
       <copy todir="${bin.dir}/META-INF/lib/linux2/x86" file="libJBMLibAIO32.so"/>
       <copy todir="${bin.dir}/META-INF/lib/linux2/x64" file="libJBMLibAIO64.so"/>
-      <copy todir="${bin.dir}/META-INF/lib/linux2/i64" file="libJBMLibAIO_ia64.so"/>
+      <copy todir="${bin.dir}/META-INF/lib/linux2/i64" file="libJBMLibAIO_ia64.so"/>-->
    </target>
 
    <target name="install-default">