I think we can include the concurrent and log4j classes but not the (jboss)
j2ee or jaas classes in a jar of our own.

This will be a good start towards getting RC2 out quickly:-)

thanks
david jencks

On 2002.09.12 04:18:53 -0400 Uwe Jäger wrote:
> Anybody any comments?
>
>
> Hi,
>
> in order to have the proper error codes in the SQLException (and make
> firebirdsql more compatible with interclient) I have changed some catch
> (GDSException e) { throw new SQLException("some text"); } to [...] throw
> new FBSQLException(e); [...]. A patch is attached.
>
> I also would like to a a target to build.xml to build one jar containing
> the firebirdsql classes and the mini-j2ee classes. Patch also attached.
> If there are any legal problems, I will keep my private build.xml.
>
> Kind regards
> Uwe Jäger
>
>
> To unsubscribe from this group, send an email to:
> Firebird-Java-unsubscribe@yahoogroups.com
>
>
>
> Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/
>
>
>
>
> To unsubscribe from this group, send an email to:
> Firebird-Java-unsubscribe@yahoogroups.com
>
>
>
> Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/
>
>
>
> Index: build.xml
> ===================================================================
> RCS file: /cvsroot/firebird/client-java/build.xml,v
> retrieving revision 1.4
> diff -c -r1.4 build.xml
> *** build.xml 29 Aug 2002 13:41:01 -0000 1.4
> --- build.xml 5 Sep 2002 09:23:40 -0000
> ***************
> *** 271,276 ****
> --- 271,292 ----
> </jar>
> </target>
>
> + <target name="jar-alone" depends="compile">
> +
> + <mkdir dir="${build.lib}"/>
> + <jar jarfile="${build.lib}/firebirdsql.jar">
> + <fileset dir="${build.classes}">
> + <include name="org/firebirdsql/**"/>
> + </fileset>
> + <fileset dir="${build.resources}">
> + <include name="*.properties"/>
> + </fileset>
> + <fileset dir="${build.j2ee}">
> + <include name="javax/**"/>
> + </fileset>
> + </jar>
> + </target>
> +
> <target name="jar-test" depends="compile">
>
> <mkdir dir="${build.lib}"/>
> Index: src/main/org/firebirdsql/jdbc/FBBlob.java
> ===================================================================
> RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/jdbc/FBBlob.java,v
> retrieving revision 1.1
> diff -c -r1.1 FBBlob.java
> *** src/main/org/firebirdsql/jdbc/FBBlob.java 29 Aug 2002 13:41:04
> -0000 1.1
> --- src/main/org/firebirdsql/jdbc/FBBlob.java 5 Sep 2002 09:23:40
> -0000
> ***************
> *** 341,347 ****
> blob = c.openBlobHandle(blob_id);
> }
> catch (GDSException ge) {
> ! throw new SQLException("couldn't open blob: " + blob_id
> + " exception: " + ge.toString());
> }
> }
>
> --- 341,347 ----
> blob = c.openBlobHandle(blob_id);
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
>
> ***************
> *** 418,424 ****
> blob = c.createBlobHandle();
> }
> catch (GDSException ge) {
> ! throw new SQLException("Couldn't create new blob: " +
> ge);
> }
> if (blob_id == 0) {
> blob_id = blob.getBlobId();
> --- 418,424 ----
> blob = c.createBlobHandle();
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> if (blob_id == 0) {
> blob_id = blob.getBlobId();
> Index: src/main/org/firebirdsql/jdbc/FBPreparedStatement.java
> ===================================================================
> RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/jdbc/FBPreparedStatement.java,v
> retrieving revision 1.1
> diff -c -r1.1 FBPreparedStatement.java
> *** src/main/org/firebirdsql/jdbc/FBPreparedStatement.java 29 Aug
> 2002 13:41:04 -0000 1.1
> --- src/main/org/firebirdsql/jdbc/FBPreparedStatement.java 5 Sep
> 2002 09:23:40 -0000
> ***************
> *** 455,461 ****
> return (fixedStmt.getOutSqlda().sqld > 0);
> }
> catch (GDSException ge) {
> ! throw new SQLException("GDS exception: " + ge.toString());
> }
> }
>
> --- 455,461 ----
> return (fixedStmt.getOutSqlda().sqld > 0);
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
>
> Index: src/main/org/firebirdsql/jdbc/FBResultSet.java
> ===================================================================
> RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/jdbc/FBResultSet.java,v
> retrieving revision 1.1
> diff -c -r1.1 FBResultSet.java
> *** src/main/org/firebirdsql/jdbc/FBResultSet.java 29 Aug 2002
> 13:41:04 -0000 1.1
> --- src/main/org/firebirdsql/jdbc/FBResultSet.java 5 Sep 2002
> 09:23:40 -0000
> ***************
> *** 2558,2564 ****
> isBeforeFirst = true;
> }
> catch (GDSException ge) {
> ! throw new SQLException("fetch problem: " +
> ge.toString());
> }
> }
>
> --- 2558,2564 ----
> isBeforeFirst = true;
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
>
> ***************
> *** 2593,2599 ****
> return true;
> }
> catch (GDSException ge) {
> ! throw new SQLException("fetch problem: " +
> ge.toString());
> }
> }
> }
> --- 2593,2599 ----
> return true;
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
> }
> ***************
> *** 2663,2669 ****
> c.closeStatement(stmt, false);
> }
> catch (GDSException ge) {
> ! throw new SQLException("fetch problem: " +
> ge.toString());
> }
> }
>
> --- 2663,2669 ----
> c.closeStatement(stmt, false);
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
>
> Index: src/main/org/firebirdsql/jdbc/FBStatement.java
> ===================================================================
> RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/jdbc/FBStatement.java,v
> retrieving revision 1.1
> diff -c -r1.1 FBStatement.java
> *** src/main/org/firebirdsql/jdbc/FBStatement.java 29 Aug 2002
> 13:41:05 -0000 1.1
> --- src/main/org/firebirdsql/jdbc/FBStatement.java 5 Sep 2002
> 09:23:41 -0000
> ***************
> *** 217,223 ****
> c.closeStatement(fixedStmt, true);
> }
> catch (GDSException ge) {
> ! throw new SQLException("could not close statement: " +
> ge.toString());
> }
> finally {
> fixedStmt = null;
> --- 217,223 ----
> c.closeStatement(fixedStmt, true);
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> finally {
> fixedStmt = null;
> ***************
> *** 584,590 ****
> return resCount;
> }
> catch (GDSException ge) {
> ! throw new SQLException("Could not get UpdateCount: " +
> ge);
> }
> }
> }
> --- 584,590 ----
> return resCount;
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> }
> }
> ***************
> *** 877,883 ****
> c.closeStatement(fixedStmt, false);
> }
> catch (GDSException ge) {
> ! throw new SQLException("problem closing resultset: " +
> ge);
> }
> currentRs = null;
> }
> --- 877,883 ----
> c.closeStatement(fixedStmt, false);
> }
> catch (GDSException ge) {
> ! throw new FBSQLException(ge);
> }
> currentRs = null;
> }
>
>