Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java
 (added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java
 Thu Apr 28 12:05:42 2005
@@ -0,0 +1,91 @@
+/*
+
+   Derby - Class org.apache.derby.client.net.StatementRequestInterface
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.client.net;
+
+import org.apache.derby.client.am.SqlException;
+import org.apache.derby.client.am.Section;
+import org.apache.derby.client.am.ColumnMetaData;
+
+// In general, all required data is passed.
+// In addition, Material Statement objects are passed for convenient access to 
any material statement caches.
+// Implementations of this interface should not dereference common layer 
Statement state, as it is passed in,
+// but may dereference material layer Statement state if necessary for 
performance.
+public interface StatementRequestInterface
+{
+  public void writeExecuteImmediate (NetStatement materialStatement,
+                                     String sql,
+                                     Section section) throws SqlException;
+
+  public void writePrepareDescribeOutput (NetStatement materialStatement,
+                                         String sql,
+                                         Section section) throws SqlException;
+
+  public void writePrepare (NetStatement materialStatement,
+                           String sql,
+                           Section section) throws SqlException;
+
+  public void writeOpenQuery (NetStatement materialStatement,
+                              Section section,
+                              int fetchSize,
+                              int resultSetType) throws SqlException;
+
+  public void writeExecute (NetPreparedStatement materialPreparedStatement,
+                            Section section,
+                            org.apache.derby.client.am.ColumnMetaData 
parameterMetaData,
+                            Object[] inputs,
+                            int numInputColumns,
+                            boolean outputExpected,
+                            // This is a hint to the material layer that more 
write commands will follow.
+                            // It is ignored by the driver in all cases except 
when blob data is written,
+                            // in which case this boolean is used to optimize 
the implementation.
+                            // Otherwise we wouldn't be able to chain after 
blob data is sent.
+                            // If we could always chain a no-op DDM after 
every execute that writes blobs
+                            // then we could just always set the chaining flag 
to on for blob send data
+                            boolean chainedWritesFollowingSetLob) throws 
SqlException;
+
+
+  public void writeOpenQuery (NetPreparedStatement materialPreparedStatement,
+                              Section section,
+                              int fetchSize,
+                              int resultSetType,
+                              int numInputColumns,
+                              ColumnMetaData parameterMetaData,
+                              Object[] inputs) throws SqlException;
+
+  public void writeDescribeInput (NetPreparedStatement 
materialPreparedStatement,
+                                 Section section) throws SqlException;
+
+  public void writeDescribeOutput (NetPreparedStatement 
materialPreparedStatement,
+                                  Section section) throws SqlException;
+
+  public void writeExecuteCall (NetStatement materialStatement,
+                               boolean outputExpected,
+                                String procedureName,
+                                Section section,
+                                int fetchSize,
+                                boolean suppressResultSets, // set to true for 
batched calls
+                                int resultSetType,
+                                ColumnMetaData parameterMetaData,
+                                Object[] inputs) throws SqlException;
+
+
+  public void writeSetSpecialRegister (java.util.ArrayList sqlsttList) throws 
SqlException;
+}

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java 
(added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java 
Thu Apr 28 12:05:42 2005
@@ -0,0 +1,1249 @@
+/*
+
+   Derby - Class org.apache.derby.client.net.Typdef
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.client.net;
+
+import org.apache.derby.client.am.DisconnectException;
+import org.apache.derby.client.am.SignedBinary;
+import org.apache.derby.client.am.Cursor;
+//
+//  General Notes
+//  Descriptors are overriden using two distinct mechanisms
+//  - new TYPDEFNAM and TYPDEFOVR specifications which override environmental
+//    specifications originally established at connect time.
+//  - MDD/SDA pairs providing specific field level overrides for user data
+//    not conforming to the TYPDEFNAM and TYPDEFOVR specifications currently
+//    in effect.  Grouping triplets then refer to the new SDAs to specify
+//    the actual representation of the user data.
+//  - There are two types of early descriptor triplets, the T and the M 
triplets.
+//        Early
+//        ---------------------------
+//        Environmental   Grp Row Arr
+//        TTTTTTTTTTTTT   MMMMMMMMMMM
+//      - The T triplets are established by the TYPDEFNAM and TYPDEFOVR values.
+//        These can be overridden for any command or reply by specifying
+//        a new value for TYPDEFNAM and TYPDEFOVR.
+//      - The M triplets are established by the MGRLVL parameter on EXCSAT.
+//        They define PROTOCOL information units such as the SQLCA.
+//        These grouping and structuring triplets cannot be overriden
+//        Any change would mean a change in what information was exchanged
+//        rather than just how that information would be represented.
+//  - There are two types of late descriptor triplets, the O and U triplets.
+//        Late
+//        ---------------------------
+//        Environmental   Grp Row Arr
+//        OOOOOOOOOOOOO   UUUUUUUUUUU
+//      - The O triplets provide specific overrides.
+//      - The U triplets define actual user data, sometimes in combination
+//        with PROTOCOL information units.  The U triplets reference O triplets
+//        and both T triplets and M triplets (which in turn reference T 
triplets).
+//   - Rules for assigning LIDs to O triplets
+//      - select LID within range of 1 to 255.
+//      - select LID which doesn't interfere with references to early triplets
+//        or O triplets.
+//
+//  requirements
+//  - if this object handles overrides, they are only in effect for one
+//    command or the reply to one command.  Make sure that the correct
+//    "in effect" overrides are used especially when MDD overrides are present.
+//  - raise error if no CCSIDMBC or CCSIDDBC has been specified for mixed or
+//    double byte data.  Return SQLSTATE 57017 with 0 as source CCSID token.
+//  Possible errors:
+//  - check for valid lid at SQLAM level.
+//      - if the lid is greater than the max
+//        supported lid then the descriptor is invalid for the supported SQLAM 
level.
+//  Error Checking and Reporting Notes taken from PROTOCOL manual.
+//    - If the receiver of an FDODSC finds it in error, the error must
+//      be reported with a DDM message DSCINVRM.  If the descriptor
+//      passes PROTOCOL validity checks, but the data does not match the
+//      descriptors, the mismatch must be reported with a DDM message DTAMCHRM.
+//      so descriptor must be correct and valid and then the data must match
+//      the descriptor.
+//    - Possible General Errors
+//      - 01 FD:OCA Triplet not used in PROTOCOL descriptors or Type code 
invalid.
+//      - 02 Triplet Sequence Error: the two possible sequences are:
+//           1.) GDA,(CPT,)RLO<,RLO><== normal case with no overrrides
+//           2.) MDD,SDA,(MDD,SDA,)MDD,GDA,(CPT,)\
+//               MDD,RLO<,MDD,RLO>
+//               where () indicates an optional repeating group and <> 
indicates
+//               a field allowed only when arrays are expected.
+//      - 03 An array description is required, and this one does not
+//           describe an array (probably too many or too few RLO triplets).
+//      - 04 A row description is required, and this one does not describe a 
row
+//           probably too many or too few RLO triplets.
+//      - 05 Late Environmental Descriptor just received not supported 
(probably
+//           due to non-support of requested overrides).
+//      - 06 Malformed triplet; missing required parameter.
+//      - 07 Parameter value not acceptable.
+//    - Possible MDD Errors
+//      - 11 MDD present is not recognized as PROTOCOL Descriptor
+//      - 12 MDD class not recognized as valid PROTOCOL class.
+//      - 13 MDD type not recognized as valid PROTOCOL type.
+//    - Possible SDA Errors
+//      - 21 Representation incompatible with PROTOCOL type (in prior MDD).
+//      - 22 CCSID not supported
+//    - Possible GDA/CPT Errors
+//      - 32 GDA references a LID that is not an SDA or GDA.
+//      - 33 GDA length override exceeds limits.
+//      - 34 GDA precision exceeds limits.
+//      - 35 GDA scale > precision or scale negative
+//      - 36 GDA length override missing or incompatible with protocol type.
+//    - Possible RLO Errors
+//      - 41 RLO references a LID that is not an RLO or GDA
+//      - 42 RLO fails to reference a required GDA or RLO (for example, QRYDSC
+//           must include a reference to SQLCAGRP).
+//
+//  Nullable SQL and PROTOCOL types are all odd numbers and nullable type is
+//  one number higher than the related non-nullable type
+//
+//  earlyTTriplets
+//  late0Triplets
+//
+// typdef end
+
+public class Typdef implements java.lang.Cloneable
+{
+  //---------------------navigational 
members-----------------------------------
+
+  
//-----------------------------state------------------------------------------
+
+  // double byte character set
+  static final short CCSIDDBC = 1;
+
+  // multi-byte character set
+  static final short CCSIDMBC = 2;
+
+  // single byte character set
+  static final short CCSIDSBC = 3;
+
+  // No CCSID
+  static final short NOCCSID = 0;
+
+  // fixed length
+  static final short FIXEDLENGTH = 0;
+
+  // 2-byte variable length
+  static final short TWOBYTELENGTH = 1;
+
+  // 1-byte variable length
+  static final short ONEBYTELENGTH = 2;
+
+  // decimal length
+  static final short DECIMALLENGTH = 3;
+
+  // lob length
+  static final short LOBLENGTH = 4;
+
+  static final String UTF8ENCODING="UTF8";
+
+  private static final int OVERRIDE_TABLE_SIZE = 0xff;
+
+  private static final int[] fdocaTypeToRepresentationMap_ = {
+    /* 0x00 */ 0,
+    /* 0x01 */ Cursor.BYTES,                                    /* 
FDOCA_TYPE_FIXEDBYTES */
+    /* 0x02 */ Cursor.VARIABLE_STRING,                          /* 
FDOCA_TYPE_VARBYTES */
+    /* 0x03 */ Cursor.NULL_TERMINATED_BYTES,                    /* 
FDOCA_TYPE_NTBYTES */
+    /* 0x04 */ 0,
+    /* 0x05 */ 0,
+    /* 0x06 */ 0,
+    /* 0x07 */ Cursor.VARIABLE_SHORT_STRING,                    /* 
FDOCA_TYPE_PSCLBYTE */
+    /* 0x08 */ 0,
+    /* 0x09 */ 0,
+    /* 0x0A */ 0,
+    /* 0x0B */ 0,
+    /* 0x0C */ 0,
+    /* 0x0D */ 0,
+    /* 0x0E */ 0,
+    /* 0x0F */ 0,
+    /* 0x10 */ Cursor.STRING,                                   /* 
FDOCA_TYPE_FIXEDCHAR */
+    /* 0x11 */ Cursor.VARIABLE_STRING,                          /* 
FDOCA_TYPE_VARCHAR */
+    /* 0x12 */ 0,
+    /* 0x13 */ 0,
+    /* 0x14 */ Cursor.NULL_TERMINATED_STRING,                   /* 
FDOCA_TYPE_NTCHAR */
+    /* 0x15 */ 0,
+    /* 0x16 */ 0,
+    /* 0x17 */ 0,
+    /* 0x18 */ 0,
+    /* 0x19 */ Cursor.VARIABLE_SHORT_STRING,                    /* 
FDOCA_TYPE_PSCLCHAR */
+    /* 0x1A */ 0,
+    /* 0x1B */ 0,
+    /* 0x1C */ 0,
+    /* 0x1D */ 0,
+    /* 0x1E */ 0,
+    /* 0x1F */ 0,
+    /* 0x20 */ 0,
+    /* 0x21 */ 0,
+    /* 0x22 */ 0,
+    /* 0x23 */ SignedBinary.BIG_ENDIAN,                         /* 
FDOCA_TYPE_INTEGER_BE */
+    /* 0x24 */ SignedBinary.LITTLE_ENDIAN,                      /* 
FDOCA_TYPE_INTEGER_LE */
+    /* 0x25 */ 0,
+    /* 0x26 */ 0,
+    /* 0x27 */ 0,
+    /* 0x28 */ 0,
+    /* 0x29 */ 0,
+    /* 0x2A */ 0,
+    /* 0x2B */ 0,
+    /* 0x2C */ 0,
+    /* 0x2D */ 0,
+    /* 0x2E */ 0,
+    /* 0x2F */ 0,
+    /* 0x30 */ org.apache.derby.client.am.Decimal.PACKED_DECIMAL,       /* 
FDOCA_TYPE_DECIMAL */
+    /* 0x31 */ 0,
+    /* 0x32 */ 0,
+    /* 0x33 */ 0,
+    /* 0x34 */ 0,
+    /* 0x35 */ 0,
+    /* 0x36 */ 0,
+    /* 0x37 */ 0,
+    /* 0x38 */ 0,
+    /* 0x39 */ 0,
+    /* 0x3A */ 0,
+    /* 0x3B */ 0,
+    /* 0x3C */ 0,
+    /* 0x3D */ 0,
+    /* 0x3E */ 0,
+    /* 0x3F */ 0,
+    /* 0x40 */ 0,
+    /* 0x41 */ 0,
+    /* 0x42 */ 0,
+    /* 0x43 */ 0,
+    /* 0x44 */ 0,
+    /* 0x45 */ 0,
+    /* 0x46 */ 0,
+    /* 0x47 */ 0,
+    /* 0x48 */ 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT,    /* 
FDOCA_TYPE_FLOAT_IEEE */
+    /* 0x49 */ 0,
+    /* 0x4A */ 0,
+    /* 0x4B */ 0,
+    /* 0x4C */ 0,
+    /* 0x4D */ 0,
+    /* 0x4E */ 0,
+    /* 0x4F */ 0,
+    /* 0x50 */ 0,   /* FDOCA_TYPE_LOBBYTES */   // is 0 correct
+    /* 0x51 */ 0,   /* FDOCA_TYPE_LOBCHAR */    // is 0 correct
+    /* 0x52 */ 0,
+    /* 0x53 */ 0,
+    /* 0x54 */ 0,
+    /* 0x55 */ 0,
+    /* 0x56 */ 0,
+    /* 0x57 */ 0,
+    /* 0x58 */ 0,
+    /* 0x59 */ 0,
+    /* 0x5A */ 0,
+    /* 0x5B */ 0,
+    /* 0x5C */ 0,
+    /* 0x5D */ 0,
+    /* 0x5E */ 0,
+    /* 0x5F */ 0
+  };
+
+  protected static final FdocaSimpleDataArray[] environmentTables_ = {
+     /* 0x00 Empties */
+       null,
+     /* 0x01 Empties */
+       null,
+     /* 0x02 4-byte int */
+       new FdocaSimpleDataArray (0x02, FdocaConstants.FDOCA_TYPE_INTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+     /* 0x03 null 4-byte int */
+       new FdocaSimpleDataArray (0x03, FdocaConstants.FDOCA_TYPE_NINTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+     /* 0x04 2-byte int */
+       new FdocaSimpleDataArray (0x04, FdocaConstants.FDOCA_TYPE_INTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 2, FIXEDLENGTH ),
+     /* 0x05 null 2-byte int */
+       new FdocaSimpleDataArray (0x05, FdocaConstants.FDOCA_TYPE_NINTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 2, FIXEDLENGTH ),
+     /* 0x06 1-byte int */
+       new FdocaSimpleDataArray (0x06, FdocaConstants.FDOCA_TYPE_INTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 1, FIXEDLENGTH ),
+    /* 0x07 null 1-byte int */
+       new FdocaSimpleDataArray (0x07, FdocaConstants.FDOCA_TYPE_NINTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 1, FIXEDLENGTH ),
+     /* 0x08 16-byte bin float */
+       new FdocaSimpleDataArray (0x08, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 16, FIXEDLENGTH ),
+     /* 0x09 null 16-byte bin float */
+       new FdocaSimpleDataArray (0x09, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 16, FIXEDLENGTH ),
+     /* 0x0A 8-byte bin float */
+       new FdocaSimpleDataArray (0x0A, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 8, FIXEDLENGTH ),
+     /* 0x0B null 8-byte bin float */
+       new FdocaSimpleDataArray (0x0B, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 8, FIXEDLENGTH ),
+     /* 0x0C 4-byte bin float */
+       new FdocaSimpleDataArray (0x0C, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 4, FIXEDLENGTH ),
+     /* 0x0D null 4-byte bin float */
+       new FdocaSimpleDataArray (0x0D, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, 
org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 
0, 4, FIXEDLENGTH ),
+    /* 0x0E Fixed Decimal */
+       new FdocaSimpleDataArray (0x0E, FdocaConstants.FDOCA_TYPE_DECIMAL, 
org.apache.derby.client.am.Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, 
DECIMALLENGTH ),
+     /* 0x0F null Fixed Decimal */
+       new FdocaSimpleDataArray (0x0F, FdocaConstants.FDOCA_TYPE_NDECIMAL, 
org.apache.derby.client.am.Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, 
DECIMALLENGTH ),
+    /* 0x10 empties */
+       null,
+   /* 0x11 empties */
+       null,
+     /* 0x12 Numeric */
+       null,
+    /* 0x13 null Numeric */
+       null,
+     /* 0x14 Empties */
+       null,
+     /* 0x15 Empties */
+       null, 
+   /* 0x16 Big int */
+       new FdocaSimpleDataArray (0x16, FdocaConstants.FDOCA_TYPE_INTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 8, FIXEDLENGTH ),
+   /* 0x17 null Big int */
+       new FdocaSimpleDataArray (0x17, FdocaConstants.FDOCA_TYPE_NINTEGER_BE, 
SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 8, FIXEDLENGTH ),
+    /* 0x18 Large Obj Bytes Loc */
+       new FdocaSimpleDataArray (0x18, FdocaConstants.FDOCA_TYPE_FIXEDBYTES, 
0x00, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+    /* 0x19 null Large Obj Bytes Loc */
+       new FdocaSimpleDataArray (0x19, FdocaConstants.FDOCA_TYPE_NFIXEDBYTES, 
0x00, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+    /* 0x1A Empties */
+       null,
+    /* 0x1B null Large Obj Char Loc */
+       new FdocaSimpleDataArray (0x1B, FdocaConstants.FDOCA_TYPE_NFIXEDBYTES, 
0x00, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+    /* 0x1C Large Obj Char DBCS Loc */
+       new FdocaSimpleDataArray (0x1C, FdocaConstants.FDOCA_TYPE_FIXEDBYTES, 
0x00, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+   /* 0x1D null Large Obj Char DBCS Loc */
+       new FdocaSimpleDataArray (0x1D, FdocaConstants.FDOCA_TYPE_NFIXEDBYTES, 
0x00, NOCCSID, 0, 0, 4, FIXEDLENGTH ),
+    /* 0x1E Row Identifier */
+       new FdocaSimpleDataArray (0x1E, FdocaConstants.FDOCA_TYPE_VARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 40, TWOBYTELENGTH ),
+    /* 0x1F null Row Identifier */
+       new FdocaSimpleDataArray (0x1F, FdocaConstants.FDOCA_TYPE_NVARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 40, TWOBYTELENGTH ),
+    /* 0x20 Date */
+       new FdocaSimpleDataArray (0x20, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 10, FIXEDLENGTH ),
+    /* 0x21 null Date */
+       new FdocaSimpleDataArray (0x21, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 10, FIXEDLENGTH ),
+   /* 0x22 Time */
+       new FdocaSimpleDataArray (0x22, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 8, FIXEDLENGTH ),
+   /* 0x23 null Time */
+       new FdocaSimpleDataArray (0x23, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 8, FIXEDLENGTH ),
+    /* 0x24 Timestamp */
+       new FdocaSimpleDataArray (0x24, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 26, FIXEDLENGTH ),
+    /* 0x25 null Timestamp */
+       new FdocaSimpleDataArray (0x25, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 26, FIXEDLENGTH ),
+    /* 0x26 Fixed bytes */
+       new FdocaSimpleDataArray (0x26, FdocaConstants.FDOCA_TYPE_FIXEDBYTES, 
Cursor.BYTES, NOCCSID, 0, 0, 32767, FIXEDLENGTH ),
+    /* 0x27 null Fixed bytes */
+       new FdocaSimpleDataArray (0x27, FdocaConstants.FDOCA_TYPE_NFIXEDBYTES, 
Cursor.BYTES, NOCCSID, 0, 0, 32767, FIXEDLENGTH ),
+    /* 0x28 Variable bytes */
+       new FdocaSimpleDataArray (0x28, FdocaConstants.FDOCA_TYPE_VARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 32767, TWOBYTELENGTH ),
+    /* 0x29 null Variable bytes */
+       new FdocaSimpleDataArray (0x29, FdocaConstants.FDOCA_TYPE_NVARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 32767, TWOBYTELENGTH ),
+    /* 0x2A Long var bytes */
+       new FdocaSimpleDataArray (0x2A, FdocaConstants.FDOCA_TYPE_VARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 32767, TWOBYTELENGTH ),
+    /* 0x2B null Long var bytes */
+       new FdocaSimpleDataArray (0x2B, FdocaConstants.FDOCA_TYPE_NVARBYTES, 
Cursor.VARIABLE_BYTES, NOCCSID, 0, 1, 32767, TWOBYTELENGTH ),
+    /* 0x2C Nullterm bytes */
+       new FdocaSimpleDataArray (0x2C, FdocaConstants.FDOCA_TYPE_NTBYTES, 
Cursor.NULL_TERMINATED_BYTES, NOCCSID, 0, 1, 32767, FIXEDLENGTH ),
+    /* 0x2D null Nullterm bytes */
+       new FdocaSimpleDataArray (0x2D, FdocaConstants.FDOCA_TYPE_NNTBYTES, 
Cursor.NULL_TERMINATED_STRING, NOCCSID, 0, 1, 32767, FIXEDLENGTH ),
+    /* 0x2E Nullterm SBCS */
+       new FdocaSimpleDataArray (0x2E, FdocaConstants.FDOCA_TYPE_NTCHAR, 
Cursor.NULL_TERMINATED_STRING, CCSIDSBC, 1, 1, 32767, FIXEDLENGTH ),
+     /* 0x2F null Nullterm SBCS */
+       new FdocaSimpleDataArray (0x2F, FdocaConstants.FDOCA_TYPE_NNTCHAR, 
Cursor.NULL_TERMINATED_STRING, CCSIDSBC, 1, 1, 32767, FIXEDLENGTH ),
+     /* 0x30 Fix char SBCS */
+       new FdocaSimpleDataArray (0x30, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 32767, FIXEDLENGTH ),
+     /* 0x31 null Fix char SBCS */
+       new FdocaSimpleDataArray (0x31, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
Cursor.STRING, CCSIDSBC, 1, 0, 32767, FIXEDLENGTH ),
+     /* 0x32 Var char SBCS */
+       new FdocaSimpleDataArray (0x32, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+  /* 0x33 null Var char SBCS */
+       new FdocaSimpleDataArray (0x33, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+  /* 0x34 Long var SBCS */
+       new FdocaSimpleDataArray (0x34, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+  /* 0x35 null Long var SBCS */
+       new FdocaSimpleDataArray (0x35, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+      /* 0x36 Fix char DBCS */
+       new FdocaSimpleDataArray (0x36, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
0x00, CCSIDDBC, 2, 0, 16383, FIXEDLENGTH ),
+    /* 0x37 null Fix char DBCS */
+       new FdocaSimpleDataArray (0x37, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
0x00, CCSIDDBC, 2, 0, 16383, FIXEDLENGTH ),
+     /* 0x38 Var char DBCS */
+       new FdocaSimpleDataArray (0x38, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDDBC, 2, 1, 16383, TWOBYTELENGTH ),
+      /* 0x39 null Var char DBCS */
+       new FdocaSimpleDataArray (0x39, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDDBC, 2, 1, 16383, TWOBYTELENGTH ),
+     /* 0x3A Long var DBCS */
+       new FdocaSimpleDataArray (0x3A, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDDBC, 2, 1, 16383, TWOBYTELENGTH ),
+     /* 0x3B null Long var DBCS */
+       new FdocaSimpleDataArray (0x3B, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDDBC, 2, 1, 16383, TWOBYTELENGTH ),
+     /* 0x3C Fix char MBCS */
+       new FdocaSimpleDataArray (0x3C, FdocaConstants.FDOCA_TYPE_FIXEDCHAR, 
0x00, CCSIDMBC, 1, 0, 32767, FIXEDLENGTH ),
+    /* 0x3D null Fix char MBCS */
+       new FdocaSimpleDataArray (0x3D, FdocaConstants.FDOCA_TYPE_NFIXEDCHAR, 
0x00, CCSIDMBC, 1, 0, 32767, FIXEDLENGTH ),
+    /* 0x3E Var char MBCS */
+       new FdocaSimpleDataArray (0x3E, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+     /* 0x3F null Var char MBCS */
+       new FdocaSimpleDataArray (0x3F, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+     /* 0x40 Long var MBCS */
+       new FdocaSimpleDataArray (0x40, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+    /* 0x41 null Long var MBCS */
+       new FdocaSimpleDataArray (0x41, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+    /* 0x42 Nullterm MBCS */
+       new FdocaSimpleDataArray (0x42, FdocaConstants.FDOCA_TYPE_NTCHAR, 
Cursor.NULL_TERMINATED_STRING, CCSIDMBC, 1, 1, 32767, FIXEDLENGTH ),
+     /* 0x43 null Nullterm MBCS */
+       new FdocaSimpleDataArray (0x43, FdocaConstants.FDOCA_TYPE_NNTCHAR, 
Cursor.NULL_TERMINATED_STRING, CCSIDMBC, 1, 1, 32767, FIXEDLENGTH ),
+    /* 0x44 L String bytes */
+       new FdocaSimpleDataArray (0x44, FdocaConstants.FDOCA_TYPE_PSCLBYTE, 
Cursor.VARIABLE_SHORT_STRING, NOCCSID, 0, 1, 255, ONEBYTELENGTH ),
+    /* 0x45 null L String bytes */
+       new FdocaSimpleDataArray (0x45, FdocaConstants.FDOCA_TYPE_NPSCLBYTE, 
Cursor.VARIABLE_SHORT_STRING, NOCCSID, 0, 1, 255, ONEBYTELENGTH ),
+    /* 0x46 L String SBCS */
+       new FdocaSimpleDataArray (0x46, FdocaConstants.FDOCA_TYPE_PSCLCHAR, 
Cursor.VARIABLE_SHORT_STRING, CCSIDSBC, 1, 1, 255, ONEBYTELENGTH ),
+    /* 0x47 null L String SBCS */
+       new FdocaSimpleDataArray (0x47, FdocaConstants.FDOCA_TYPE_NPSCLCHAR, 
Cursor.VARIABLE_SHORT_STRING, CCSIDSBC, 1, 1, 255, ONEBYTELENGTH ),
+    /* 0x48 L String MBCS */
+       new FdocaSimpleDataArray (0x48, FdocaConstants.FDOCA_TYPE_PSCLCHAR, 
Cursor.VARIABLE_SHORT_STRING, CCSIDMBC, 1, 1, 255, ONEBYTELENGTH ),
+    /* 0x49 null L String MBCS */
+       new FdocaSimpleDataArray (0x49, FdocaConstants.FDOCA_TYPE_NPSCLCHAR, 
Cursor.VARIABLE_SHORT_STRING, CCSIDMBC, 1, 1, 255, ONEBYTELENGTH ),
+    /* 0x4A Empties */
+       null,
+    /* 0x4B Empties */
+       null,
+     /* 0x4C  SBCS */ 
+       new FdocaSimpleDataArray (0x4C, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+     /* 0x4D null  SBCS */
+       new FdocaSimpleDataArray (0x4D, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDSBC, 1, 1, 32767, TWOBYTELENGTH ),
+     /* 0x4E  MBCS */
+       new FdocaSimpleDataArray (0x4E, FdocaConstants.FDOCA_TYPE_VARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+    /* 0x4F null  MBCS */
+       new FdocaSimpleDataArray (0x4F, FdocaConstants.FDOCA_TYPE_NVARCHAR, 
Cursor.VARIABLE_STRING, CCSIDMBC, 1, 1, 32767, TWOBYTELENGTH ),
+     /* 0x50 Empties */
+       null,
+    /* 0x51 Empties */
+       null,
+    /* 0x52 Empties */
+       null,
+     /* 0x53 Empties */
+       null,
+    /* 0x54 Empties */
+       null,
+    /* 0x55 Empties */
+       null,
+    /* 0x56 Empties */
+       null,
+    /* 0x57 Empties */
+       null,
+    /* 0x58 Empties */
+       null,
+    /* 0x59 Empties */
+       null,
+    /* 0x5A Empties */
+       null,
+    /* 0x5B Empties */
+       null,
+    /* 0x5C Empties */
+       null,
+    /* 0x5D Empties */
+       null,
+    /* 0x5E Empties */
+       null,
+    /* 0x5F Empties */
+       null,
+    /* 0x60 Empties */
+       null,
+    /* 0x61 Empties */
+       null,
+    /* 0x62 Empties */
+       null,
+     /* 0x63 Empties */
+       null,
+     /* 0x64 Empties */
+       null,
+     /* 0x65 Empties */
+       null,
+     /* 0x66 Empties */
+       null,
+    /* 0x67 Empties */
+       null,
+    /* 0x68 Empties */
+       null,
+    /* 0x69 Empties */
+       null,
+    /* 0x6A Empties */
+       null,
+    /* 0x6B Empties */
+       null,
+    /* 0x6C Empties */
+       null,
+    /* 0x6D Empties */
+       null,
+    /* 0x6E Empties */
+       null,
+    /* 0x6F Empties */
+       null,
+    /* 0x70 Empties */
+       null,
+    /* 0x71 Empties */
+       null,
+    /* 0x72 Empties */
+       null,
+    /* 0x73 Empties */
+       null,
+    /* 0x74 Empties */
+       null,
+     /* 0x75 Empties */
+       null,
+    /* 0x76 Empties */
+       null,
+    /* 0x77 Empties */
+     null,
+   /* 0x78 Empties */
+       null,
+   /* 0x79 Empties */
+       null,
+   /* 0x7A Empties */
+       null,
+   /* 0x7B Empties */
+       null,
+   /* 0x7C Empties */
+       null,
+   /* 0x7D Empties */
+       null,
+    /* 0x7E Empties */
+       null,
+    /* 0x7F Empties */
+       null,
+   /* 0x80 Empties */
+       null,
+   /* 0x81 Empties */
+       null,
+   /* 0x82 Empties */
+       null,
+    /* 0x83 Empties */
+       null,
+   /* 0x84 Empties */
+       null,
+    /* 0x85 Empties */
+       null,
+   /* 0x86 Empties */
+       null,
+   /* 0x87 Empties */
+       null,
+   /* 0x88 Empties */
+       null,
+   /* 0x89 Empties */
+       null,
+   /* 0x8A Empties */
+       null,
+    /* 0x8B Empties */
+       null,
+    /* 0x8C Empties */
+       null,
+   /* 0x8D Empties */
+       null,
+   /* 0x8E Empties */
+       null,
+   /* 0x8F Empties */
+       null,
+   /* 0x90 Empties */
+       null,
+   /* 0x91 Empties */
+       null,
+   /* 0x92 Empties */
+       null,
+   /* 0x93 Empties */
+       null,
+   /* 0x94 Empties */
+       null,
+   /* 0x95 Empties */
+       null,
+   /* 0x96 Empties */
+       null,
+   /* 0x97 Empties */
+       null,
+   /* 0x98 Empties */
+       null,
+   /* 0x99 Empties */
+       null,
+   /* 0x9A Empties */
+       null,
+   /* 0x9B Empties */
+       null,
+   /* 0x9C Empties */
+       null,
+   /* 0x9D Empties */
+       null,
+   /* 0x9E Empties */
+       null,
+   /* 0x9F Empties */
+       null,
+   /* 0xA0 Empties */
+       null,
+   /* 0xA1 Empties */
+       null,
+   /* 0xA2 Empties */
+       null,
+   /* 0xA3 Empties */
+       null,
+   /* 0xA4 Empties */
+       null,
+   /* 0xA5 Empties */
+       null,
+    /* 0xA6 Empties */
+       null,
+   /* 0xA7 Empties */
+       null,
+    /* 0xA8 Empties */
+       null,
+    /* 0xA9 Empties */
+       null,
+    /* 0xAA Empties */
+       null,
+     /* 0xAB Empties */
+       null,
+    /* 0xAC Empties */
+       null,
+     /* 0xAD Empties */
+       null,
+     /* 0xAE Empties */
+       null,
+     /* 0xAF Empties */
+       null,
+    /* 0xB0 Empties */
+       null,
+    /* 0xB1 Empties */
+       null,
+     /* 0xB2 Empties */
+       null,
+    /* 0xB3 Empties */
+       null,
+    /* 0xB4 Empties */
+       null,
+     /* 0xB5 Empties */
+       null,
+    /* 0xB6 Empties */
+       null,
+     /* 0xB7 Empties */
+       null,
+    /* 0xB8 Empties */
+       null,
+     /* 0xB9 Empties */
+       null,
+    /* 0xBA Empties */
+       null,
+     /* 0xBB Empties */
+       null,
+    /* 0xBC Empties */
+       null,
+     /* 0xBD Empties */
+       null,
+    /* 0xBE Empties */
+       null,
+    /* 0xBF Empties */
+       null,
+    /* 0xC0 Empties */
+       null,
+    /* 0xC1 Empties */
+       null,
+    /* 0xC2 Empties */
+       null,
+    /* 0xC3 Empties */
+       null,
+    /* 0xC4 Empties */
+       null,
+    /* 0xC5 Empties */
+       null,
+    /* 0xC6 Empties */
+       null,
+    /* 0xC7 Empties */
+       null,
+     /* 0xC8 Large object bytes */
+       new FdocaSimpleDataArray (0xC8, FdocaConstants.FDOCA_TYPE_LOBBYTES, 
0x00, NOCCSID, 0, 1, 8, LOBLENGTH ),
+     /* 0xC9 null Large object bytes */
+       new FdocaSimpleDataArray (0xC9, FdocaConstants.FDOCA_TYPE_NLOBBYTES, 
0x00, NOCCSID, 0, 1, 8, LOBLENGTH ),
+     /* 0xCA Large object char SBCS */
+       new FdocaSimpleDataArray (0xCA, FdocaConstants.FDOCA_TYPE_LOBCHAR, 
Cursor.SBCS_CLOB, CCSIDSBC, 1, 1, 8, LOBLENGTH ),
+     /* 0xCB null Large object char SBCS */
+       new FdocaSimpleDataArray (0xCB, FdocaConstants.FDOCA_TYPE_NLOBCHAR, 
Cursor.SBCS_CLOB, CCSIDSBC, 1, 1, 8, LOBLENGTH ),
+     /* 0xCC Large object char DBCS */
+       new FdocaSimpleDataArray (0xCC, FdocaConstants.FDOCA_TYPE_LOBCHAR, 
Cursor.DBCS_CLOB, CCSIDDBC, 2, 1, 8, LOBLENGTH ),
+     /* 0xCD null Large object char DBCS */
+       new FdocaSimpleDataArray (0xCD, FdocaConstants.FDOCA_TYPE_NLOBCHAR, 
Cursor.DBCS_CLOB, CCSIDDBC, 2, 1, 8, LOBLENGTH ),
+     /* 0xCE Large object char MBCS */
+       new FdocaSimpleDataArray (0xCE, FdocaConstants.FDOCA_TYPE_LOBCHAR, 
Cursor.MBCS_CLOB, CCSIDMBC, 1, 1, 8, LOBLENGTH ),
+     /* 0xCF null Large object char MBCS */
+       new FdocaSimpleDataArray (0xCF, FdocaConstants.FDOCA_TYPE_NLOBCHAR, 
Cursor.MBCS_CLOB, CCSIDMBC, 1, 1, 8, LOBLENGTH ),
+  };
+
+  private static final int[] protocolToJdbcTypes_ = {
+    0x00, // 0x00 Empties
+    0x00, // 0x01 Empties
+    java.sql.Types.INTEGER, // 0x02 4-byte int
+    java.sql.Types.INTEGER, // 0x03 null 4-byte int
+    java.sql.Types.SMALLINT, // 0x04 2-byte int
+    java.sql.Types.SMALLINT, // 0x05 null 2-byte int
+    java.sql.Types.TINYINT, // 0x06 1-byte int
+    java.sql.Types.TINYINT, // 0x07 null 1-byte int
+    java.sql.Types.DECIMAL, // 0x08 16-byte bin float
+    java.sql.Types.DECIMAL, // 0x09 null 16-byte bin float
+    java.sql.Types.DOUBLE, // 0x0A 8-byte bin float
+    java.sql.Types.DOUBLE, // 0x0B null 8-byte bin float
+    java.sql.Types.REAL, // 0x0C 4-byte bin float
+    java.sql.Types.REAL, // 0x0D null 4-byte bin float
+    java.sql.Types.DECIMAL, // 0x0E Fixed Decimal
+    java.sql.Types.DECIMAL, // 0x0F null Fixed Decimal
+    java.sql.Types.DECIMAL, // 0x10 Zone Decimal
+    java.sql.Types.DECIMAL, // 0x11 null Zone Decimal
+    java.sql.Types.DECIMAL, // 0x12 Numeirc
+    java.sql.Types.DECIMAL, // 0x13 null Numeric
+    0x00, // 0x14 Empties
+    0x00, // 0x15 Empties
+    java.sql.Types.BIGINT, // 0x16 Big int
+    java.sql.Types.BIGINT, // 0x17 null Big int
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    java.sql.Types.DATE, // 0x20 Date
+    java.sql.Types.DATE, // 0x21 null Date
+    java.sql.Types.TIME, // 0x22 Time
+    java.sql.Types.TIME, // 0x23 null Time
+    java.sql.Types.TIMESTAMP, // 0x24 Timestamp
+    java.sql.Types.TIMESTAMP, // 0x25 null Timestamp
+    java.sql.Types.BINARY, // 0x26 Fixed bytes
+    java.sql.Types.BINARY, // 0x27 null Fixed bytes
+    java.sql.Types.VARBINARY, // 0x28 Variable bytes
+    java.sql.Types.VARBINARY, // 0x29 null Variable bytes
+    java.sql.Types.LONGVARBINARY, // 0x2A Long var bytes
+    java.sql.Types.LONGVARBINARY, // 0x2B null Long var bytes
+    java.sql.Types.VARBINARY, // 0x2C Nullterm bytes
+    java.sql.Types.VARBINARY, // 0x2D null Nullterm bytes
+    java.sql.Types.CHAR, // 0x2E Nullterm SBCS
+    java.sql.Types.CHAR, // 0x2F null Nullterm SBCS
+    java.sql.Types.CHAR, // 0x30 Fix char SBCS
+    java.sql.Types.CHAR, // 0x31 null Fix char SBCS
+    java.sql.Types.VARCHAR, // 0x32 Var char SBCS
+    java.sql.Types.VARCHAR, // 0x33 null Var char SBCS
+    java.sql.Types.LONGVARCHAR, // 0x34 Long var SBCS
+    java.sql.Types.LONGVARCHAR, // 0x35 null Long var SBCS
+    0x00, // 0x36 Empties
+    0x00, // 0x37 Empties
+    0x00, // 0x38 Empties
+    0x00, // 0x39 Empties
+    0x00, // 0x3A Empties
+    0x00, // 0x3B Empties
+    // The following will have to be changed later for situations where
+    java.sql.Types.CHAR, // 0x3C Fix char MBCS
+    java.sql.Types.CHAR, // 0x3D null Fix char MBCS
+    java.sql.Types.VARCHAR, // 0x3E Var char MBCS
+    java.sql.Types.VARCHAR, // 0x3F null Var char MBCS
+    java.sql.Types.LONGVARCHAR, // 0x40 Long var MBCS
+    java.sql.Types.LONGVARCHAR, // 0x41 null Long var MBCS
+    java.sql.Types.CHAR, // 0x42 Nullterm MBCS
+    java.sql.Types.CHAR, // 0x43 null Nullterm MBCS
+    java.sql.Types.VARBINARY, // 0x44 L String bytes
+    java.sql.Types.VARBINARY, // 0x45 null L String bytes
+    java.sql.Types.VARCHAR, // 0x46 L String SBCS
+    java.sql.Types.VARCHAR, // 0x47 null L String SBCS
+    java.sql.Types.VARCHAR, // 0x48 L String MBCS
+    java.sql.Types.VARCHAR, // 0x49 null L String MBCS
+    0x00, // 0x4A Empties
+    0x00, // 0x4B Empties
+    java.sql.Types.VARCHAR, // 0x4C SBCS
+    java.sql.Types.VARCHAR, // 0x4D null SBCS
+    java.sql.Types.VARCHAR, // 0x4E MBCS
+    java.sql.Types.VARCHAR, // 0x4F null MBCS
+    0x00, // 0x50 Empties
+    0x00, // 0x51 Empties
+    0x00, // 0x52 Empties
+    0x00, // 0x53 Empties
+    0x00, // 0x54 Empties
+    0x00, // 0x55 Empties
+    0x00, // 0x56 Empties
+    0x00, // 0x57 Empties
+    0x00, // 0x58 Empties
+    0x00, // 0x59 Empties
+    0x00, // 0x5A Empties
+    0x00, // 0x5B Empties
+    0x00, // 0x5C Empties
+    0x00, // 0x5D Empties
+    0x00, // 0x5E Empties
+    0x00, // 0x5F Empties
+    0x00, // 0x60 Empties
+    0x00, // 0x61 Empties
+    0x00, // 0x62 Empties
+    0x00, // 0x63 Empties
+    0x00, // 0x64 Empties
+    0x00, // 0x65 Empties
+    0x00, // 0x66 Empties
+    0x00, // 0x67 Empties
+    0x00, // 0x68 Empties
+    0x00, // 0x69 Empties
+    0x00, // 0x6A Empties
+    0x00, // 0x6B Empties
+    0x00, // 0x6C Empties
+    0x00, // 0x6D Empties
+    0x00, // 0x6E Empties
+    0x00, // 0x6F Empties
+    0x00, // 0x70 Empties
+    0x00, // 0x71 Empties
+    0x00, // 0x72 Empties
+    0x00, // 0x73 Empties
+    0x00, // 0x74 Empties
+    0x00, // 0x75 Empties
+    0x00, // 0x76 Empties
+    0x00, // 0x77 Empties
+    0x00, // 0x78 Empties
+    0x00, // 0x79 Empties
+    0x00, // 0x7A Empties
+    0x00, // 0x7B Empties
+    0x00, // 0x7C Empties
+    0x00, // 0x7D Empties
+    0x00, // 0x7E Empties
+    0x00, // 0x7F Empties
+    0x00, // 0x80 Empties
+    0x00, // 0x81 Empties
+    0x00, // 0x82 Empties
+    0x00, // 0x83 Empties
+    0x00, // 0x84 Empties
+    0x00, // 0x85 Empties
+    0x00, // 0x86 Empties
+    0x00, // 0x87 Empties
+    0x00, // 0x88 Empties
+    0x00, // 0x89 Empties
+    0x00, // 0x8A Empties
+    0x00, // 0x8B Empties
+    0x00, // 0x8C Empties
+    0x00, // 0x8D Empties
+    0x00, // 0x8E Empties
+    0x00, // 0x8F Empties
+    0x00, // 0x90 Empties
+    0x00, // 0x91 Empties
+    0x00, // 0x92 Empties
+    0x00, // 0x93 Empties
+    0x00, // 0x94 Empties
+    0x00, // 0x95 Empties
+    0x00, // 0x96 Empties
+    0x00, // 0x97 Empties
+    0x00, // 0x98 Empties
+    0x00, // 0x99 Empties
+    0x00, // 0x9A Empties
+    0x00, // 0x9B Empties
+    0x00, // 0x9C Empties
+    0x00, // 0x9D Empties
+    0x00, // 0x9E Empties
+    0x00, // 0x9F Empties
+    0x00, // 0xA0 Empties
+    0x00, // 0xA1 Empties
+    0x00, // 0xA2 Empties
+    0x00, // 0xA3 Empties
+    0x00, // 0xA4 Empties
+    0x00, // 0xA5 Empties
+    0x00, // 0xA6 Empties
+    0x00, // 0xA7 Empties
+    0x00, // 0xA8 Empties
+    0x00, // 0xA9 Empties
+    0x00, // 0xAA Empties
+    0x00, // 0xAB Empties
+    0x00, // 0xAC Empties
+    0x00, // 0xAD Empties
+    0x00, // 0xAE Empties
+    0x00, // 0xAF Empties
+    0x00, // 0xB0 Empties
+    0x00, // 0xB1 Empties
+    0x00, // 0xB2 Empties
+    0x00, // 0xB3 Empties
+    0x00, // 0xB4 Empties
+    0x00, // 0xB5 Empties
+    0x00, // 0xB6 Empties
+    0x00, // 0xB7 Empties
+    0x00, // 0xB8 Empties
+    0x00, // 0xB9 Empties
+    0x00, // 0xBA Empties
+    0x00, // 0xBB Empties
+    0x00, // 0xBC Empties
+    0x00, // 0xBD Empties
+    0x00, // 0xBE Empties
+    0x00, // 0xBF Empties
+    0x00, // 0xC0 Empties
+    0x00, // 0xC1 Empties
+    0x00, // 0xC2 Empties
+    0x00, // 0xC3 Empties
+    0x00, // 0xC4 Empties
+    0x00, // 0xC5 Empties
+    0x00, // 0xC6 Empties
+    0x00, // 0xC7 Empties
+    java.sql.Types.BLOB, // 0xC8 Large object bytes
+    java.sql.Types.BLOB, // 0xC9 null Large object bytes
+    java.sql.Types.CLOB, // 0xCA Large object char SBCS
+    java.sql.Types.CLOB, // 0xCB null Large object char SBCS
+    0x00,
+    0x00,
+    java.sql.Types.CLOB, // 0xCE Large object char MBCS
+    java.sql.Types.CLOB, // 0xCF null Large object char MBCS
+  };
+
+
+
+  private NetAgent netAgent_;
+  private String typdefnam_;
+
+  private int ccsidSbc_;
+  private boolean ccsidSbcSet_;
+  private String ccsidSbcEncoding_;
+
+  private int ccsidDbc_;
+  private boolean ccsidDbcSet_;
+  private String ccsidDbcEncoding_;
+
+
+  private int ccsidMbc_;
+  private boolean ccsidMbcSet_;
+  private String ccsidMbcEncoding_;
+
+
+  protected int environment_;
+  private boolean mddOverride_ = false;
+  private FdocaSimpleDataArray overrideTable_[] = new 
FdocaSimpleDataArray[OVERRIDE_TABLE_SIZE];
+
+  
//---------------------constructors/finalizer---------------------------------
+
+
+  Typdef (NetAgent netAgent) throws DisconnectException
+  {
+    this.initialize (netAgent, 0, false, 0, false, 0, false, null);
+  }
+
+  Typdef (NetAgent netAgent, int ccsidSbc,String typdefnam) throws 
DisconnectException
+  {
+    this.initialize (netAgent, ccsidSbc, true, 0, false, 0, false,typdefnam);
+  }
+
+  public Typdef (NetAgent netAgent, int ccsidSbc, String typdefnam, int 
ccsidDbc, int ccsidMbc) throws DisconnectException
+  {
+    this.initialize (netAgent, ccsidSbc, true, ccsidMbc, true, ccsidDbc, true, 
typdefnam);
+  }
+
+  private void initialize (NetAgent netAgent,
+                           int ccsidSbc,
+                           boolean ccsidSbcSet,
+                           int ccsidMbc,
+                           boolean ccsidMbcSet,
+                           int ccsidDbc,
+                           boolean ccsidDbcSet,
+                          String typdefnam
+                           ) throws DisconnectException
+  {
+    netAgent_ = netAgent;
+    ccsidSbc_ = ccsidSbc;
+    ccsidSbcSet_ = ccsidSbcSet;
+    ccsidSbcEncoding_ = null;
+    ccsidMbc_ = ccsidMbc;
+    ccsidMbcSet_ = ccsidMbcSet;
+    ccsidMbcEncoding_ = null;
+    ccsidDbc_ = ccsidDbc;
+    ccsidDbcSet_ = ccsidDbcSet;
+    ccsidDbcEncoding_ = null;
+    setTypdefnam (typdefnam);
+  }
+
+  //-------------------------private and package friendly 
methods---------------
+
+  String getTypdefnam ()
+  {
+    return typdefnam_;
+  }
+  void setTypdefnam (String typdefnam) throws DisconnectException
+  {
+    typdefnam_ = typdefnam;
+    if (typdefnam_ == null) 
+      return;
+
+  }
+
+  int getCcsidSbc ()
+  {
+    return ccsidSbc_;
+  }
+
+  void setCcsidSbc (int ccsid)
+  {
+    ccsidSbc_ = ccsid;
+    ccsidSbcSet_ = true;
+    ccsidSbcEncoding_ = null;
+  }
+
+  void clearCcsidSbc ()
+  {
+    ccsidSbc_ = 0;
+    ccsidSbcSet_ = false;
+    ccsidSbcEncoding_ = null;
+  }
+
+  boolean isCcsidSbcSet ()
+  {
+    return ccsidSbcSet_;
+  }
+
+  // analyze exception handling some more here
+  String getCcsidSbcEncoding() throws DisconnectException
+  {
+    if (ccsidSbcEncoding_ == null) ccsidSbcEncoding_ = UTF8ENCODING;
+    return ccsidSbcEncoding_;
+  }
+
+  int getCcsidDbc ()
+  {
+    return ccsidDbc_;
+  }
+
+  void setCcsidDbc (int ccsid)
+  {
+    ccsidDbc_ = ccsid;
+    ccsidDbcSet_ = true;
+    ccsidDbcEncoding_ = null;
+  }
+
+  void clearCcsidDbc ()
+  {
+    ccsidDbc_ = 0;
+    ccsidDbcSet_ = false;
+    ccsidDbcEncoding_ = null;
+  }
+
+  boolean isCcsidDbcSet ()
+  {
+    return ccsidDbcSet_;
+  }
+
+  // analyze exception handling some more here 
+  String getCcsidDbcEncoding() throws DisconnectException
+  {
+    if (ccsidDbcEncoding_ == null) ccsidDbcEncoding_ = UTF8ENCODING;
+    return ccsidDbcEncoding_;
+  }
+
+  int getCcsidMbc ()
+  {
+    return ccsidMbc_;
+  }
+
+  void setCcsidMbc (int ccsid)
+  {
+    ccsidMbc_ = ccsid;
+    ccsidMbcSet_ = true;
+    ccsidMbcEncoding_ = null;
+  }
+
+  void clearCcsidMbc ()
+  {
+    ccsidMbc_ = 0;
+    ccsidMbcSet_ = false;
+    ccsidMbcEncoding_ = null;
+  }
+
+  boolean isCcsidMbcSet ()
+  {
+    return ccsidMbcSet_;
+  }
+
+  // analyze exception handling some more here
+  String getCcsidMbcEncoding() throws DisconnectException
+  {
+    if (ccsidMbcEncoding_ == null) ccsidMbcEncoding_ = UTF8ENCODING;
+    return  ccsidMbcEncoding_;
+  }
+  int getByteOrder ()
+  {
+    return SignedBinary.BIG_ENDIAN;
+  }
+
+  public Object clone()
+  {
+    try {
+      return super.clone();
+    }
+    catch (java.lang.CloneNotSupportedException e) {
+      return null; // this shouldn't happen since we implement the cloneable 
interface
+    }
+  }
+
+  // Populates netCursor descriptors, rename this populateCursorDescriptors()
+  void updateColumn (NetCursor netCursor,
+                     int columnIndex,
+                     int protocolLid,
+                     int protocolLength) throws DisconnectException
+  {
+    FdocaSimpleDataArray sda = environmentTables_[protocolLid];
+
+    if ((mddOverride_) && (overrideTable_[protocolLid] != null))
+      sda = overrideTable_[protocolLid];
+
+    if (sda == null) {
+      netAgent_.accumulateChainBreakingReadExceptionAndThrow (new 
DisconnectException (
+          netAgent_,
+          "Invalid FDOCA LID"));
+    }
+
+    // 2. Set Null indicator based on PROTOCOL Type.
+    //    Nullable SQL and PROTOCOL types are all odd numbers and the nullable
+    //    type is one number higher than the related non-nullable type.
+    netCursor.nullable_[columnIndex] = ((sda.protocolType_ % 2) == 1);
+
+    // 3. Update CCSID
+    //    The typdef object should store the java encoding,
+    switch (sda.ccsid_) {
+      case CCSIDSBC:
+        netCursor.charsetName_[columnIndex] = getCcsidSbcEncoding();
+        netCursor.ccsid_[columnIndex] = this.ccsidSbc_;
+        break;
+      case CCSIDMBC:
+        if (isCcsidMbcSet() && (ccsidMbc_ != 0)) {
+          netCursor.charsetName_[columnIndex] = getCcsidMbcEncoding();
+          netCursor.ccsid_[columnIndex] = ccsidMbc_;
+        }
+        else {
+          // if the server didn't return a mixed byte ccsid, set both the
+          // encoding and the btc reference to null. see CCSIDDBC comment 
below.
+          netCursor.charsetName_[columnIndex] = null;
+          netCursor.ccsid_[columnIndex] = 0;
+        }
+        break;
+      case CCSIDDBC:
+        if (isCcsidDbcSet() && (ccsidDbc_ != 0)) {
+          netCursor.charsetName_[columnIndex] = getCcsidDbcEncoding();
+          netCursor.ccsid_[columnIndex] = this.ccsidDbc_;
+        }
+        else {
+          // if the server didn't return a double byte ccsid, set both the
+          // encoding and the btc reference to null.  later an exception will
+          // be thrown on the getXXX method.  calling the getCcsidDbcEncoding 
method
+          // will throw the exception here and this is not desirable.
+          netCursor.charsetName_[columnIndex] = null;
+         netCursor.ccsid_[columnIndex] = 0;
+        }
+        break;
+
+      default:   // This default case is used for mdd override ccsids.
+                 // In this case the sda.ccsid_ is the actual native ccsid,
+                 // otherwise the sda.ccsid_ is a placeholder:
+                 //  CCSIDMBC, CCSIDDDBC, CCSIDSBC to indicate that
+                 // the actual ccsid is the connection's ccsid (in protocol 
lingo the connection's typdef ccsid).
+        netCursor.charsetName_[columnIndex] = UTF8ENCODING;
+        netCursor.ccsid_[columnIndex] = sda.ccsid_;
+        break;
+    }
+
+    // 5. Set the length fdoca length.
+    //    For some types this may be a precision and a scale.
+    //    this includes FIXED DECIMAL (PROTOCOL type 0x0E, 0X0F),
+      // retain the high order placeholder for lobs) 
+      // this includes LARGE OBJECT BYTES (PROTOCOL type 0xC8, 0xC9)
+      //               LARGE OBJECT CHAR SBCS (PROTOCOL type 0xCA, 0xCB)
+      //               LARGE OBJECT CHAR DBCS (PROTOCOL type 0xCC, 0xCD)
+      //               LARGE OBJECT CHAR MIXED (PROTOCOL type 0xCE, 0xCF)
+      // also set the hasLobs_ flag to true
+      if ((sda.protocolType_ >= 0xC8) && (sda.protocolType_ <= 0xCF)) {
+        // retain placeholder information 
+        // right now just set the length...
+        // probably need to accomodate for the high order placeholder bit
+        netCursor.fdocaLength_[columnIndex] = protocolLength;
+        netCursor.hasLobs_ = true;
+      }
+      else
+        netCursor.fdocaLength_[columnIndex] = protocolLength;
+
+    // 6. Set jdbc type.
+    netCursor.jdbcTypes_[columnIndex] = 
protocolToJdbcTypes_[sda.protocolType_];
+
+    // 7. Get the number of bytes to read for variable length data.
+    netCursor.typeToUseForComputingDataLength_[columnIndex] = 
sda.typeToUseForComputingDataLength_;
+
+    // 8. Update the maximumRowSize
+    // Count : column null indicator +
+    //         column length +
+    //         posibly a 2-byte length for varchar columns
+    switch (netCursor.typeToUseForComputingDataLength_[columnIndex]) {
+    case DECIMALLENGTH:
+      netCursor.maximumRowSize_ += 1 + 16;
+      break;
+    case LOBLENGTH:
+      netCursor.maximumRowSize_ += 1 + (netCursor.fdocaLength_[columnIndex] & 
0x7fff);
+      break;
+    default:
+      netCursor.maximumRowSize_ += 1 + netCursor.fdocaLength_[columnIndex] + 
2; // 2 is the length indicator for varchar
+      break;
+    }
+
+    // 9. Get the character size.
+    if (sda.characterSize_ == 2) netCursor.isGraphic_[columnIndex] = true;
+
+  }
+
+  // Called before the code parses a descriptor
+  void clearMddOverrides ()
+  {
+    if (mddOverride_ == false)
+      return;
+
+    mddOverride_ = false;
+    for (int i = 0; i < OVERRIDE_TABLE_SIZE; i++)  
+      overrideTable_[i] = null;
+  }
+
+  // Called after the code parses a descriptor
+  void setMddOverride (int protocolType,
+                       int fdocaTripletLid,
+                       int fdocaFieldType,
+                       int ccsid,
+                       int characterSize,
+                       int mode,
+                       int length)
+  {
+    mddOverride_ = true;
+
+
+    if (overrideTable_[fdocaTripletLid] == null)
+    overrideTable_[fdocaTripletLid] = new FdocaSimpleDataArray
+      (protocolType,
+       fdocaFieldType,
+       fdocaTypeToRepresentationMap_[fdocaFieldType&0x7f],
+       ccsid,
+       characterSize,
+       mode,
+       length,
+       mapFdocaTypeToTypeToUseForComputingDataLength(fdocaFieldType));
+    else
+      overrideTable_[fdocaTripletLid].update (
+          protocolType,
+          fdocaFieldType,
+          fdocaTypeToRepresentationMap_[fdocaFieldType&0x7f],
+       ccsid,
+       characterSize,
+       mode,
+       length,
+       mapFdocaTypeToTypeToUseForComputingDataLength(fdocaFieldType));
+  }
+
+  private int mapFdocaTypeToTypeToUseForComputingDataLength (int 
fdocaFieldType)
+  {
+    switch (fdocaFieldType & 0x7f) { // &0x7f masks out the null indicator
+    case FdocaConstants.FDOCA_TYPE_VARCHAR:
+    case FdocaConstants.FDOCA_TYPE_VARBYTES:
+      return Typdef.TWOBYTELENGTH;
+    case FdocaConstants.FDOCA_TYPE_DECIMAL:
+    case FdocaConstants.FDOCA_TYPE_NUMERIC_CHAR:
+      return Typdef.DECIMALLENGTH;
+    case FdocaConstants.FDOCA_TYPE_LOBBYTES:
+    case FdocaConstants.FDOCA_TYPE_LOBCHAR:
+      return Typdef.LOBLENGTH;
+    case FdocaConstants.FDOCA_TYPE_PSCLBYTE:
+    case FdocaConstants.FDOCA_TYPE_PSCLCHAR:
+      return Typdef.ONEBYTELENGTH;
+    default:
+      return 0;
+    }
+  }
+}

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/ResourceKeys.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/ResourceKeys.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/ResourceKeys.java
 (added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/ResourceKeys.java
 Thu Apr 28 12:05:42 2005
@@ -0,0 +1,61 @@
+/*
+
+   Derby - Class org.apache.derby.client.resources.ResourceKeys
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.client.resources;
+
+
+/**
+ * <p>
+ * These keys are provided only as a convenience for managing
+ * locale-specific resource strings.
+ * These keys will change with each release,
+ * some may be added and some may be deleted,
+ * so do not use these keys for any purpose other than a version-
+ * dependent resource bundle.
+ * <p>
+ * The resource for any key can be obtained as follows:
+ * <pre>
+ * java.util.ResourceBundle resources =
+ *   java.util.ResourceBundle.getBundle 
("org.apache.derby.client.resources.Resources");
+ * resources.getString (<i>key</i>);
+ * </pre>
+ *
+ * @see Resources
+ **/
+public class ResourceKeys
+{
+  // Define a private constructor to prevent default public constructor
+  private ResourceKeys () {}
+
+
+  //-----------------Miscellaneous text 
keys------------------------------------
+  final static public String driverOriginationIndicator = "1";
+  final static public String engineOriginationIndicator = "2";
+  final static public String companyName = "3";
+
+  //-----------------Driver.getPropertyInfo() 
descriptions----------------------
+  final static public String propertyDescription__user = "7";
+  final static public String propertyDescription__password = "8";
+  final static public String propertyDescription__characterEncoding = "9";
+  final static public String propertyDescription__planName = "10";
+
+  
//-----------------java.util.MissingResourceException-------------------------
+  final static public String missingResource__01 = "4";
+}

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/ResourceKeys.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/Resources.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/Resources.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/Resources.java
 (added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/Resources.java
 Thu Apr 28 12:05:42 2005
@@ -0,0 +1,104 @@
+/*
+
+   Derby - Class org.apache.derby.client.resources.Resources
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.client.resources;
+
+
+/**
+ * <p>
+ * This is the default (English) resource bundle.
+ * You can provide your own locale-specific bundle
+ * with an ISO language suffix appended to the class name for
+ * your language.  Additional or replacement locale-specific
+ * resource bundles must reside in the 
<code>org.apache.derby.client.resources</code>
+ * package.
+ * <p>
+ * The driver locates the appropriate resource bundle for your locale by using
+ * <pre>
+ * java.util.ResourceBundle.getBundle 
("org.apache.derby.client.resources.Resources");
+ * </pre>
+ * Using the ClassLoader, this call in turn looks for the appropriate bundle
+ * as a .class file in the following order based on your locale:
+ * <ol>
+ * <li>Resources_language_country_variant
+ * <li>Resources_language_country
+ * <li>Resources_language
+ * <li>Resources (this is the default bundle shipped with the Derby Client)
+ * </ol>
+ * <p>
+ * <b>Note for bundle designers:</b>
+ * All resource strings are processed by
+ * [EMAIL PROTECTED] java.text.MessageFormat#format(String, Object[]) 
java.text.MessageFormat.format(String, Object[])},
+ * so all occurrences of the {, } and ' characters in resource strings must
+ * be delimited with quotes as '{', or '}' for the { and } characters,
+ * and '' for the ' character.
+ * For details see the Sun javadocs for class [EMAIL PROTECTED] 
java.text.MessageFormat java.text.MessageFormat}.
+ *
+ * @see java.util.Locale
+ * @see java.util.ResourceBundle
+ **/
+public class Resources extends java.util.ListResourceBundle
+{
+
+  final static private Object[][] resources__ =
+  {
+    // *******************************
+    // *** Miscellaneous text keys ***
+    // *******************************
+    {ResourceKeys.driverOriginationIndicator,
+     "[derby] "},
+
+    {ResourceKeys.engineOriginationIndicator,
+     "[derby] "},
+
+    {ResourceKeys.companyName,
+     "Apache Software Foundation"},
+
+    // ********************************
+    // *** Driver.getPropertyInfo() descriptions ***
+    // ********************************
+
+    {ResourceKeys.propertyDescription__user,
+     "The user name for the connection"},
+
+    {ResourceKeys.propertyDescription__password,
+     "The user''s password for the connection"},
+
+    {ResourceKeys.propertyDescription__characterEncoding,
+     "The character encoding for the connection"},
+
+    {ResourceKeys.propertyDescription__planName,
+     "The plan name for the connection"},
+
+    // ********************************
+    // *** Missing Resource Exception ***
+    // ********************************
+    {ResourceKeys.missingResource__01,
+     "No resource for key {0} could be found in resource bundle {1}."},
+  };
+
+  /**
+   * Extracts an array of key, resource pairs for this bundle.
+   **/
+  public Object[][] getContents()
+  {
+    return resources__;
+  }
+}

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/client/resources/Resources.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
 (added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
 Thu Apr 28 12:05:42 2005
@@ -0,0 +1,91 @@
+/*
+
+   Derby - Class org.apache.derby.jdbc.ClientConnectionPoolDataSource
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.jdbc;
+
+import org.apache.derby.client.ClientPooledConnection;
+/**
+ * ClientConnectionPoolDataSource is a factory for PooledConnection objects.
+ * An object that implements this interface will typically be registered with
+ * a naming service that is based on the Java Naming and Directory Interface 
(JNDI).
+ */
+public class ClientConnectionPoolDataSource extends ClientDataSource 
implements javax.sql.ConnectionPoolDataSource,
+                                                                      
java.io.Serializable,
+                                                                      
javax.naming.Referenceable
+{
+  static final long serialVersionUID = -539234282156481377L;
+  public static final String className__ = 
"org.apache.derby.jdbc.ClientConnectionPoolDataSource";
+
+  private String password = null;
+  synchronized public void setPassword (String password) { this.password = 
password; }
+  public final static String propertyKey_password = "password";
+
+  // deprecated.  do not use.  this member remains only for serial 
compatibility.
+  // this member should never be used.  pre-empted by 
super.traceFileSuffixIndex_.
+  // private int traceFileSuffixIndex = 0;
+
+  public ClientConnectionPoolDataSource ()
+  { super(); }
+
+  // ---------------------------interface 
methods-------------------------------
+
+  // Attempt to establish a physical database connection that can be used as a 
pooled connection.
+  public javax.sql.PooledConnection getPooledConnection () throws 
java.sql.SQLException
+  {
+    org.apache.derby.client.am.LogWriter dncLogWriter = 
super.computeDncLogWriterForNewConnection ("_cpds");
+    if (dncLogWriter != null) dncLogWriter.traceEntry (this, 
"getPooledConnection");
+    javax.sql.PooledConnection pooledConnection = getPooledConnectionX 
(dncLogWriter, this, this.user, this.password);
+    if (dncLogWriter != null) dncLogWriter.traceExit (this, 
"getPooledConnection", pooledConnection);
+    return pooledConnection;
+  }
+
+  // Standard method that establishes the initial physical connection using 
CPDS properties.
+  public javax.sql.PooledConnection getPooledConnection (String user,
+                                                         String password) 
throws java.sql.SQLException
+  {
+    org.apache.derby.client.am.LogWriter dncLogWriter = 
super.computeDncLogWriterForNewConnection ("_cpds");
+    if (dncLogWriter != null) dncLogWriter.traceEntry (this, 
"getPooledConnection", user, "<escaped>");
+    javax.sql.PooledConnection pooledConnection = getPooledConnectionX 
(dncLogWriter, this, user, password);
+    if (dncLogWriter != null) dncLogWriter.traceExit (this, 
"getPooledConnection", pooledConnection);
+    return pooledConnection;
+  }
+
+  //  method that establishes the initial physical connection using DS 
properties instead of CPDS properties.
+  public javax.sql.PooledConnection getPooledConnection (ClientDataSource ds,
+                                                         String user,
+                                                         String password) 
throws java.sql.SQLException
+  {
+    org.apache.derby.client.am.LogWriter dncLogWriter = 
ds.computeDncLogWriterForNewConnection ("_cpds");
+    if (dncLogWriter != null) dncLogWriter.traceEntry (this, 
"getPooledConnection", ds, user, "<escaped>");
+    javax.sql.PooledConnection pooledConnection = getPooledConnectionX 
(dncLogWriter, ds, user, password);
+    if (dncLogWriter != null) dncLogWriter.traceExit (this, 
"getPooledConnection", pooledConnection);
+    return pooledConnection;
+  }
+
+  //  method that establishes the initial physical connection
+  // using DS properties instead of CPDS properties.
+  private javax.sql.PooledConnection getPooledConnectionX 
(org.apache.derby.client.am.LogWriter dncLogWriter,
+                                                           ClientDataSource ds,
+                                                           String user,
+                                                           String password) 
throws java.sql.SQLException
+  {
+    return new ClientPooledConnection (ds, dncLogWriter, user, password);
+  }
+}

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java?rev=165178&view=auto
==============================================================================
--- 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
 (added)
+++ 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
 Thu Apr 28 12:05:42 2005
@@ -0,0 +1,316 @@
+/*
+
+   Derby - Class org.apache.derby.client.ClientDataSource
+
+   Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, 
where applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.apache.derby.jdbc;
+import org.apache.derby.client.ClientBaseDataSource;
+
+/**
+ * ClientDataSource is a simple data source implementation that can be used
+ * for establishing connections in a non-pooling, non-distributed environment.
+ * The class ClientDataSource can be used in a connection pooling environment,
+ * and the class ClientXADataSource can be used in a distributed, and pooling 
environment.
+ * <p>
+ * The example below registers a DNC data source object with a JNDI naming 
service.
+ * <pre>
+ * org.apache.derby.client.ClientDataSource dataSource = new 
org.apache.derby.client.ClientDataSource ();
+ * dataSource.setServerName ("my_derby_database_server");
+ * dataSource.setDatabaseName ("my_derby_database_name");
+ * javax.naming.Context context = new javax.naming.InitialContext();
+ * context.bind ("jdbc/my_datasource_name", dataSource);
+ * </pre>
+ * The first line of code in the example creates a data source object.
+ * The next two lines initialize the data source's properties.
+ * Then a Java object that references the initial JNDI naming
+ * context is created by calling the InitialContext() constructor, which is 
provided by
+ * JNDI. System properties (not shown) are used to tell JNDI the service 
provider to use.
+ * The JNDI name space is hierarchical, similar to the directory structure of 
many file
+ * systems. The data source object is bound to a logical JNDI name by calling 
Context.bind().
+ * In this case the JNDI name identifies a subcontext, "jdbc", of the root
+ * naming context and a logical name, "my_datasource_name", within the jdbc 
subcontext. This
+ * is all of the code required to deploy a data source object within JNDI.
+ * This example is provided mainly for illustrative purposes. We expect
+ * that developers or system administrators will normally use a GUI tool to 
deploy a data
+ * source object.
+ * <p>
+ * Once a data source has been registered with JNDI, it can then be used by a 
JDBC application,
+ * as is shown in the following example.
+ * <pre>
+ * javax.naming.Context context = new javax.naming.InitialContext ();
+ * javax.sql.DataSource dataSource = (javax.sql.DataSource) context.lookup 
("jdbc/my_datasource_name");
+ * java.sql.Connection connection = dataSource.getConnection ("user", 
"password");
+ * </pre>
+ * The first line in the example creates a Java object that references the 
initial JNDI naming
+ * context. Next, the initial naming context is used to do a lookup operation 
using the
+ * logical name of the data source. The Context.lookup() method returns a 
reference to
+ * a Java Object, which is narrowed to a javax.sql.DataSource object. In the 
last line,
+ * the DataSource.getConnection() method is called to produce a database 
connection.
+ * <p>
+ * This simple data source subclass of ClientBaseDataSource maintains it's own 
private <code>password</code> property.
+ * <p>
+ * The specified password, along with the user,
+ * is validated by DERBY.  This property
+ * can be overwritten by specifing the password parameter on the
+ * DataSource.getConnection() method call.
+ * <p>
+ * This password property is not declared transient, and therefore may be 
serialized
+ * to a file in clear-text, or stored to a JNDI server in clear-text when the 
data source is saved.
+ * Care must taken by the user to prevent security breaches.
+ * <p>
+ *
+ */
+public class ClientDataSource extends ClientBaseDataSource implements 
javax.sql.DataSource,
+                                                                      
java.io.Serializable,
+                                                                      
javax.naming.Referenceable
+{
+  private final static long serialVersionUID = 1894299584216955553L;
+  public static final String className__ = 
"org.apache.derby.jdbc.ClientDataSource";
+
+  // If a newer version of a serialized object has to be compatible with an 
older version, it is important that the newer version abides
+  // by the rules for compatible and incompatible changes.
+  //
+  // A compatible change is one that can be made to a new version of the 
class, which still keeps the stream compatible with older
+  // versions of the class. Examples of compatible changes are:
+  //
+  // Addition of new fields or classes does not affect serialization, as any 
new data in the stream is simply ignored by older
+  // versions. When the instance of an older version of the class is 
deserialized, the newly added field will be set to its default
+  // value.
+  // You can field change access modifiers like private, public, protected or 
package as they are not reflected to the serial
+  // stream.
+  // You can change a transient or static field to a non-transient or 
non-static field, as it is similar to adding a field.
+  // You can change the access modifiers for constructors and methods of the 
class. For instance a previously private method
+  // can now be made public, an instance method can be changed to static, etc. 
The only exception is that you cannot change
+  // the default signatures for readObject() and writeObject() if you are 
implementing custom serialization. The serialization
+  // process looks at only instance data, and not the methods of a class.
+  //
+  // Changes which would render the stream incompatible are:
+  //
+  // Once a class implements the Serializable interface, you cannot later make 
it implement the Externalizable interface, since
+  // this will result in the creation of an incompatible stream.
+  // Deleting fields can cause a problem. Now, when the object is serialized, 
an earlier version of the class would set the old
+  // field to its default value since nothing was available within the stream. 
Consequently, this default data may lead the newly
+  // created object to assume an invalid state.
+  // Changing a non-static into static or non-transient into transient is not 
permitted as it is equivalent to deleting fields.
+  // You also cannot change the field types within a class, as this would 
cause a failure when attempting to read in the original
+  // field into the new field.
+  // You cannot alter the position of the class in the class hierarchy. Since 
the fully-qualified class name is written as part of
+  // the bytestream, this change will result in the creation of an 
incompatible stream.
+  // You cannot change the name of the class or the package it belongs to, as 
that information is written to the stream during
+  // serialization.
+
+  private String password = null;
+  synchronized public void setPassword (String password) { this.password = 
password; }
+
+
+  /**
+   * Creates a simple DERBY data source with default property values
+   * for a non-pooling, non-distributed environment.
+   * No particular DatabaseName or other properties are associated with the 
data source.
+   * <p>
+   * Every Java Bean should provide a constructor with no arguments
+   * since many beanboxes attempt to instantiate a bean by invoking
+   * its no-argument constructor.
+   *
+   */
+  public ClientDataSource () { super(); }
+
+
+  // ---------------------------interface 
methods-------------------------------
+
+  /**
+   * Attempt to establish a database connection in a non-pooling, 
non-distributed environment.
+   *
+   * @return a Connection to the database
+   * @throws java.sql.SQLException if a database-access error occurs.
+   **/
+  public java.sql.Connection getConnection () throws java.sql.SQLException
+  { return getConnection (this.user, this.password); }
+
+  /**
+   * Attempt to establish a database connection in a non-pooling, 
non-distributed environment.
+   *
+   * @param user the database user on whose behalf the Connection is being made
+   * @param password the user's password
+   * @return a Connection to the database
+   * @throws java.sql.SQLException if a database-access error occurs.
+   **/
+  public java.sql.Connection getConnection (String user, String password) 
throws java.sql.SQLException
+  {
+    // Jdbc 2 connections will write driver trace info on a
+    // datasource-wide basis using the jdbc 2 data source log writer.
+    // This log writer may be narrowed to the connection-level
+    // This log writer will be passed to the agent constructor.
+
+    org.apache.derby.client.am.LogWriter dncLogWriter = 
super.computeDncLogWriterForNewConnection ("_sds");
+       updateDataSourceValues(tokenizeAttributes(connectionAttributes,null));
+    return
+        new org.apache.derby.client.net.NetConnection (
+          (org.apache.derby.client.net.NetLogWriter) dncLogWriter,
+          user,
+          password,
+          this,
+          -1,
+          false);
+  }
+
+       /*
+        * Properties to be seen by Bean - access thru reflection.
+        */
+
+       // -- Stardard JDBC DataSource Properties
+       
+       public synchronized void setDatabaseName (String databaseName) { 
this.databaseName = databaseName; }
+       public String getDatabaseName () { return this.databaseName; }
+       
+       
+       public synchronized void setDataSourceName (String dataSourceName) { 
this.dataSourceName = dataSourceName; }
+       public String getDataSourceName () { return this.dataSourceName; }
+       
+  public synchronized void setDescription (String description) { 
this.description = description; }
+  public String getDescription () { return this.description; }
+
+
+       public synchronized void setPortNumber (int portNumber) { 
this.portNumber = portNumber; }
+       public int getPortNumber () { return this.portNumber; }
+       
+       public synchronized void setServerName (String serverName) { 
this.serverName = serverName; }
+       public String getServerName () { return this.serverName; }
+
+
+       public synchronized void setUser (String user) { this.user = user; }
+       public String getUser () { return this.user; }
+       
+       synchronized public void setRetrieveMessageText (boolean 
retrieveMessageText) { this.retrieveMessageText = retrieveMessageText; }
+       public boolean getRetrieveMessageText () { return 
this.retrieveMessageText; }
+
+       // ---------------------------- securityMechanism 
-----------------------------------
+       /**
+        *The source security mechanism to use when connecting to this data 
source.
+  * <p>
+  * Security mechanism options are:
+  * <ul>
+  * <li> USER_ONLY_SECURITY
+  * <li> CLEAR_TEXT_PASSWORD_SECURITY
+  * <li> ENCRYPTED_PASSWORD_SECURITY
+  * <li> ENCRYPTED_USER_AND_PASSWORD_SECURITY - both password and user are 
encrypted
+  * </ul>
+  * The default security mechanism is USER_ONLY SECURITY
+  * <p>
+  * If the application specifies a security
+  * mechanism then it will be the only one attempted.
+  * If the specified security mechanism is not supported by the conversation
+  * then an exception will be thrown and there will be no additional retries.
+  * <p>
+  * This property is currently only available for the  DNC driver.
+  * <p>
+  * Both user and password need to be set for all security mechanism except 
USER_ONLY_SECURITY 
+  */
+       // We use the NET layer constants to avoid a mapping for the NET driver.
+       public final static short USER_ONLY_SECURITY = (short) 
org.apache.derby.client.net.NetConfiguration.SECMEC_USRIDONL;
+       public final static short CLEAR_TEXT_PASSWORD_SECURITY = (short) 
org.apache.derby.client.net.NetConfiguration.SECMEC_USRIDPWD;
+       public final static short ENCRYPTED_PASSWORD_SECURITY = (short) 
org.apache.derby.client.net.NetConfiguration.SECMEC_USRENCPWD;
+       public final static short ENCRYPTED_USER_AND_PASSWORD_SECURITY = 
(short) org.apache.derby.client.net.NetConfiguration.SECMEC_EUSRIDPWD;
+       
+       synchronized public void setSecurityMechanism (short securityMechanism) 
{ this.securityMechanism = securityMechanism; }
+       public short getSecurityMechanism () { 
+               return getUpgradedSecurityMechanism(this.securityMechanism,
+                                                                               
        this.password);
+       }
+
+       protected String connectionAttributes = "";
+
+       /**
+               Set this property to pass in more Derby specific
+               connection URL attributes.
+
+               @param prop set to the list of Cloudscape connection
+               attributes separated by semi-colons.   E.g., to specify an 
encryption
+               bootPassword of "x8hhk2adf", and set upgrade to true, do the 
following: 
+               <PRE>
+                       
ds.setConnectionAttributes("bootPassword=x8hhk2adf;upgrade=true");
+               </PRE>
+               See Derby documentation for complete list.
+        */
+       public final void setConnectionAttributes(String prop) {
+                connectionAttributes = prop;
+       }
+
+       /** @return Derby specific connection URL attributes */
+       public final String getConnectionAttributes() {
+               return connectionAttributes;
+       }
+       
+
+       public final static int TRACE_NONE = 0x0;
+       public final static int TRACE_CONNECTION_CALLS = 0x1;
+       public final static int TRACE_STATEMENT_CALLS= 0x2;
+       public final static int TRACE_RESULT_SET_CALLS = 0x4;
+       public final static int TRACE_DRIVER_CONFIGURATION = 0x10;
+       public final static int TRACE_CONNECTS = 0x20;
+       public final static int TRACE_PROTOCOL_FLOWS = 0x40;
+       public final static int TRACE_RESULT_SET_META_DATA = 0x80;
+       public final static int TRACE_PARAMETER_META_DATA = 0x100;
+       public final static int TRACE_DIAGNOSTICS = 0x200;
+       public final static int TRACE_XA_CALLS = 0x800;
+  public final static int TRACE_ALL = 0xFFFFFFFF;
+       synchronized public void setTraceLevel (int traceLevel) { 
this.traceLevel = traceLevel; }
+       public int getTraceLevel () { return this.traceLevel; }
+       
+
+       public synchronized void setTraceFile (String traceFile) { 
this.traceFile = traceFile; }
+       public String getTraceFile () { return this.traceFile; }
+
+
+       public synchronized void setTraceDirectory (String traceDirectory) { 
this.traceDirectory = traceDirectory; }
+       public String getTraceDirectory () { return this.traceDirectory; }
+
+       synchronized public void setTraceFileAppend (boolean traceFileAppend) { 
this.traceFileAppend = traceFileAppend; }
+       public boolean getTraceFileAppend () { return this.traceFileAppend; }
+
+
+
+
+       // --- private helper methods
+
+       
+       /**
+        * The dataSource keeps individual fields for the values that are 
+        * relevant to the client. These need to be updated when 
+        * set connection attributes is called.
+        */
+       private void updateDataSourceValues(java.util.Properties prop)
+       {
+               if ( prop.containsKey(propertyKey_user))
+                       setUser(getUser(prop));
+               if ( prop.containsKey(propertyKey_securityMechanism))
+                        setSecurityMechanism(getSecurityMechanism(prop));
+               if ( prop.containsKey(propertyKey_traceFile))
+                        setTraceFile(getTraceFile(prop));
+               if ( prop.containsKey(propertyKey_traceDirectory))
+                        setTraceDirectory(getTraceDirectory(prop));
+               if ( prop.containsKey(propertyKey_traceFileAppend))
+                       setTraceFileAppend(getTraceFileAppend(prop));
+               if ( prop.containsKey(propertyKey_securityMechanism))
+                       setSecurityMechanism(getSecurityMechanism(prop));
+               if ( prop.containsKey(propertyKey_retrieveMessageText))
+                       setRetrieveMessageText(getRetrieveMessageText(prop));
+       }
+
+}
+

Propchange: 
incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
------------------------------------------------------------------------------
    svn:eol-style = native


Reply via email to