JDBC-245: Remove jaybird-pool jar from distribution (merge with (simp…

…le) jaybird jar)

build/archive.xml

@@ -5,8 +5,7 @@
 
   <!-- Not really a jar operation but necessary :) -->
   <target name="jar-j2ee" depends="compile">
-
-    <mkdir dir="${build.lib}"/>
+     <mkdir dir="${build.lib}"/>
     <copy file="${module.thirdparty}/connector-api-1.5.jar" tofile="${build.lib}/connector-api-1.5.jar"/>
   </target>
 
@@ -16,6 +15,9 @@
        <fileset dir="${build.classes}">
          <include name="org/firebirdsql/**"/>
        </fileset>
+       <fileset dir="${build.pool}">
+         <include name="org/firebirdsql/**"/>
+       </fileset>
        <fileset dir="${build.resources}">
          <exclude name="log4j.properties"/>
          <include name="**/*.properties"/>
@@ -25,12 +27,6 @@
        </zipfileset>
     </jar>
 
-    <jar jarfile="${build.lib}/${archive.name.pool}" manifest="${build.etc}/default.mf">
-       <fileset dir="${build.pool}">
-         <include name="org/firebirdsql/**"/>
-       </fileset>
-    </jar>
-
     <jar jarfile="${build.lib}/${archive.name.full}" manifest="${build.etc}/default.mf">
        <fileset dir="${build.classes}">
          <include name="org/firebirdsql/**"/>

build/init.xml

@@ -158,7 +158,6 @@
 	<property name="archive.name.version" value="${version.major}.${version.minor}.${version.revision}"/>
 
 	<property name="archive.name.rar" value="${archive.name.main}-${archive.name.version}.rar"/>
-	<property name="archive.name.pool" value="${archive.name.main}-pool-${archive.name.version}.jar"/>
 	<property name="archive.name.full" value="${archive.name.main}-full-${archive.name.version}.jar"/>
 	<property name="archive.name.simple" value="${archive.name.main}-${archive.name.version}.jar"/>
 	<property name="archive.name.test" value="${archive.name.main}-test-${archive.name.version}.jar"/>