cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r700411 - in /cayenne/main/trunk: ./ build-tools/maven-cayenne-build-plugin/ framework/cayenne-jdk1.5-unpublished/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ framework/cayenne-jdk1.5-unpublished/src/main/j...
Date Tue, 30 Sep 2008 10:38:16 GMT
Author: aadamchik
Date: Tue Sep 30 03:38:16 2008
New Revision: 700411

URL: http://svn.apache.org/viewvc?rev=700411&view=rev
Log:
adding a dep on jdbc4-compat to be able to use JDBC interfaces with both Java 5 and 6

Modified:
    cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/pom.xml
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionConnectionDecorator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ConnectionWrapper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PooledConnectionImpl.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/pom.xml?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/pom.xml (original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-build-plugin/pom.xml Tue Sep 30 03:38:16
2008
@@ -65,6 +65,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>org.objectstyle</groupId>
+			<artifactId>jdbc4-compat</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>oscache</artifactId>
 		</dependency>

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Tue Sep 30 03:38:16 2008
@@ -1,156 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you 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.   
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you 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.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
 	<modelVersion>4.0.0</modelVersion>
-
 	<parent>
 		<groupId>org.apache.cayenne</groupId>
 		<artifactId>cayenne-parent</artifactId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
-
 	<groupId>org.apache.cayenne.unpublished</groupId>
 	<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 	<name>Cayenne Java 1.5 Unpublished</name>
 	<description>Cayenne Java 1.5 Unpublished</description>
 	<packaging>jar</packaging>
-
 	<dependencies>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-
 		<dependency>
-                        <groupId>asm</groupId>
-                        <artifactId>asm</artifactId>
-                </dependency>
-
-                <dependency>
-                        <groupId>asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                </dependency>
-
+			<groupId>asm</groupId>
+			<artifactId>asm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.objectstyle</groupId>
+			<artifactId>jdbc4-compat</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>com.caucho</groupId>
 			<artifactId>resin-hessian</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>jgroups</groupId>
 			<artifactId>jgroups-all</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>ant</groupId>
 			<artifactId>ant</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>velocity</groupId>
 			<artifactId>velocity</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.objectstyle.ashwood</groupId>
 			<artifactId>ashwood</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jms_1.1_spec</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>jivesoftware</groupId>
 			<artifactId>smack</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>jivesoftware</groupId>
 			<artifactId>smackx</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>foundrylogic.vpp</groupId>
 			<artifactId>vpp</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>opensymphony</groupId>
 			<artifactId>oscache</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>mockrunner</groupId>
 			<artifactId>mockrunner</artifactId>
 		</dependency>
-
 	</dependencies>
-
 	<build>
 		<resources>
 			<!-- don't filter dotemplates -->
@@ -168,7 +138,6 @@
 				</includes>
 			</resource>
 		</resources>
-
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -188,10 +157,10 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<sourceDirectory>
-								${basedir}/src/main/jjtree/org/apache/cayenne/ejbql
+								${basedir}/src/main/jjtree/org/apache/cayenne/ejbql 
 							</sourceDirectory>
 							<outputDirectory>
-								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql
+								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql 
 							</outputDirectory>
 							<buildNodeFiles>false</buildNodeFiles>
 						</configuration>
@@ -199,81 +168,63 @@
 							<goal>jjtree</goal>
 						</goals>
 					</execution>
-
 					<execution>
 						<id>javacc-ejbql</id>
 						<phase>generate-sources</phase>
 						<configuration>
 							<sourceDirectory>
-								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql
+								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql 
 							</sourceDirectory>
 							<outputDirectory>
-								${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql
+								${project.build.directory}/generated-sources/javacc/org/apache/cayenne/ejbql 
 							</outputDirectory>
 						</configuration>
 						<goals>
 							<goal>javacc</goal>
 						</goals>
 					</execution>
-					
-					<!-- Commented out expression executions, as exp/parser package is not properly setup
- 
-					it stores generated parser in SVN in src/main/java. So the executions below are used
-					for manual generation -->
-					<!-- 
-					<execution>
-						<id>jjtree-exp</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<sourceDirectory>
-								${basedir}/src/main/jjtree/org/apache/cayenne/exp/parser
-							</sourceDirectory>
-							<outputDirectory>
-								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/exp/parser
-							</outputDirectory>
-							<buildNodeFiles>false</buildNodeFiles>
-						</configuration>
-						<goals>
-							<goal>jjtree</goal>
-						</goals>
-					</execution>
-					
+					<!--
+						Commented out expression executions, as exp/parser package is not
+						properly setup - it stores generated parser in SVN in
+						src/main/java. So the executions below are used for manual
+						generation
+					-->
+					<!--
+						<execution> <id>jjtree-exp</id> <phase>generate-sources</phase>
+						<configuration> <sourceDirectory>
+						${basedir}/src/main/jjtree/org/apache/cayenne/exp/parser
+						</sourceDirectory> <outputDirectory>
+						${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/exp/parser
+						</outputDirectory> <buildNodeFiles>false</buildNodeFiles>
+						</configuration> <goals> <goal>jjtree</goal> </goals>
</execution>
+						<execution> <id>javacc-exp</id> <phase>generate-sources</phase>
+						<configuration> <sourceDirectory>
+						${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/exp/parser
+						</sourceDirectory> <outputDirectory>
+						${project.build.directory}/generated-sources/javacc/org/apache/cayenne/exp/parser
+						</outputDirectory> </configuration> <goals> <goal>javacc</goal>
+						</goals> </execution>
+					-->
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
 					<execution>
-						<id>javacc-exp</id>
-						<phase>generate-sources</phase>
+						<phase>process-sources</phase>
 						<configuration>
-							<sourceDirectory>
-								${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/exp/parser
-							</sourceDirectory>
-							<outputDirectory>
-								${project.build.directory}/generated-sources/javacc/org/apache/cayenne/exp/parser
-							</outputDirectory>
+							<tasks>
+								<delete
+									file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/Node.java"
/>
+							</tasks>
 						</configuration>
 						<goals>
-							<goal>javacc</goal>
+							<goal>run</goal>
 						</goals>
 					</execution>
-					
-					 -->
 				</executions>
 			</plugin>
 			<plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <delete
-                                    file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/Node.java"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
@@ -286,7 +237,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.cayenne.build-tools</groupId>
 				<artifactId>maven-cayenne-build-plugin</artifactId>
@@ -301,5 +251,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-</project>
+</project>
\ No newline at end of file

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionConnectionDecorator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionConnectionDecorator.java?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionConnectionDecorator.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/TransactionConnectionDecorator.java
Tue Sep 30 03:38:16 2008
@@ -25,9 +25,12 @@
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.NClob;
 import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.sql.SQLXML;
 import java.sql.Savepoint;
 import java.sql.Statement;
 import java.sql.Struct;
@@ -103,7 +106,7 @@
         return connection.getTransactionIsolation();
     }
 
-    public Map getTypeMap() throws SQLException {
+    public Map<String,Class<?>> getTypeMap() throws SQLException {
         return connection.getTypeMap();
     }
 
@@ -280,6 +283,22 @@
      * @since 3.0
      */
     // JDBC 4 compatibility under Java 1.5
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
     public boolean isValid(int timeout) throws SQLException {
         throw new UnsupportedOperationException();
     }
@@ -300,4 +319,19 @@
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public NClob createNClob() throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public SQLXML createSQLXML() throws SQLException {
+        throw new UnsupportedOperationException();
+    }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ConnectionWrapper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ConnectionWrapper.java?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ConnectionWrapper.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/ConnectionWrapper.java
Tue Sep 30 03:38:16 2008
@@ -25,9 +25,12 @@
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.NClob;
 import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.sql.SQLXML;
 import java.sql.Savepoint;
 import java.sql.Statement;
 import java.sql.Struct;
@@ -70,8 +73,8 @@
         }
     }
 
-    /** 
-     * Creates new ConnectionWrapper 
+    /**
+     * Creates new ConnectionWrapper
      */
     public ConnectionWrapper(Connection connection, PooledConnectionImpl pooledConnection)
{
         this.connection = connection;
@@ -358,7 +361,7 @@
         }
     }
 
-    public Map getTypeMap() throws SQLException {
+    public Map<String,Class<?>> getTypeMap() throws SQLException {
         try {
             return connection.getTypeMap();
         }
@@ -368,7 +371,7 @@
         }
     }
 
-    public void setTypeMap(Map<String,Class<?>> map) throws SQLException {
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
         try {
             connection.setTypeMap(map);
         }
@@ -560,4 +563,36 @@
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw new UnsupportedOperationException();
     }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public NClob createNClob() throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public SQLXML createSQLXML() throws SQLException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        throw new UnsupportedOperationException();
+    }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PooledConnectionImpl.java?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PooledConnectionImpl.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/PooledConnectionImpl.java
Tue Sep 30 03:38:16 2008
@@ -29,6 +29,7 @@
 import javax.sql.ConnectionEventListener;
 import javax.sql.DataSource;
 import javax.sql.PooledConnection;
+import javax.sql.StatementEventListener;
 
 /**
  * PooledConnectionImpl is an implementation of a pooling wrapper for the database
@@ -182,4 +183,20 @@
             }
         }
     }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public void addStatementEventListener(StatementEventListener listener) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 3.0
+     */
+    // JDBC 4 compatibility under Java 1.5
+    public void removeStatementEventListener(StatementEventListener listener) {
+        throw new UnsupportedOperationException();
+    }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSQLTemplateAction.java
Tue Sep 30 03:38:16 2008
@@ -27,11 +27,14 @@
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.Date;
+import java.sql.NClob;
 import java.sql.Ref;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -706,166 +709,415 @@
             return delegate.wasNull();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public int getHoldability() throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public Reader getNCharacterStream(int arg0) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public Reader getNCharacterStream(String arg0) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
-        public String getNString(int arg0) throws SQLException {
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public String getNString(int columnIndex) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public String getNString(String arg0) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public boolean isClosed() throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateAsciiStream(int arg0, InputStream arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateAsciiStream(String arg0, InputStream arg1) throws SQLException
{
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateAsciiStream(int arg0, InputStream arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateAsciiStream(String arg0, InputStream arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBinaryStream(int arg0, InputStream arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBinaryStream(String arg0, InputStream arg1) throws SQLException
{
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBinaryStream(int arg0, InputStream arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBinaryStream(String arg0, InputStream arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBlob(int arg0, InputStream arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBlob(String arg0, InputStream arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBlob(int arg0, InputStream arg1, long arg2) throws SQLException
{
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateBlob(String arg0, InputStream arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateCharacterStream(int arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateCharacterStream(String arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateCharacterStream(int arg0, Reader arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateCharacterStream(String arg0, Reader arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateClob(int arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateClob(String arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateClob(int arg0, Reader arg1, long arg2) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateClob(String arg0, Reader arg1, long arg2) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNCharacterStream(int arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNCharacterStream(String arg0, Reader arg1) throws SQLException
{
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNCharacterStream(int arg0, Reader arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNCharacterStream(String arg0, Reader arg1, long arg2)
                 throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNClob(int arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNClob(String arg0, Reader arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNClob(int arg0, Reader arg1, long arg2) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNClob(String arg0, Reader arg1, long arg2) throws SQLException
{
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNString(int arg0, String arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public void updateNString(String arg0, String arg1) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public boolean isWrapperFor(Class<?> iface) throws SQLException {
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
         public <T> T unwrap(Class<T> iface) throws SQLException {
             throw new UnsupportedOperationException();
         }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public NClob getNClob(int arg0) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public NClob getNClob(String columnLabel) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public RowId getRowId(int columnIndex) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public RowId getRowId(String columnLabel) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public SQLXML getSQLXML(int columnIndex) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public SQLXML getSQLXML(String columnLabel) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateNClob(int columnIndex, NClob clob) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateNClob(String columnLabel, NClob clob) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateRowId(int columnIndex, RowId x) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateRowId(String columnLabel, RowId x) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @since 3.0
+         */
+        // JDBC 4 compatibility under Java 1.5
+        public void updateSQLXML(String columnLabel, SQLXML xmlObject)
+                throws SQLException {
+            throw new UnsupportedOperationException();
+        }
     }
 
     final class OracleResultSetMetadata implements ResultSetMetaData {

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=700411&r1=700410&r2=700411&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Tue Sep 30 03:38:16 2008
@@ -350,6 +350,13 @@
 			</dependency>
 
 			<dependency>
+				<groupId>org.objectstyle</groupId>
+				<artifactId>jdbc4-compat</artifactId>
+				<version>1.0</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
 				<groupId>jgoodies</groupId>
 				<artifactId>forms</artifactId>
 				<version>1.0.5</version>



Mime
View raw message