[teiid-commits] teiid SVN: r811 - in trunk: client-jdbc30 and 2 other directories.

Author: rareddy Date: 2009-04-20 22:16:03 -0400 (Mon, 20 Apr 2009) New Revision: 811 Modified: trunk/client-jdbc30/ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/UrlServerDiscovery.java trunk/common-core/src/main/java/com/metamatrix/api/exception/ExceptionHolder.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java Log: TEIID-177: adding language processors such that same code can be compiled aginst java 1.5 and java 1.6. Also between JDBC 4.0 and JDBC 3.0 Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java 2009-04-21 00:10:07 UTC (rev 810) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/SocketServerInstanceImpl.java 2009-04-21 02:16:03 UTC (rev 811) @@ -105,12 +105,16 @@ } } - @Override + //## JDBC4.0-begin ## + @Override + //## JDBC4.0-end ## public HostInfo getHostInfo() { return this.hostInfo; } - @Override + //## JDBC4.0-begin ## + @Override + //## JDBC4.0-end ## public SocketAddress getRemoteAddress() { return this.socketChannel.getRemoteAddress(); } Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/UrlServerDiscovery.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/UrlServerDiscovery.java 2009-04-21 00:10:07 UTC (rev 810) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/client/UrlServerDiscovery.java 2009-04-21 02:16:03 UTC (rev 811) @@ -43,28 +43,38 @@ this.url = url; } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public List<HostInfo> getKnownHosts(LogonResult result, SocketServerInstance instance) { return url.getHostInfo(); } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void init(MMURL url, Properties p) { this.url = url; } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void connectionSuccessful(HostInfo info) { } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void markInstanceAsBad(HostInfo info) { } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void shutdown() { } Property changes on: trunk/client-jdbc30 ___________________________________________________________________ Name: svn:ignore - .classpath .project .settings + .classpath .project .settings target Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/ExceptionHolder.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/api/exception/ExceptionHolder.java 2009-04-21 00:10:07 UTC (rev 810) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/ExceptionHolder.java 2009-04-21 02:16:03 UTC (rev 811) @@ -59,7 +59,9 @@ } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { List<String> classNames = (List<String>)in.readObject();; String message = (String)in.readObject(); @@ -90,7 +92,9 @@ } } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void writeExternal(ObjectOutput out) throws IOException { List<String> classNames = new ArrayList<String>(); Class<?> clazz = exception.getClass(); Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java 2009-04-21 00:10:07 UTC (rev 810) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleException.java 2009-04-21 02:16:03 UTC (rev 811) @@ -95,13 +95,17 @@ return this.throwablesList; } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void readExternal(ObjectInput in) throws IOException,ClassNotFoundException { this.code = (String)in.readObject(); this.throwablesList = ExceptionHolder.toThrowables((List<ExceptionHolder>)in.readObject()); } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(code); out.writeObject(ExceptionHolder.toExceptionHolders(throwablesList)); Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java 2009-04-21 00:10:07 UTC (rev 810) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTypeInfo.java 2009-04-21 02:16:03 UTC (rev 811) @@ -24,7 +24,13 @@ import java.sql.Blob; import java.sql.Clob; +//## JDBC4.0-begin ## import java.sql.SQLXML; +//## JDBC4.0-end ## + +/*## JDBC3.0-JDK1.5-begin ## +import com.metamatrix.core.jdbc.SQLXML; +## JDBC3.0-JDK1.5-end ##*/ import java.sql.Types; import java.util.HashMap; import java.util.Map; @@ -126,7 +132,15 @@ CLASSNAME_TO_TYPE_MAP.put(OBJECT_CLASS.toLowerCase(), Integer.valueOf(Types.JAVA_OBJECT)); CLASSNAME_TO_TYPE_MAP.put(CLOB_CLASS.toLowerCase(), Integer.valueOf(Types.CLOB)); CLASSNAME_TO_TYPE_MAP.put(BLOB_CLASS.toLowerCase(), Integer.valueOf(Types.BLOB)); + + //## JDBC4.0-begin ## CLASSNAME_TO_TYPE_MAP.put(XML_CLASS.toLowerCase(), Integer.valueOf(Types.SQLXML)); + //## JDBC4.0-end ## + + /*## JDBC3.0-JDK1.5-begin ## + CLASSNAME_TO_TYPE_MAP.put(XML_CLASS.toLowerCase(), Integer.valueOf(Types.JAVA_OBJECT)); + ## JDBC3.0-JDK1.5-end ##*/ + } /**