Skip to content

Commit

Permalink
Tag Jaybird 2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrotteveel
mrotteveel committed May 11, 2013
1 parent d91c5a1 commit 3f1eb93
Show file tree
Hide file tree
Showing 380 changed files with 27,792 additions and 14,583 deletions.
9 changes: 8 additions & 1 deletion .classpath
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="examples"/>
<classpathentry kind="src" path="src/pool_jdk1_6"/>
<classpathentry kind="src" path="src/jdbc_40"/>
<classpathentry kind="src" path="src/jca_jdk1_6"/>
<classpathentry kind="src" path="src/wire_jdk1_4"/>
<classpathentry kind="src" path="src/messages"/>
<classpathentry kind="src" path="src/resources"/>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/pool"/>
<classpathentry excluding="org/firebirdsql/hibernate/" kind="src" path="src/test"/>
<classpathentry kind="src" path="src/test_30"/>
<classpathentry kind="src" path="src/test_40"/>
<classpathentry kind="src" path="src/openoffice"/>
<classpathentry kind="lib" path="src/lib/fscontext.jar"/>
<classpathentry kind="lib" path="src/lib/providerutil.jar"/>
Expand All @@ -13,12 +20,12 @@
<classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib/test/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/test/jmock-junit3-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/test/hamcrest-core-1.1.jar"/>
<classpathentry kind="lib" path="lib/test/hamcrest-library-1.1.jar"/>
<classpathentry kind="lib" path="lib/test/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="lib" path="lib/test/jmock-legacy-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/test/objenesis-1.0.jar"/>
<classpathentry kind="lib" path="src/lib/antlr-runtime-3.4.jar"/>
<classpathentry kind="lib" path="src/lib/connector-api-1.5.jar"/>
<classpathentry kind="lib" path="lib/test/jmock-junit4-2.5.1.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
2 changes: 1 addition & 1 deletion .project
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>client-java</name>
<name>client-java.22.head</name>
<comment></comment>
<projects>
</projects>
Expand Down
28 changes: 0 additions & 28 deletions CONTRIBUTING
View file

This file was deleted.

258 changes: 258 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,261 @@
2013-02-02 09:52 mrotteveel

* src/test/org/firebirdsql/jdbc/TestFBConnectionTimeout.java:

Ignore timout test that is OS dependent

2013-02-02 09:50 mrotteveel

* src/etc/release_notes.html, src/etc/release_notes.odt,
src/etc/release_notes.pdf:

Updated 2.2.2 releasenotes

2013-02-02 08:42 mrotteveel

* native/debug/jaybird22.dll, native/debug/jaybird22.pdb,
native/debug/jaybird22_x64.dll, native/debug/jaybird22_x64.pdb,
native/jaybird22.dll, native/jaybird22_x64.dll,
src/native/jaygds/builds/msvc10/java_gds.rc:

Jaybird 2.2.2 Windows binaries

2013-01-19 16:05 mrotteveel

* src/etc/release_notes.html, src/etc/release_notes.odt,
src/etc/release_notes.pdf:

Update releasenotes for Jaybird 2.2.2

2013-01-19 14:19 mrotteveel

* build/init.xml:

Increase revision to 2.2.2

2013-01-19 14:14 mrotteveel

* src/main/org/firebirdsql/ds/FBAbstractCommonDataSource.java,
src/main/org/firebirdsql/gds/impl/jni/BaseGDSImpl.java,
src/main/org/firebirdsql/gds/impl/wire/AbstractJavaGDSImpl.java,
src/main/org/firebirdsql/jca/FBManagedConnection.java,
src/main/org/firebirdsql/jca/FBManagedConnectionFactory.java,
src/main/org/firebirdsql/jdbc/FBConnectionProperties.java,
src/main/org/firebirdsql/jdbc/FirebirdConnectionProperties.java,
src/pool/org/firebirdsql/pool/AbstractFBConnectionPoolDataSource.java,
src/pool/org/firebirdsql/pool/FBSimpleDataSource.java,
src/pool/org/firebirdsql/pool/FBWrappingDataSource.java,
src/resources/driver_property_info.properties,
src/resources/isc_dpb_types.properties,
src/test/org/firebirdsql/gds/impl/wire/TestGds.java,
src/test/org/firebirdsql/jdbc/TestFBConnectionTimeout.java,
src/wire_jdk1_4/org/firebirdsql/gds/impl/wire/JavaGDSImpl.java:

JDBC-295 : Backport connect timeout implementation into 2.2.2

2013-01-19 14:05 mrotteveel

* src/test/org/firebirdsql/jdbc/TestFBClob.java,
src/test_40/org/firebirdsql/jdbc/TestFBClob4_0.java:

Fix test compatibility with Java 5

2012-12-24 13:42 mrotteveel

* src/main/org/firebirdsql/jdbc/FBEscapedParser.java:

JDBC-290 Backport fix for JDBC LIKE escape character escape

2012-12-08 14:28 mrotteveel

* src/main/org/firebirdsql/jdbc/AbstractCallableStatement.java,
src/main/org/firebirdsql/jdbc/AbstractPreparedStatement.java,
src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java:

JDBC-288 Backport basic fix (disallow use of execute methods
accepting query string on PreparedStatement and
PreparedStatement)

2012-12-02 12:42 mrotteveel

* src/main/org/firebirdsql/gds/impl/jni/ServiceRequestBufferImp.java,
src/main/org/firebirdsql/gds/impl/wire/ServiceRequestBufferImp.java:

JDBC-286 backport to 2.2.2

2012-12-02 12:41 mrotteveel

* src/main/org/firebirdsql/gds/impl/jni/ParameterBufferBase.java:

JDBC-285 backport to 2.2.2

2012-12-02 12:41 mrotteveel

* src/main/org/firebirdsql/jdbc/FBConnectionHelper.java:

JDBC-284 backport to 2.2.2

2012-11-17 13:30 mrotteveel

* src/main/org/firebirdsql/management/FBMaintenanceManager.java:

JDBC-266 On closer examination isc_spb_tra_id is an information
item as part of isc_spb_multi_tra_id and not actually a limbo
transaction

2012-11-17 13:23 mrotteveel

* src/main/org/firebirdsql/gds/ISCConstants.java,
src/main/org/firebirdsql/management/FBMaintenanceManager.java:

JDBC-266 Incorrect limbo transaction numbers

2012-11-03 16:49 mrotteveel

* src/main/org/firebirdsql/jdbc/FBClob.java,
src/test/org/firebirdsql/jdbc/StringClob.java,
src/test/org/firebirdsql/jdbc/TestFBClob.java:

JDBC-281 Backport fix + tests to Jaybird 2.2

2012-09-30 12:58 mrotteveel

* build/maven-release/instructions.txt,
build/maven-release/jaybird-example.pom:

Minor tweak to maven release instructions + source URLs in pom

2012-09-30 11:09 mrotteveel

* build/init.xml:

Revert back to Branch_2_2 tag in build script

2012-09-30 10:56 mrotteveel

* build/init.xml:

Set tag in buildfile in preparation of tagging Jaybird 2.2.1

2012-09-29 13:44 mrotteveel

* build/init.xml:

Update build version info

2012-09-29 09:49 mrotteveel

* native/libjaybird22_x64.so:

Update lib for Linux AMD64

2012-09-29 09:47 mrotteveel

* native/libjaybird22.so:

Update lib for Linux x86

2012-09-23 08:38 mrotteveel

* native/debug/jaybird22.dll, native/debug/jaybird22.pdb,
native/debug/jaybird22_x64.dll, native/debug/jaybird22_x64.pdb,
native/jaybird22.dll, native/jaybird22_x64.dll,
src/native/jaygds/builds/msvc10/java_gds.rc,
src/native/jaygds/source/xsqlda_wrapper.cpp:

Fix memory corruption caused by change for JDBC-271

2012-09-22 11:47 mrotteveel

* native/debug/jaybird22.dll, native/debug/jaybird22.pdb,
native/debug/jaybird22_x64.dll, native/debug/jaybird22_x64.pdb,
native/jaybird22.dll, native/jaybird22_x64.dll,
src/native/jaygds/builds/msvc10/java_gds.rc:

Build Jaybird 2.2.1 native libraries for Windows (32/64)

2012-09-22 11:40 mrotteveel

* src/etc/release_notes.html, src/etc/release_notes.odt,
src/etc/release_notes.pdf:

Updated release notes for Jaybird 2.2.1

2012-09-09 09:28 mrotteveel

* src/main/org/firebirdsql/gds/ISCConstants.java,
src/main/org/firebirdsql/gds/impl/DatabaseParameterBufferExtension.java,
src/main/org/firebirdsql/jdbc/FBResultSetMetaData.java,
src/resources/driver_property_info.properties,
src/resources/isc_dpb_types.properties,
src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java:

JDBC-260: provide connection property to report columnLabel as
the columnName.

2012-09-02 09:30 mrotteveel

* src/main/org/firebirdsql/encodings/EncodingFactory.java,
src/main/org/firebirdsql/jdbc/FBConnectionProperties.java,
src/test/org/firebirdsql/ds/TestDataSourceFactory.java:

Backport changes for JDBC-267 and JDBC-268

2012-09-01 12:36 mrotteveel

* .:

Ignore output folder

2012-09-01 12:29 mrotteveel

* src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java:

Test for JDBC-271

2012-09-01 12:15 mrotteveel

* src/native/jaygds/source/xsqlda_wrapper.cpp:

JDBC-271 backport

2012-09-01 11:52 mrotteveel

* src/native/jaygds/builds/msvc10:

Ignore user-specific solution file

2012-09-01 11:37 mrotteveel

* src/native/jaygds/builds/msvc10/java_gds.suo:

Delete user-specific solution file

2012-08-12 09:52 mrotteveel

* src/main/org/firebirdsql/jdbc/field/FBNullField.java,
src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java:

JDBC-264 : Backport fix + tests for FBNullField.setString(null)

2012-08-11 09:41 mrotteveel

* build_native.xml:

JDBC-259 Fix incorrectly linked library on Linux

2012-08-11 09:21 mrotteveel

* ., build_native.xml:

Fix formatting of native build file

2012-07-14 15:49 mrotteveel

* build/init.xml:

Branch specific tag

2012-07-14 11:41 mrotteveel

* client-java/build/: init.xml, test.xml:
Expand Down
20 changes: 19 additions & 1 deletion build/archive.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,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"/>
Expand All @@ -28,6 +31,9 @@
<fileset dir="${build.classes}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.pool}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.compatibility}">
<include name="org/firebirdsql/**"/>
</fileset>
Expand Down Expand Up @@ -56,18 +62,30 @@
</jar>
</target>

<target name="jar-sources" depends="set-driver-sources">
<target name="jar-sources" depends="set-driver-sources,set-pool-sources">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.sources}" update="true">
<fileset dir="${source.java}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${source.pool}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${toString:source.java.openoffice}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${toString:source.java.additional}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${toString:source.java.pool}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${toString:source.java.wire}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${toString:source.java.jca}">
<include name="**/*.java"/>
</fileset>
<fileset dir="${source.resources}">
<exclude name="log4j.properties"/>
<include name="**/*.properties"/>
Expand Down
Loading

0 comments on commit 3f1eb93

Please sign in to comment.