[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 03/02/15 13:01:42

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  backport CachedConnectionManager changes, and test-connection-before-handing-it-out feature.  This replaces the old jca-jdbc wrappers with the versions from 3.2/4, enabling oracle xa support in 3.0
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.64 +22 -10    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.63
  retrieving revision 1.106.2.64
  diff -u -r1.106.2.63 -r1.106.2.64
  --- build.xml	14 Feb 2003 01:07:16 -0000	1.106.2.63
  +++ build.xml	15 Feb 2003 21:01:40 -0000	1.106.2.64
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.63 2003/02/14 01:07:16 ejort Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.64 2003/02/15 21:01:40 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -274,8 +274,9 @@
       <property name="jboss.connector.root" value="${project.root}/connector/output"/>
       <property name="jboss.connector.lib" value="${jboss.connector.root}/lib"/>
       <path id="jboss.connector.classpath">
  -      <pathelement path="${jboss.connector.lib}/jboss-jca.jar"/>
  -      <pathelement path="${jboss.connector.lib}/local-ra-jdbc-libs.jar"/>
  +      <pathelement path="${jboss.connector.lib}/jboss-jca.sar"/>
  +      <pathelement path="${jboss.connector.lib}/jboss-local-jdbc.jar"/>
  +      <pathelement path="${jboss.connector.lib}/jboss-common-jdbc-wrapper.jar"/>
       </path>
   
        <!-- Cluster -->
  @@ -457,8 +458,7 @@
   	     classpath="${xdoclet.task.classpath}"
   	     ejbspec="2.0"
   	     excludedtags="@version,@author"
  -        mergedir="${source.resources}/ejb-conf/readonly">
  -
  +             mergedir="${source.resources}/ejb-conf/readonly">
         <fileset dir="${source.java}">
           <include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
         </fileset>
  @@ -474,8 +474,9 @@
                version="3.0"
   	     destdir="${build.resources}/ejbconf/readonly/META-INF"
                mergedir="${source.resources}/ejbconf/readonly/"
  -        Datasource="java:/DefaultDS"
  -        Typemapping="Hypersonic SQL"/>
  +             Datasource="java:/DefaultDS"
  +             Typemapping="Hypersonic SQL"
  +             />
       </xdoclet>
   
   <!--eardeployment, SessionA-->
  @@ -484,7 +485,7 @@
   	     classpath="${xdoclet.task.classpath}"
   	     ejbspec="2.0"
   	     excludedtags="@version,@author"
  -        mergedir="${source.resources}/eardeployment/a">
  +             mergedir="${source.resources}/eardeployment/a">
         <fileset dir="${source.java}">
           <include name="org/jboss/test/jmx/eardeployment/a/ejb/SessionABean.java"/>
         </fileset>
  @@ -652,7 +653,7 @@
                mergedir="${source.resources}/entity/entity">
         <fileset dir="${source.java}">
            <include name="org/jboss/test/entity/beans/*Bean.java"/>
  -       </fileset>
  +      </fileset>
         <packageSubstitution packages="beans" substituteWith="interfaces"/>
         <valueobject/>
         <remoteinterface/>
  @@ -1419,12 +1420,23 @@
    	  depends="compile">
       <mkdir dir="${build.lib}"/>
   
  +    <!-- build test jdbc driver with config inside sar -->
  +    <jar jarfile="${build.lib}/jbosstestdriver.sar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jca/jdbc/**"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/jca/jdbc">
  +        <include name="META-INF/jboss-service.xml"/>
  +      </fileset>
  +    </jar>
  +
  +
       <!-- build test adapter -->
       <jar jarfile="${build.lib}/jbosstestadapter.jar">
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/jca/adapter/**"/>
         </fileset>
  -    </jar> 
  +    </jar>
   
       <jar jarfile="${build.lib}/jbosstestadapter.rar">
         <fileset dir="${build.lib}">