Skip to content

Commit

Permalink
Tag Jaybird 2.2.4 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrotteveel
mrotteveel committed Dec 7, 2013
1 parent d992bde commit 15cc0dd
Show file tree
Hide file tree
Showing 509 changed files with 34,881 additions and 41,573 deletions.
14 changes: 10 additions & 4 deletions .classpath
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
<?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/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 excluding="org/firebirdsql/hibernate/" kind="src" path="src/test"/>
<classpathentry kind="src" path="src/pool"/>
<classpathentry kind="src" path="src/openoffice"/>
<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/jdbc_40"/>
<classpathentry kind="lib" path="src/lib/fscontext.jar"/>
<classpathentry kind="lib" path="src/lib/providerutil.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="src/lib/log4j-core.jar"/>
<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="lib" path="lib/test/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/test/hamcrest-library-1.3.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.

5 changes: 0 additions & 5 deletions build.properties
View file

This file was deleted.

27 changes: 19 additions & 8 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
<?xml version="1.0"?>

<!-- ======================================================================= -->
<!-- JDBC-JCA Driver for Firebird build file -->
<!-- ======================================================================= -->

<!DOCTYPE project [
<!ENTITY init SYSTEM "./build/init.xml">
<!ENTITY util SYSTEM "./build/util.xml">
<!ENTITY compile SYSTEM "./build/compile.xml">
<!ENTITY archive SYSTEM "./build/archive.xml">
<!ENTITY deploy SYSTEM "./build/deploy.xml">
<!ENTITY test SYSTEM "./build/test.xml">
<!ENTITY dist SYSTEM "./build/dist.xml">
]>

<project name="FirebirdSQL" default="tests-report-html-pure-java" basedir=".">
<import file="build/init.xml"/>
<import file="build/util.xml"/>
<import file="build/compile.xml"/>
<import file="build/archive.xml"/>
<import file="build/deploy.xml"/>
<import file="build/test.xml"/>
<import file="build/dist.xml"/>
<import file="build/docs.xml"/>
&init;
&util;
&compile;
&archive;
&deploy;
&test;
&dist;
</project>


Expand Down
218 changes: 114 additions & 104 deletions build/archive.xml
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,120 @@
<?xml version="1.0"?>
<project name="archive">
<!-- =================================================================== -->
<!-- Creates the jar archives -->
<!-- =================================================================== -->
<target name="jars" depends="jar-j2ee, rar, jar-test, jar-sources, jar-javadoc"/>
<!-- =================================================================== -->
<!-- Creates the jar archives -->
<!-- =================================================================== -->
<target name="jars" depends="jar-j2ee, rar, jar-test, jar-sources, jar-javadoc"/>

<!-- Not really a jar operation but necessary :) -->
<target name="jar-j2ee" depends="compile">
<mkdir dir="${build.lib}"/>
<copy file="${module.thirdparty}/connector-api-1.5.jar" tofile="${build.lib}/connector-api-1.5.jar"/>
</target>
<!-- Not really a jar operation but necessary :) -->
<target name="jar-j2ee" depends="compile">
<mkdir dir="${build.lib}"/>
<copy file="${module.thirdparty}/connector-api-1.5.jar" tofile="${build.lib}/connector-api-1.5.jar"/>
</target>

<target name="jar-ra" depends="compile">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.simple}" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.resources}">
<exclude name="log4j.properties"/>
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</fileset>
<zipfileset dir="${build.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>
<target name="jar-ra" depends="compile">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.simple}" manifest="${build.etc}/default.mf">
<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"/>
</fileset>
<zipfileset dir="${build.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>

<jar jarfile="${build.lib}/${archive.name.full}" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.compatibility}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.resources}">
<exclude name="log4j.properties"/>
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</fileset>
<fileset dir="${build.j2ee}">
<include name="javax/**"/>
</fileset>
<zipfileset dir="${build.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>
</target>
<jar jarfile="${build.lib}/${archive.name.full}" manifest="${build.etc}/default.mf">
<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>
<fileset dir="${build.resources}">
<exclude name="log4j.properties"/>
<include name="**/*.properties"/>
</fileset>
<fileset dir="${build.j2ee}">
<include name="javax/**"/>
</fileset>
<zipfileset dir="${build.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>
</target>

<target name="jar-test" depends="compile">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">
<fileset dir="${build.test}">
<include name="org/firebirdsql/**"/>
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</fileset>
<fileset dir="${build.resources}">
<include name="**/*.properties"/>
</fileset>
</jar>
</target>
<target name="jar-test" depends="compile">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">
<fileset dir="${build.test}">
<include name="org/firebirdsql/**"/>
</fileset>
<fileset dir="${build.resources}">
<include name="**/*.properties"/>
</fileset>
</jar>
</target>

<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"/>
</fileset>
<zipfileset dir="${source.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>
</target>

<target name="jar-javadoc" depends="javadocs">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.javadoc}" update="true">
<fileset dir="${build.docs}">
</fileset>
</jar>
</target>

<target name="jar-sources" depends="set-driver-sources">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.sources}" update="true">
<fileset dir="${source.java}">
<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="${source.resources}">
<exclude name="log4j.properties"/>
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</fileset>
<zipfileset dir="${source.resources}/META-INF" prefix="META-INF">
<include name="services/**/*"/>
</zipfileset>
</jar>
</target>

<target name="jar-javadoc" depends="javadocs">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${archive.name.javadoc}" update="true">
<fileset dir="${build.docs}">
</fileset>
</jar>
</target>


<!-- =================================================================== -->
<!-- Creates the rar archives -->
<!-- =================================================================== -->
<target name="rar" depends="jar-ra">
<jar jarfile="${build.lib}/${archive.name.rar}" manifest="${build.etc}/default.mf">
<fileset dir="${build.lib}">
<include name="${archive.name.simple}"/>
</fileset>
<fileset dir="${build.resources}">
<include name="META-INF/ra.xml"/>
</fileset>
</jar>
</target>
</project>
<!-- =================================================================== -->
<!-- Creates the rar archives -->
<!-- =================================================================== -->
<target name="rar" depends="jar-ra">
<jar jarfile="${build.lib}/${archive.name.rar}" manifest="${build.etc}/default.mf">
<fileset dir="${build.lib}">
<include name="${archive.name.simple}"/>
</fileset>
<fileset dir="${build.resources}">
<include name="META-INF/ra.xml"/>
</fileset>
</jar>
</target>
3 changes: 0 additions & 3 deletions build/clean.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
<?xml version="1.0"?>
<project name="clean">
</project>
Loading

0 comments on commit 15cc0dd

Please sign in to comment.