[jboss-cvs] JBossAS SVN: r71784 - in trunk: connector and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-04-08 05:59:38 -0400 (Tue, 08 Apr 2008)
New Revision: 71784

Removed:
   trunk/connector/src/resources/ha-local-rar/
   trunk/connector/src/resources/ha-xa-rar/
Modified:
   trunk/build/build-distr.xml
   trunk/connector/build.xml
Log:
Remove the obsolete ha jdbc rars - now in the main jdbc rars

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-04-08 09:54:44 UTC (rev 71783)
+++ trunk/build/build-distr.xml	2008-04-08 09:59:38 UTC (rev 71784)
@@ -607,10 +607,6 @@
       <fileset dir="${_module.output}/etc/example-config">
         <include name="*.xml"/>
       </fileset>
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-ha-local-jdbc.rar"/>
-        <include name="jboss-ha-xa-jdbc.rar"/>
-      </fileset>
     </copy>
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/etc/example-config">

Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml	2008-04-08 09:54:44 UTC (rev 71783)
+++ trunk/connector/build.xml	2008-04-08 09:59:38 UTC (rev 71784)
@@ -388,26 +388,6 @@
     </jar>
 
 
-    <!-- Create the new ha local transaction JDBC wrapper resource adapter -->
-    <jar jarfile="${build.lib}/jboss-ha-local-jdbc.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/resource/adapter/jdbc/local/HALocal*.class"/>
-      </fileset>
-    </jar>
-
-    <!-- Build jboss-ha-local-jdbc.rar -->
-    <jar jarfile="${build.lib}/jboss-ha-local-jdbc.rar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/ha-local-rar">
-        <include name="**/*"/>
-      </fileset>
-      <fileset dir="${build.lib}">
-        <include name="jboss-ha-local-jdbc.jar"/>
-      </fileset>
-    </jar>
-
-
     <!-- Create the xa transaction JDBC wrapper resource adapter -->
     <!-- Build ra-xa-libs.jar -->
     <jar jarfile="${build.lib}/jboss-xa-jdbc.jar"
@@ -430,26 +410,6 @@
     </jar>
 
 
-    <!-- Create the HA xa transaction JDBC wrapper resource adapter -->
-    <jar jarfile="${build.lib}/jboss-ha-xa-jdbc.jar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.classes}">
-        <include name="org/jboss/resource/adapter/jdbc/xa/**/HA*.class"/>
-      </fileset>
-    </jar>
-
-    <!-- Build jboss-ha-xa-jdbc.rar -->
-    <jar jarfile="${build.lib}/jboss-ha-xa-jdbc.rar"
-      manifest="${build.etc}/default.mf">
-      <fileset dir="${build.resources}/ha-xa-rar">
-        <include name="**/*"/>
-      </fileset>
-      <fileset dir="${build.lib}">
-        <include name="jboss-ha-xa-jdbc.jar"/>
-      </fileset>
-    </jar>
-
-
     <!-- jms-ra.rar -->
     <jar jarfile="${build.lib}/jms-ra.jar"
       manifest="${build.etc}/default.mf">