db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From banda...@apache.org
Subject svn commit: r345402 [2/2] - in /db/derby/code/trunk: ./ java/client/ java/client/org/apache/derby/client/ java/client/org/apache/derby/client/am/ java/client/org/apache/derby/client/net/ java/client/org/apache/derby/jdbc/ java/engine/ java/engine/org/a...
Date Fri, 18 Nov 2005 02:00:59 GMT
Added: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,82 @@
+/*
+ 
+   Derby - Class org.apache.derby.impl.jdbc.EmbedPreparedStatement40
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.impl.jdbc;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLException;
+import java.sql.SQLXML;
+
+public class EmbedPreparedStatement40 extends  EmbedPreparedStatement30{
+    
+    public EmbedPreparedStatement40(EmbedConnection conn, String sql, boolean forMetaData,
+        int resultSetType, int resultSetConcurrency, int resultSetHoldability,
+        int autoGeneratedKeys, int[] columnIndexes, String[] columnNames) throws SQLException {
+        super(conn, sql, forMetaData, resultSetType, resultSetConcurrency, resultSetHoldability,
+            autoGeneratedKeys, columnIndexes, columnNames);
+    }
+    
+    public void setRowId(int parameterIndex, RowId x) throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setNString(int index, String value) throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setNCharacterStream(int index, Reader value, long length) throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setNClob(int index, NClob value) throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setClob(int parameterIndex, Reader reader, long length)
+    throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setBlob(int parameterIndex, InputStream inputStream, long length)
+    throws SQLException{
+        throw Util.notImplemented();
+    }
+    public void setNClob(int parameterIndex, Reader reader, long length)
+    throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public void setPoolable(boolean poolable)
+    throws SQLException{
+        throw Util.notImplemented();
+    }
+    
+    public boolean isPoolable()
+    throws SQLException{
+        throw Util.notImplemented();
+    }
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,107 @@
+/*
+ 
+   Derby - Class org.apache.derby.impl.jdbc.EmbedResultSet40
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.impl.jdbc;
+
+import java.sql.NClob;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLXML;
+import org.apache.derby.iapi.sql.ResultSet;
+
+public class EmbedResultSet40 extends org.apache.derby.impl.jdbc.EmbedResultSet20{
+    
+    /** Creates a new instance of EmbedResultSet40 */
+    public EmbedResultSet40(org.apache.derby.impl.jdbc.EmbedConnection conn,
+        ResultSet resultsToWrap,
+        boolean forMetaData,
+        org.apache.derby.impl.jdbc.EmbedStatement stmt,
+        boolean isAtomic)
+        throws SQLException {
+        
+        super(conn, resultsToWrap, forMetaData, stmt, isAtomic);
+    }
+    
+    public RowId getRowId(int columnIndex) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    
+    public RowId getRowId(String columnName) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateRowId(String columnName, RowId x) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public int getHoldability() throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public boolean isClosed() throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateNString(int columnIndex, String nString) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateNString(String columnName, String nString) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateNClob(String columnName, NClob nClob) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public NClob getNClob(int i) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public NClob getNClob(String colName) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public SQLXML getSQLXML(String colName) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public void updateSQLXML(String columnName, SQLXML xmlObject) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,44 @@
+/*
+    Derby - Class org.apache.derby.impl.jdbc.EmbedRowId
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.impl.jdbc;
+
+import java.sql.RowId;
+
+public class EmbedRowId implements RowId {
+    
+    public EmbedRowId() {
+    }
+    
+    public boolean equals(Object obj) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+    
+    public byte[] getBytes() {
+        throw new java.lang.UnsupportedOperationException();
+    }
+    
+    public String toString() {
+        throw new java.lang.UnsupportedOperationException();
+    }
+    
+    public int hashCode() {
+        throw new java.lang.UnsupportedOperationException();
+    }
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedRowId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Thu Nov 17 18:00:23 2005
@@ -39,6 +39,8 @@
 	  <exclude name="${derby.dir}/impl/jdbc/*169.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*20.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*30.java"/>
+	  <exclude name="${derby.dir}/impl/jdbc/*40.java"/>
+          <exclude name="${derby.dir}/impl/jdbc/EmbedRowId.java"/>
    </javac>
     <copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
     <javac
@@ -134,5 +136,24 @@
     </javac>
   </target>
 
+<target name="compile_jdbc4">
+    <javac
+        bootclasspath="${empty}"
+        nowarn="on"
+        debug="${debug}"
+        depend="${depend}"
+        deprecation="${deprecation}"
+        optimize="${optimize}"
+        proceed="${proceed}"
+        verbose="${verbose}"
+        srcdir="${derby.engine.src.dir};${derby.engine.src.dir}"
+        destdir="${out.dir}">
+        <classpath>
+            <pathelement path="${java16compile.classpath}"/>
+        </classpath>
+        <include name="${derby.dir}/impl/jdbc/*40.java"/>
+        <include name="${derby.dir}/impl/jdbc/EmbedRowId.java"/>
+    </javac>
+</target> 
 </project>
 

Added: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,110 @@
+/*
+ 
+   Derby - Class org.apache.derby.jdbc.Driver40
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.iapi.jdbc.BrokeredConnection;
+import org.apache.derby.iapi.jdbc.BrokeredConnectionControl;
+import org.apache.derby.iapi.jdbc.BrokeredConnection40;
+import org.apache.derby.iapi.sql.ResultSet;
+import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.impl.jdbc.EmbedConnection;
+import org.apache.derby.impl.jdbc.EmbedConnection30;
+import org.apache.derby.impl.jdbc.EmbedPreparedStatement40;
+import org.apache.derby.impl.jdbc.EmbedCallableStatement40;
+import org.apache.derby.impl.jdbc.EmbedRowId;
+import org.apache.derby.impl.jdbc.EmbedConnection40;
+import org.apache.derby.impl.jdbc.EmbedResultSet;
+import org.apache.derby.impl.jdbc.EmbedResultSet40;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.util.Properties;
+
+
+public class Driver40 extends Driver30 {
+    
+    public Connection getNewNestedConnection(EmbedConnection conn) {
+        if (SanityManager.DEBUG) {
+            SanityManager.ASSERT(conn instanceof EmbedConnection30,
+                "conn expected to be instanceof EmbedConnection30");
+        }
+        return new EmbedConnection40(conn);
+    }
+    
+    
+    public EmbedConnection getNewEmbedConnection(String url, Properties info)
+    throws SQLException {
+        return new EmbedConnection40(this, url, info);
+    }
+    
+    
+    public PreparedStatement
+        newEmbedPreparedStatement(
+        EmbedConnection conn,
+        String stmt,
+        boolean forMetaData,
+        int resultSetType,
+        int resultSetConcurrency,
+        int resultSetHoldability,
+        int autoGeneratedKeys,
+        int[] columnIndexes,
+        String[] columnNames)
+        throws SQLException {
+        return new EmbedPreparedStatement40(conn,
+            stmt,
+            forMetaData,
+            resultSetType,
+            resultSetConcurrency,
+            resultSetHoldability,
+            autoGeneratedKeys,
+            columnIndexes,
+            columnNames);
+    }
+    
+    
+    public CallableStatement newEmbedCallableStatement(
+        EmbedConnection conn,
+        String stmt,
+        int resultSetType,
+        int resultSetConcurrency,
+        int resultSetHoldability)
+        throws SQLException {
+        return new EmbedCallableStatement40(conn,
+            stmt,
+            resultSetType,
+            resultSetConcurrency,
+            resultSetHoldability);
+    }
+    public BrokeredConnection newBrokeredConnection(BrokeredConnectionControl control) {
+        
+        return new BrokeredConnection40(control);
+    }
+    
+    public EmbedResultSet newEmbedResultSet(EmbedConnection conn, ResultSet results, boolean forMetaData, org.apache.derby.impl.jdbc.EmbedStatement statement,boolean isAtomic) throws SQLException {
+        return new EmbedResultSet40(conn, results, forMetaData, statement,
+            isAtomic);
+    }
+    
+    public EmbedRowId newEmbedRowId() throws SQLException {
+        return new EmbedRowId();
+    }
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver40.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,36 @@
+/*
+
+   Derby - Class org.apache.derby.jdbc.EmbeddedDataSource40
+
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.impl.jdbc.Util;
+import java.sql.SQLException;
+
+public class EmbeddedDataSource40 extends EmbeddedDataSource {
+    
+    public EmbeddedDataSource40() {
+    }
+    
+    public <T> T createQueryObject(Class<T> ifc) throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Thu Nov 17 18:00:23 2005
@@ -143,10 +143,27 @@
       <include name="${derby.dir}/jdbc/XATransactionState.java"/>
       <include name="${derby.dir}/jdbc/XAStatementControl.java"/>
 	  <include name="${derby.dir}/jdbc/ResourceAdapterImpl.java"/>
-
    </javac>  
-  
   </target>
+  
+  <target name="compile_jdbc4">
+    <javac
+        bootclasspath="${empty}"
+        nowarn="on"
+        debug="${debug}"
+        depend="${depend}"
+        deprecation="${deprecation}"
+        optimize="${optimize}"
+        proceed="${proceed}"
+        verbose="${verbose}"
+        srcdir="${derby.engine.src.dir}"
+        destdir="${out.dir}">
+        <classpath>
+            <pathelement path="${java16compile.classpath}"/>
+        </classpath>
+        <include name="${derby.dir}/jdbc/*40.java"/>
+    </javac>
 
+  </target> 
 </project>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Thu Nov 17 18:00:23 2005
@@ -154,6 +154,13 @@
 derby.env.classes.jdbcJ4=java.sql.Driver
 cloudscape.config.jdbcJ4=derby
 
+# jdbc40 - requires JDK 1.6
+#
+#jdbc4_optional_derby.module.jdbcJ6=org.apache.derby.jdbc.Driver40
+#jdbc4_optional_derby.env.jdk.jdbcJ6=6
+#jdbc4_optional_derby.env.classes.jdbcJ6=java.sql.Driver
+#jdbc4_optional_cloudscape.config.jdbcJ6=derby
+
 # resourceAdapter - requires JDK 1.2, JTA classes and JDBC20X classes
 #
 derby.module.resourceAdapterJ2=org.apache.derby.jdbc.ResourceAdapterImpl

Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/build.xml?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Thu Nov 17 18:00:23 2005
@@ -61,7 +61,6 @@
     <ant dir="${derby.testing.src.dir}/${derby.testing.suites.dir}"/> 
   </target>
 
-
 <!--             ============= End Targets ==============                -->
 
 <!--             ============= End Project ==============                -->

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,89 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.harness.jdk16
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.harness;
+
+import java.util.Vector;
+import java.util.StringTokenizer;
+
+
+public class jdk16 extends jvm {
+    
+    public String getName(){return "jdk16";}
+    public jdk16(boolean noasyncgc, boolean verbosegc, boolean noclassgc,
+        long ss, long oss, long ms, long mx, String classpath, String prof,
+        boolean verify, boolean noverify, boolean nojit, Vector D) {
+        super(noasyncgc,verbosegc,noclassgc,ss,oss,ms,mx,classpath,prof,
+            verify,noverify,nojit,D);
+    }
+    
+    public jdk16(String classpath, Vector D) {
+        super(classpath,D);
+    }
+    
+    public jdk16(long ms, long mx, String classpath, Vector D) {
+        super(ms,mx,classpath,D);
+    }
+    
+    public jdk16() { }
+    
+    
+    public Vector getCommandLine() {
+        StringBuffer sb = new StringBuffer();
+        Vector v = super.getCommandLine();
+        appendOtherFlags(sb);
+        String s = sb.toString();
+        StringTokenizer st = new StringTokenizer(s);
+        while (st.hasMoreTokens()) {
+            v.addElement(st.nextToken());
+        }
+        return v;
+    }
+    
+    public void appendOtherFlags(StringBuffer sb) {
+        if (noasyncgc) warn("jdk16 does not support noasyncgc");
+        if (verbosegc) sb.append(" -verbose:gc");
+        if (noclassgc) sb.append(" -Xnoclassgc");
+        if (ss>=0) warn("jdk16 does not support ss");
+        if (oss>=0) warn("jdk16 does not support oss");
+        if (ms>=0) {
+            sb.append(" -ms");
+            sb.append(ms);
+        }
+        if (mx>=0) {
+            sb.append(" -mx");
+            sb.append(mx);
+        }
+        if (classpath!=null) {
+            sb.append(" -classpath ");
+            sb.append(classpath);
+        }
+        if (prof!=null) warn("jdk16 does not support prof");
+        if (verify) warn("jdk16 does not support verify");
+        if (noverify) warn("jdk16 does not support noverify");
+        if (nojit) sb.append(" -Djava.compiler=NONE");
+        if (D != null)
+            for (int i=0; i<D.size();i++) {
+            sb.append(" -D");
+            sb.append((String)(D.elementAt(i)));
+            }
+    }
+    public String getDintro() { return "-D"; }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk16.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/StartTestConnection.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/StartTestConnection.out?rev=345402&view=auto
==============================================================================
    (empty)

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/StartTestConnection.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestCallableStatementMethods.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestCallableStatementMethods.out?rev=345402&view=auto
==============================================================================
    (empty)

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestCallableStatementMethods.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestConnectionMethods.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestConnectionMethods.out?rev=345402&view=auto
==============================================================================
    (empty)

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestConnectionMethods.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestPreparedStatementMethods.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestPreparedStatementMethods.out?rev=345402&view=auto
==============================================================================
    (empty)

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestPreparedStatementMethods.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestResultSetMethods.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestResultSetMethods.out?rev=345402&view=auto
==============================================================================
    (empty)

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TestResultSetMethods.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.runall?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.runall (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.runall Thu Nov 17 18:00:23 2005
@@ -0,0 +1,5 @@
+jdbc4/StartTestConnection.java
+jdbc4/TestConnectionMethods.java
+jdbc4/TestCallableStatementMethods.java
+jdbc4/TestPreparedStatementMethods.java
+jdbc4/TestResultSetMethods.java

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc4.runall
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StartTestConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StartTestConnection.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StartTestConnection.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StartTestConnection.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,34 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestConnectionMethods
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+public class StartTestConnection {
+    public static void main(String args[]) {
+        try {
+            TestConnection tc = new TestConnection();
+            tc.startTest();
+        } catch(Exception e) {
+            System.out.println("Exception occurred in code StartTestConnection " + e);
+            e.printStackTrace();
+        }
+    }
+}
+

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/StartTestConnection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,301 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestCallableStatementMethods
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import org.apache.derby.impl.jdbc.Util;
+import java.io.Reader;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.CallableStatement;
+import java.sql.NClob;
+import java.sql.SQLException;
+import java.sql.SQLXML;
+
+public class TestCallableStatementMethods{
+    
+    Connection conn=null;
+    CallableStatement cs=null;
+    
+    SQLException sqle = Util.notImplemented();
+    String message = sqle.getMessage();
+    
+    void t_getRowId1() {
+        try {
+            cs.getRowId(0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getRowId2() {
+        try {
+            cs.getRowId(null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setRowId() {
+        try {
+            cs.setRowId(null,null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setNString() {
+        try {
+            cs.setNString(null,null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setNCharacterStream() {
+        try {
+            cs.setNCharacterStream(null,null,0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setNClob1() {
+        try {
+            cs.setNClob(null,null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setClob() {
+        try {
+            cs.setClob(null,null,0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setBlob() {
+        try {
+            cs.setBlob(null,null,0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setNClob2() {
+        try {
+            cs.setNClob(null,null,0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getNClob1() {
+        try {
+            NClob nclob = cs.getNClob(0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getNClob2(){
+        try {
+            NClob nclob = cs.getNClob(null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_setSQLXML() {
+        try {
+            cs.setSQLXML(null,null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getSQLXML1() {
+        try {
+            SQLXML sqlxml = cs.getSQLXML(0);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getSQLXML2() {
+        try {
+            SQLXML sqlxml = cs.getSQLXML(null);
+            System.out.println("Not Implemented Exception not thrown");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Exception"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    
+    void startCallableStatementMethodTest(Connection conn_in,CallableStatement cs_in) {
+        conn = conn_in;
+        cs = cs_in;
+        t_getRowId1();
+        t_getRowId2();
+        t_setRowId();
+        t_setNString();
+        t_setNCharacterStream();
+        t_setNClob1();
+        t_setClob();
+        t_setBlob();
+        t_setNClob2();
+        t_getNClob1();
+        t_getNClob2();
+        t_setSQLXML();
+        t_getSQLXML1();
+        t_getSQLXML2();
+    }
+    
+    public static void main(String args[]) {
+        TestConnection tc=null;
+        Connection conn_main=null;
+        CallableStatement cs_main=null;
+        
+        try {
+            tc = new TestConnection();
+            conn_main = tc.createEmbeddedConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            cs_main = conn_main.prepareCall("select count(*) from sys.systables");
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        TestCallableStatementMethods tcsm = new TestCallableStatementMethods();
+        tcsm.startCallableStatementMethodTest(conn_main,cs_main);
+        
+        conn_main=null;
+        cs_main=null;
+        
+        try {
+            conn_main = tc.createClientConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            cs_main = conn_main.prepareCall("select count(*) from sys.systables");
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        tcsm.startCallableStatementMethodTest(conn_main,cs_main);
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods_app.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods_app.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestCallableStatementMethods_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnection.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnection.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnection.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnection.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,65 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestConnection
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+public class TestConnection {
+    TestConnection() {
+    }
+    Connection createEmbeddedConnection() {
+        Connection conn=null;
+        try {
+            Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+            conn = DriverManager.getConnection("jdbc:derby:mydb;create=true");
+        } catch(Exception e) {
+            System.out.println("Failed in creating a Connection:	"+e);
+            e.printStackTrace();
+        }
+        return conn;
+    }
+    Connection createClientConnection() {
+        Connection conn=null;
+        try {
+            Class.forName("org.apache.derby.jdbc.ClientDriver");
+            conn = DriverManager.getConnection("jdbc:derby:mydb;create=true");
+        } catch(Exception e) {
+            System.out.println("Failed in creating a Connection:	"+e);
+            e.printStackTrace();
+        }
+        return conn;
+    }
+    void closeConnection(Connection conn) {
+        try {
+            conn.close();
+        } catch(Exception e) {
+            System.out.println("Failed to close a connection" + e);
+            e.printStackTrace();
+        }
+    }
+    void startTest() {
+        Connection conn = createEmbeddedConnection();
+        closeConnection(conn);
+        Connection conn1 = createClientConnection();
+        closeConnection(conn1);
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,189 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestConnectionMethods
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.NClob;
+import java.sql.SQLException;
+import java.sql.SQLXML;
+import java.util.Properties;
+import org.apache.derby.impl.jdbc.Util;
+
+public class TestConnectionMethods {
+    Connection conn = null;
+    SQLException sqle = Util.notImplemented();
+    String message = sqle.getMessage();
+    
+    public TestConnectionMethods(Connection connIn) {
+        conn = connIn;
+    }
+    
+    void t_createClob() {
+        Clob clob;
+        try {
+            clob = conn.createClob();
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    void t_createBlob() {
+        Blob blob;
+        try {
+            blob = conn.createBlob();
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    void t_createNClob() {
+        NClob nclob;
+        try {
+            nclob = conn.createNClob();
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    void t_createSQLXML() {
+        SQLXML sqlXML;
+        try {
+            sqlXML = conn.createSQLXML();
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+        
+    }
+    
+    void t_isValid() {
+        boolean ret;
+        try {
+            ret = conn.isValid(0);
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    
+    void t_setClientInfo1(){
+        try {
+            conn.setClientInfo("prop1","value1");
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    
+    void t_setClientInfo2(){
+        try {
+            Properties p = new Properties();
+            conn.setClientInfo(p);
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    
+    void t_getClientInfo1(){
+        String info;
+        try {
+            info = conn.getClientInfo("prop1");
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+        
+    }
+    
+    void t_getClientInfo2(){
+        Properties p=null;
+        try {
+            p = conn.getClientInfo();
+            System.out.println("unimplemented exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught in function"+e);
+        }
+    }
+    
+    public void startTestConnectionMethods() {
+        t_createClob();
+        t_createBlob();
+        t_createNClob();
+        t_createSQLXML();
+        t_isValid();
+        t_setClientInfo1();
+        t_setClientInfo2();
+        t_getClientInfo1();
+        t_getClientInfo2();
+    }
+    public static void main(String args[]) {
+        TestConnection tc = new TestConnection();
+        
+        Connection connEmbedded = tc.createEmbeddedConnection();
+        TestConnectionMethods tcm = new TestConnectionMethods(connEmbedded);
+        tcm.startTestConnectionMethods();
+        
+        
+        Connection connNetwork = tc.createClientConnection();
+        TestConnectionMethods tcm1 = new TestConnectionMethods(connNetwork);
+        tcm1.startTestConnectionMethods();
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatementMethods.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatementMethods.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatementMethods.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatementMethods.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,238 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestPreparedStatementMethods
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import java.io.Reader;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.NClob;
+import java.sql.SQLXML;
+import org.apache.derby.impl.jdbc.Util;
+
+public class TestPreparedStatementMethods {
+    
+    Connection conn=null;
+    PreparedStatement ps=null;
+    
+    SQLException sqle = Util.notImplemented();
+    String message = sqle.getMessage();
+    
+    
+    void t_setRowId() {
+        try {
+            ps.setRowId(0,null);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setNString() {
+        try {
+            ps.setNString(0,null);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setNCharacterStream() {
+        try {
+            ps.setNCharacterStream(0,null,0);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setNClob1() {
+        try {
+            ps.setNClob(0,null);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setClob() {
+        try {
+            ps.setClob(0,null,0);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setBlob() {
+        try {
+            ps.setBlob(0,null,0);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setNClob2() {
+        try {
+            ps.setNClob(0,null,0);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setSQLXML() {
+        try {
+            ps.setSQLXML(0,null);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_setPoolable() {
+        try {
+            ps.setPoolable(false);
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_isPoolable() {
+        try {
+            boolean b;
+            b = ps.isPoolable();
+            System.out.println("UnImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception thrown in method"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    
+    void startPreparedStatementMethodTest(Connection conn_in,PreparedStatement ps_in) {
+        conn = conn_in;
+        ps = ps_in;
+        t_setRowId();
+        t_setNString();
+        t_setNCharacterStream();
+        t_setNClob1();
+        t_setClob();
+        t_setBlob();
+        t_setNClob2();
+        t_setSQLXML();
+        t_setPoolable();
+        t_isPoolable();
+    }
+    
+    public static void main(String args[]) {
+        TestConnection tc=null;
+        Connection conn_main=null;
+        PreparedStatement ps_main=null;
+        
+        try {
+            tc = new TestConnection();
+            conn_main = tc.createEmbeddedConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            ps_main = conn_main.prepareStatement("select count(*) from sys.systables");
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        TestPreparedStatementMethods tpsm = new TestPreparedStatementMethods();
+        tpsm.startPreparedStatementMethodTest(conn_main,ps_main);
+        
+        conn_main=null;
+        ps_main=null;
+        
+        try {
+            conn_main = tc.createClientConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            ps_main = conn_main.prepareStatement("select count(*) from sys.systables");
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        tpsm.startPreparedStatementMethodTest(conn_main,ps_main);
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatementMethods.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatement_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatement_app.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatement_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatement_app.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestPreparedStatement_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,335 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestResultSetMethods
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import org.apache.derby.impl.jdbc.Util;
+
+import java.io.Reader;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class TestResultSetMethods {
+    
+    Connection conn=null;
+    PreparedStatement ps=null;
+    ResultSet rs=null;
+    
+    SQLException sqle = Util.notImplemented();
+    String message = sqle.getMessage();
+    
+    void t_getRowId1() {
+        try {
+            rs.getRowId(0);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    void t_getRowId2(){
+        try {
+            rs.getRowId(null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateRowId1() {
+        try {
+            rs.updateRowId(0,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateRowId2(){
+        try {
+            rs.updateRowId(null,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getHoldability() {
+        try {
+            int i = rs.getHoldability();
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_isClosed(){
+        try {
+            boolean b = rs.isClosed();
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateNString1() {
+        try {
+            rs.updateNString(0,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateNString2() {
+        try {
+            rs.updateNString(null,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateNClob1() {
+        try {
+            rs.updateNClob(0,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateNClob2() {
+        try {
+            rs.updateNClob(null,null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getNClob1() {
+        try {
+            rs.getNClob(0);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getNClob2() {
+        try {
+            rs.getNClob(null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getSQLXML1() {
+        try {
+            rs.getSQLXML(0);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getSQLXML2() {
+        try {
+            rs.getSQLXML(null);
+            System.out.println("unImplemented Exception not thrown in code");
+        } catch(SQLException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+            
+        } catch(Exception e) {
+            System.out.println("Unexpected exception caught"+e);
+            e.printStackTrace();
+        }
+    }
+    
+    void t_updateSQLXML1(){
+    }
+    
+    void t_updateSQLXML2() {
+    }
+    
+    void startTestResultSetMethods(Connection conn_in,PreparedStatement ps_in,ResultSet rs_in) {
+        conn = conn_in;
+        ps = ps_in;
+        rs = rs_in;
+        
+        t_getRowId1();
+        t_getRowId2();
+        
+        t_updateRowId1();
+        t_updateRowId2();
+        
+        t_getHoldability();
+        t_isClosed();
+        
+        t_updateNString1();
+        t_updateNString2();
+        
+        t_updateNClob1();
+        t_updateNClob2();
+        
+        t_getNClob1();
+        t_getNClob2();
+        
+        t_getSQLXML1();
+        t_getSQLXML2();
+        
+        t_updateSQLXML1();
+        t_updateSQLXML2();
+    }
+    
+    
+    public static void main(String args[]) {
+        TestConnection tc=null;
+        Connection conn_main=null;
+        PreparedStatement ps_main=null;
+        ResultSet rs_main=null;
+        
+        try {
+            tc = new TestConnection();
+            conn_main = tc.createEmbeddedConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            ps_main = conn_main.prepareStatement("select count(*) from sys.systables");
+            rs_main = ps_main.executeQuery();
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        TestResultSetMethods trsm = new TestResultSetMethods();
+        trsm.startTestResultSetMethods(conn_main,ps_main,rs_main);
+        
+        /****************************************************************************************
+         * This tests the client server part of derby
+         *****************************************************************************************/
+        
+        conn_main=null;
+        ps_main=null;
+        
+        try {
+            conn_main = tc.createClientConnection();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        
+        try {
+            ps_main = conn_main.prepareStatement("select count(*) from sys.systables");
+            rs_main = ps_main.executeQuery();
+        } catch(SQLException e) {
+            System.out.println(""+e);
+            e.printStackTrace();
+        }
+        
+        trsm.startTestResultSetMethods(conn_main,ps_main,rs_main);
+        
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods_app.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods_app.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestResultSetMethods_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId.java?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId.java Thu Nov 17 18:00:23 2005
@@ -0,0 +1,119 @@
+/*
+ 
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbc4.TestRowId
+ 
+   Copyright 2005 The Apache Software Foundation or its licensors, as 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.derbyTesting.functionTests.tests.jdbc4;
+
+import org.apache.derby.impl.jdbc.Util;
+import java.sql.RowId;
+import java.lang.UnsupportedOperationException;
+
+public class TestRowId {
+    
+    RowId rid=null;
+    
+    java.lang.UnsupportedOperationException unop=null;
+    String message=null;
+    
+    public TestRowId() {
+        unop = new java.lang.UnsupportedOperationException();
+        message = unop.getMessage();
+    }
+    
+    void t_equals() {
+        try {
+            rid.equals(new String());
+        } catch(java.lang.UnsupportedOperationException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected Exception caught");
+            e.printStackTrace();
+        }
+    }
+    
+    void t_getBytes() {
+        try {
+            byte b[] = rid.getBytes();
+        } catch(java.lang.UnsupportedOperationException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected Exception caught");
+            e.printStackTrace();
+        }
+    }
+    
+    void t_toString() {
+        try {
+            String s = rid.toString();
+        } catch(java.lang.UnsupportedOperationException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected Exception caught");
+            e.printStackTrace();
+        }
+    }
+    
+    void t_hashCode() {
+        try {
+            int h = rid.hashCode();
+        } catch(java.lang.UnsupportedOperationException e) {
+            if(!message.equals(e.getMessage())) {
+                System.out.println("Unexpected SQLException"+e);
+            }
+        } catch(Exception e) {
+            System.out.println("Unexpected Exception caught");
+            e.printStackTrace();
+        }
+    }
+    
+    void startTestRowIdMethods(RowId rid_in) {
+        rid = rid_in;
+        t_equals();
+        t_getBytes();
+        t_toString();
+        t_hashCode();
+    }
+    
+    public static void main(String args[]) {
+        RowId rowId_main=null;
+        TestRowId rid_obj = new TestRowId();
+        
+        try {
+            rowId_main = new org.apache.derby.impl.jdbc.EmbedRowId();
+        } catch(Exception e) {
+            System.out.println("Exception occurred in the main method");
+            e.printStackTrace();
+        }
+        
+        try {
+            System.out.println(""+rid_obj);
+            System.out.println(""+rowId_main);
+            rid_obj.startTestRowIdMethods(rowId_main);
+        } catch(Exception e) {
+            System.out.println("Caught it here"+e);
+            e.printStackTrace();
+        }
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId_app.properties?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId_app.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId_app.properties Thu Nov 17 18:00:23 2005
@@ -0,0 +1,6 @@
+runwithibm13=false
+runwithibm14=false
+runwithj9=false
+runwithjdk12=false
+runwithjdk13=false
+runwithjdk14=false

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestRowId_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml Thu Nov 17 18:00:23 2005
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<project default="compile_jdbc4" basedir="../../../../../../../..">
+
+    <property file="${user.home}/ant.properties"/>
+
+    <!-- Set property lib dir -->
+    <property name="properties.dir" value="tools/ant/properties" />
+
+    <!-- Significant dirs -->
+    <property file="${properties.dir}/dirs.properties"/>
+    <property file="${properties.dir}/derbytesting.properties"/>
+
+    <!-- Compiler settings -->
+    <property file="${properties.dir}/sane${sanity}.properties"/>
+    <property file="${properties.dir}/defaultcompiler.properties"/>
+    <property file="${properties.dir}/${build.compiler}.properties"/>
+
+    <!-- Parser properties -->
+    <!--property file="${properties.dir}/parser.properties"/-->
+
+    <!-- Compile-time classpath properties files -->
+    <property file="${properties.dir}/extrapath.properties"/>
+    <property file="${properties.dir}/compilepath.properties"/>
+
+    <!-- Release and Version info -->
+    <property file="${properties.dir}/release.properties"/>
+
+    <!-- derby testing specific properties files -->
+    <property file="${ant.home}/properties/derbytesting.properties"/>
+    <property file="${user.home}/properties/derbytesting.properties"/>
+    <property name="this.dir" value="${derby.testing.functest.dir}/tests/jdbc4"/>
+
+    <target name="compile_jdbc4" if="jdk16" depends="copyfiles">
+        <javac
+            bootclasspath="${empty}"
+            nowarn="on"
+            debug="${debug}"
+            depend="${depend}"
+            deprecation="${deprecation}"
+            optimize="${optimize}"
+            proceed="${proceed}"
+            verbose="${verbose}" 
+            srcdir="${derby.testing.src.dir}"
+            destdir="${out.dir}">
+            <classpath>
+                <pathelement path="${java16compile.classpath}"/>
+            </classpath>
+            <include name="${this.dir}/*.java"/>
+        </javac>
+    </target>	
+
+    <target name="copyfiles">
+        <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/jdbc4">
+            <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbc4"
+            includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbc4/copyfiles.ant"/>
+        </copy>
+    </target>
+
+</project>

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant?rev=345402&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant Thu Nov 17 18:00:23 2005
@@ -0,0 +1,5 @@
+TestCallableStatementMethods_app.properties
+TestPreparedStatement_app.properties
+TestRowId_app.properties
+TestConnectionMethods_app.properties
+TestResultSetMethods_app.properties

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/copyfiles.ant
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml Thu Nov 17 18:00:23 2005
@@ -87,6 +87,7 @@
         <pathelement path="${junit}"/>
       </classpath>
       <!--exclude name=""/-->
+	<exclude name="**/jdbc4/*"/>
       <!--include name=""/-->
     </javac>
   </target>

Modified: db/derby/code/trunk/tools/ant/properties/compilepath.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/ant/properties/compilepath.properties?rev=345402&r1=345401&r2=345402&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Thu Nov 17 18:00:23 2005
@@ -8,7 +8,7 @@
 # Java2 1.3 paths - for JDBC 2.0/JDK1.3
 # java13compile.classpath includes JDBC 2.0 and extensions.
 
-j13lib=${basedir}/jdk131/jre/lib
+#j13lib=${basedir}/jdk131/jre/lib
 
 java13compile.classpath=${j13lib}/rt.jar;${javatools.dir}/jdbc2_0-stdext.jar
 
@@ -17,10 +17,12 @@
 
 # Java2 1.4 paths - for JDBC 3.0/JDK1.4
 
-j14lib=${basedir}/jdk141/jre/lib
+#j14lib=${basedir}/jdk141/jre/lib
 java14compile.classpath=${j14lib}/rt.jar
 
 # base compile path
 
 compile.classpath=${java13compile.classpath}
 
+j16lib=${jdk16}/jre/lib
+java16compile.classpath=${j16lib}/rt.jar



Mime
View raw message