This commit was manufactured by cvs2svn to create tag 'Jaybird_2_1_6'.

FirebirdSQL · Jul 19, 2008 · e9e7bd0 · e9e7bd0
1 parent 99d8c2c
commit e9e7bd0
Show file tree

Hide file tree

Showing 153 changed files with 6,049 additions and 23,850 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/build/compile.xml b/build/compile.xml
@@ -29,87 +29,70 @@
   </target>
 
   <target name="set-jdbc-20-src" if="jdbc.20">
+  	<echo message="Using JDBC 2.0 classes"/>
     <path id="source.java.additional">
       <pathelement path="${source.jdbc.20}"/>
     </path>
   </target>
 
   <target name="set-jdbc-30-src" if="jdbc.30">
+  	<echo message="Using JDBC 3.0 classes"/>
     <path id="source.java.additional">
       <pathelement path="${source.jdbc.30}"/>
     </path>
   </target>
 
   <target name="set-jdbc-40-src" if="jdbc.40">
+  	<echo message="Using JDBC 4.0 classes"/>
     <path id="source.java.additional">
       <pathelement path="${source.jdbc.40}"/>
     </path>
   </target>
-
+  
   <target name="set-wire1.3-src" if="jdk1.3">
+  	<echo message="Using wire protocol implementation for JDK 1.3"/>
     <path id="source.java.wire">
       <pathelement path="${source.wire1.3}"/>
     </path>
   </target>
 
   <target name="set-wire1.4-src" unless="jdk1.3">
+  	<echo message="Using wire protocol implementation for JDK 1.4 and higher"/>
     <path id="source.java.wire">
       <pathelement path="${source.wire1.4}"/>
     </path>
   </target>
 
-  <target name="set-pool1.4-src" unless="jdk1.5">
+  <target name="set-pool1.3-src" if="jdk1.3">
+  	<echo message="Using pool implementation for JDK 1.4 and below"/>
+    <path id="source.java.pool">
+      <pathelement path="${source.pool1.4}"/>
+    </path>
+  </target>
+
+  <target name="set-pool1.4-src" if="jdk1.4">
+  	<echo message="Using pool implementation for JDK 1.4 and below"/>
     <path id="source.java.pool">
       <pathelement path="${source.pool1.4}"/>
     </path>
   </target>
 
   <target name="set-pool1.5-src" if="jdk1.5">
+  	<echo message="Using pool implementation for JDK 5.0 and higher"/>
     <path id="source.java.pool">
       <pathelement path="${source.pool1.5}"/>
     </path>
   </target>
 
   <target name="set-pool1.6-src" if="jdk1.6">
-	<path id="source.java.pool">
+  	<echo message="Using pool implementation for JDK 6.0 and higher"/>
+    <path id="source.java.pool">
       <pathelement path="${source.pool1.6}"/>
     </path>
   </target>
-
-  <target name="set-openoffice-src-14" unless="jdk1.3">
-  	<echo message="OpenOffice support"/>
-  	<path id="source.java.openoffice">
-  		<pathelement path="${source.openoffice}"/>
-  	</path>
-  </target>
-
-  <target name="set-openoffice-src-13" if="jdk1.3">
-  	<echo message="No OpenOffice support!"/>
-  	<path id="source.java.openoffice">
-  	</path>
-  </target>
-
-  <target name="set-jca-src-14" unless="jdk1.6">
-  	<path id="source.java.jca">
-    	<pathelement path="${source.jca1.4}"/>
-    </path>
-  </target>
-
-  <target name="set-jca-src-16" if="jdk1.6">
-  	<path id="source.java.jca">
-    	<pathelement path="${source.jca1.6}"/>
-    </path>
-  </target>
 
-  <target name="compile-driver" depends="set-jdbc-20-src,set-jdbc-30-src,set-jdbc-40-src,set-wire1.3-src,set-wire1.4-src,set-openoffice-src-13,set-openoffice-src-14,set-jca-src-14,set-jca-src-16">
+  <target name="compile-driver" depends="set-jdbc-20-src,set-jdbc-30-src,set-jdbc-40-src,set-wire1.3-src,set-wire1.4-src">
     <mkdir dir="${build.classes}"/>
-
-    <echo message="${jdk1.3}"/>
-    <echo message="${toString:source.java.openoffice}"/>
-    <echo message="${toString:source.java.additional}"/>
-    <echo message="${toString:source.java.wire}"/>
-    <echo message="${toString:source.java.jca}"/>
-
     <javac destdir="${build.classes}"
            target="${ant.java.version}"
            debug="on"
@@ -120,14 +103,12 @@
     >
       <classpath refid="javac.driver.classpath"/>
       <src path="${source.java}"/>
-      <src refid="source.java.openoffice"/>
       <src refid="source.java.additional"/>
       <src refid="source.java.wire"/>
-      <src refid="source.java.jca"/>
     </javac>
   </target>
 
-  <target name="compile-pool" depends="set-pool1.4-src,set-pool1.5-src,set-pool1.6-src,compile-driver">
+  <target name="compile-pool" depends="set-pool1.3-src,set-pool1.4-src,set-pool1.5-src,set-pool1.6-src,compile-driver">
     <mkdir dir="${build.pool}"/>
     <javac srcdir="${source.pool}"
            destdir="${build.pool}"
@@ -166,8 +147,14 @@
       <pathelement path="${source.test.30}"/>
     </path>
   </target>
+
+  <target name="set-jdbc-40-test" if="jdbc.40">
+    <path id="source.test.additional">
+      <pathelement path="${source.test.30}"/>
+    </path>
+  </target>
 
-  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test">
+  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test">
     <mkdir dir="${build.test}"/>
     <javac srcdir="${source.test}"
            destdir="${build.test}"
@@ -176,7 +163,7 @@
            deprecation="on"
            optimize="on"
            includes="org/**"
-           excludes="**/temp* **/hibernate/*"
+           excludes="**/temp*"
     >
       <classpath refid="javac.test.classpath"/>
       <src path="${source.test}"/>

diff --git a/build/init.xml b/build/init.xml
@@ -6,13 +6,11 @@
     </tstamp>
     <property name="build.id" value="${build.number}"/>
 
-        <condition property="jdbc.20" value="true">
-            <or>
-                <equals arg1="${ant.java.version}" arg2="1.1"/>
-                <equals arg1="${ant.java.version}" arg2="1.2"/>
-                <equals arg1="${ant.java.version}" arg2="1.3"/>
-            </or> 
-        </condition>
+	<echo message="Using JDK version ${ant.java.version}"/>
+
+	<condition property="jdbc.20" value="true">
+		<equals arg1="${ant.java.version}" arg2="1.3"/>
+	</condition>	
 
 	<!-- We set jdbc.30 property if JDK version is 1.4 -->
 	<condition property="jdbc.30" value="true">
@@ -21,10 +19,10 @@
 		<equals arg1="${ant.java.version}" arg2="1.5"/>
 	  </or>		
 	</condition>
-
+	
 	<condition property="jdbc.40" value="true">
 		<equals arg1="${ant.java.version}" arg2="1.6"/>
-	</condition>
+	</condition>	
 
 	<!-- We set jdk1.3 property if JDK version is 1.3 -->
 	<condition property="jdk1.3" value="true">
@@ -41,7 +39,7 @@
 		<equals arg1="${ant.java.version}" arg2="1.5"/>
 	</condition>
 
-	<!-- We set jdk1.6 property if JDK version is 1.6 -->
+	<!-- We set jdk1.5 property if JDK version is 1.6 -->
 	<condition property="jdk1.6" value="true">
 		<equals arg1="${ant.java.version}" arg2="1.6"/>
 	</condition>
@@ -50,15 +48,15 @@
     <property name="name" value="jaybird"/>
 
     <property name="version.major" value="2"/>
-    <property name="version.minor" value="2"/>
-    <property name="version.revision" value="0"/>
-    <property name="version.tag" value="snapshot_20060810"/>
+    <property name="version.minor" value="1"/>
+    <property name="version.revision" value="6"/>
+    <property name="version.tag" value=""/>
     <property name="version.name" value="JDK_${ant.java.version}"/>
 
     <property name="version.full" value="${version.major}.${version.minor}.${version.revision}${version.tag}${version.name}"/>
 
     <!-- This must be set to the CVS tag for any release -->
-    <property name="version.cvstag" value="HEAD"/>
+    <property name="version.cvstag" value="Jaybird_2_1_6"/>
 
     <!-- Manifest version info -->
     <property name="specification.title" value="Firebird Jaybird"/>
@@ -94,17 +92,15 @@
 
     <!-- Where source files live -->
     <property name="source.java" value="${module.source}/main"/>
-    <property name="source.openoffice" value="${module.source}/openoffice"/>
     <property name="source.jdbc.20" value="${module.source}/jdbc_20"/>
     <property name="source.jdbc.30" value="${module.source}/jdbc_30"/>
     <property name="source.jdbc.40" value="${module.source}/jdbc_40"/>
     <property name="source.wire1.3" value="${module.source}/wire_jdk1_3"/>
     <property name="source.wire1.4" value="${module.source}/wire_jdk1_4"/>
+    <property name="source.pool1.3" value="${module.source}/pool_jdk1_3"/>
     <property name="source.pool1.4" value="${module.source}/pool_jdk1_4"/>
     <property name="source.pool1.5" value="${module.source}/pool_jdk1_5"/>
-	<property name="source.pool1.6" value="${module.source}/pool_jdk1_6"/>
-	<property name="source.jca1.4" value="${module.source}/jca_jdk1_4"/>
-	<property name="source.jca1.6" value="${module.source}/jca_jdk1_6"/>
+    <property name="source.pool1.6" value="${module.source}/pool_jdk1_6"/>
     <property name="source.etc" value="${module.source}/etc"/>
     <property name="source.examples" value="${module.examples}"/>
     <property name="source.examples" value="${module.root}/examples"/>

diff --git a/lib/antlr-runtime-3.0.1.jar b/lib/antlr-runtime-3.0.1.jar
diff --git a/lib/xerces.jar b/lib/xerces.jar
diff --git a/native/jaybird22.dll b/native/jaybird22.dll