summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-28 06:33:06 (EST)
committer Stephan Born2012-04-23 07:39:38 (EDT)
commit37cbf42aa5d467d322c215e6b326e6090f78d875 (patch)
treefa615f069142ae1400d72f944e38fcd9bf7dcba2
parentbb29fcdf1a7ac57a863c41e81f2ed3f636debb6e (diff)
downloadorg.eclipse.stardust.engine-37cbf42aa5d467d322c215e6b326e6090f78d875.zip
org.eclipse.stardust.engine-37cbf42aa5d467d322c215e6b326e6090f78d875.tar.gz
org.eclipse.stardust.engine-37cbf42aa5d467d322c215e6b326e6090f78d875.tar.bz2
Jira-ID: CRNT-23823
CRNT-23823 Adapt build process in order to compile product with Java6 git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/engine@54102 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--stardust-engine-core/.classpath2
-rw-r--r--stardust-engine-core/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--stardust-engine-core/.settings/org.eclipse.wst.common.project.facet.core.xml14
-rw-r--r--stardust-engine-core/build.xml14
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/common/ConcatenatedList.java2
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/AliasProjectionResultSet.java360
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalDataSource.java14
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalJDBCConnection.java108
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/MultiplePersistentResultSet.java372
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java14
-rw-r--r--stardust-engine-spring/.classpath2
-rw-r--r--stardust-engine-spring/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--stardust-engine-spring/build.xml6
-rw-r--r--stardust-engine-spring/src/main/java/org/eclipse/stardust/engine/api/spring/SpringSessionInterceptor.java28
14 files changed, 917 insertions, 30 deletions
diff --git a/stardust-engine-core/.classpath b/stardust-engine-core/.classpath
index ac84c55..1242fc4 100644
--- a/stardust-engine-core/.classpath
+++ b/stardust-engine-core/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/xml/stream/1.0-2/stax-api-1.0-2.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/javax/xml/bind/2.1/jaxb-api-2.1.jar" sourcepath="Q-ARCHIVE/thirdparty/javax/xml/bind/2.1/jaxb-api-2.1-sources.jar"/>
<classpathentry exported="true" kind="var" path="Q-ARCHIVE/thirdparty/javax/ejb/2.1/ejb-2.1.jar">
diff --git a/stardust-engine-core/.settings/org.eclipse.jdt.core.prefs b/stardust-engine-core/.settings/org.eclipse.jdt.core.prefs
index 047a1f3..9160f74 100644
--- a/stardust-engine-core/.settings/org.eclipse.jdt.core.prefs
+++ b/stardust-engine-core/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Tue Dec 06 10:51:46 CET 2011
+#Thu Feb 23 14:08:26 CET 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -71,4 +71,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/stardust-engine-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/stardust-engine-core/.settings/org.eclipse.wst.common.project.facet.core.xml
index f3e96c9..80e8527 100644
--- a/stardust-engine-core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/stardust-engine-core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,17 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?> <!--
- Copyright (c) 2011 SunGard CSA LLC and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- SunGard CSA LLC - initial API and implementation and/or initial documentation
- -->
-
+<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.6"/>
</faceted-project>
diff --git a/stardust-engine-core/build.xml b/stardust-engine-core/build.xml
index 61d051a..e58e54b 100644
--- a/stardust-engine-core/build.xml
+++ b/stardust-engine-core/build.xml
@@ -232,13 +232,13 @@
<delete dir="${build.classes}" />
</target>
- <target name="compile" depends="prepareSources, initKernelBuildDirectories, initClasspath, compile.jdk15"
+ <target name="compile" depends="prepareSources, initKernelBuildDirectories, initClasspath, compile.jdk16"
description="compiles the carnot kernel classes" />
- <target name="compile.jdk15" depends="init"
- description="Compiling Java 1.5 code">
+ <target name="compile.jdk16" depends="init"
+ description="Compiling Java 1.6 code">
- <ipp:javac-java5
+ <ipp:javac-java6
srcdir="${build.src.generated}" sourcepath="${build.src.generated}:${build.src.static}"
destdir="${build.classes}">
@@ -249,9 +249,9 @@
<path refid="carnot.classpath" />
<path refid="secret.classpath" />
</classpath>
- </ipp:javac-java5>
+ </ipp:javac-java6>
- <ipp:javac-java5
+ <ipp:javac-java6
srcdir="${build.src.static}" sourcepath="${build.src.generated}:${build.src.static}"
destdir="${build.classes}">
@@ -260,7 +260,7 @@
<patternset refid="kernel.sources.exclude" />
<classpath refid="compile.classpath" />
- </ipp:javac-java5>
+ </ipp:javac-java6>
</target>
<target name="prepareSources" depends="initKernelBuild, prepareSourcesExclusions, prepareSourcesForFastBuild, prepareSourcesForSafeBuild" />
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/common/ConcatenatedList.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/common/ConcatenatedList.java
index d204c4b..3b11a45 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/common/ConcatenatedList.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/common/ConcatenatedList.java
@@ -37,6 +37,6 @@ public class ConcatenatedList<E> extends AbstractList<E> implements List<E>, Ser
public E get(int index)
{
- return (index < a.size() ? a.get(index) : b.get(index - a.size()));
+ return (E)(index < a.size() ? a.get(index) : b.get(index - a.size()));
}
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/AliasProjectionResultSet.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/AliasProjectionResultSet.java
index 23a2da3..0ce96d6 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/AliasProjectionResultSet.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/AliasProjectionResultSet.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.stardust.engine.core.persistence.jdbc;
+import java.io.InputStream;
+import java.io.Reader;
import java.io.Serializable;
import java.math.BigDecimal;
import java.net.URL;
@@ -971,4 +973,362 @@ public class AliasProjectionResultSet implements ResultSet, Serializable
GLOBAL_RS_INDEX,
OBJECT
}
+
+ @Override
+ public boolean isWrapperFor(Class< ? > arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getHoldability() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public Reader getNCharacterStream(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Reader getNCharacterStream(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob getNClob(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob getNClob(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getNString(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getNString(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public RowId getRowId(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public RowId getRowId(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML getSQLXML(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML getSQLXML(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void updateAsciiStream(int arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(String arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(int arg0, InputStream arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(String arg0, InputStream arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(int arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(String arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(int arg0, InputStream arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(String arg0, InputStream arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(int arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(String arg0, InputStream arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(int arg0, InputStream arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(String arg0, InputStream arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(int arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(String arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(int arg0, Reader arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(String arg0, Reader arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(int arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(String arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(int arg0, Reader arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(String arg0, Reader arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(int arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(String arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(int arg0, Reader arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(String arg0, Reader arg1, long arg2)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int arg0, NClob arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String arg0, NClob arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String arg0, Reader arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int arg0, Reader arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String arg0, Reader arg1, long arg2) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNString(int arg0, String arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNString(String arg0, String arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateRowId(int arg0, RowId arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateRowId(String arg0, RowId arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateSQLXML(int arg0, SQLXML arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateSQLXML(String arg0, SQLXML arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalDataSource.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalDataSource.java
index 597b9cf..e3fee66 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalDataSource.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalDataSource.java
@@ -174,5 +174,19 @@ public class LocalDataSource implements DataSource, IDisposable
{
resetConnectionPool();
}
+
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalJDBCConnection.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalJDBCConnection.java
index fb41c0b..5456fcd 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalJDBCConnection.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/LocalJDBCConnection.java
@@ -10,7 +10,22 @@
*******************************************************************************/
package org.eclipse.stardust.engine.core.persistence.jdbc;
-import java.sql.*;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+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;
+import java.util.Properties;
/**
* <code>LocalJDBCConnection</code> delegates all functionality to the underlying java.sql.Connection, except Close
@@ -226,6 +241,97 @@ class LocalJDBCConnection implements Connection
return null;
}
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Array createArrayOf(String arg0, Object[] arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Blob createBlob() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Clob createClob() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob createNClob() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML createSQLXML() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Struct createStruct(String arg0, Object[] arg1) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Properties getClientInfo() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getClientInfo(String arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isValid(int arg0) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void setClientInfo(Properties arg0) throws SQLClientInfoException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setClientInfo(String arg0, String arg1) throws SQLClientInfoException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
/*
class Savepoint
{
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/MultiplePersistentResultSet.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/MultiplePersistentResultSet.java
index af3fbef..b4d93eb 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/MultiplePersistentResultSet.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/persistence/jdbc/MultiplePersistentResultSet.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.stardust.engine.core.persistence.jdbc;
+import java.io.InputStream;
+import java.io.Reader;
import java.io.Serializable;
import java.math.BigDecimal;
import java.net.URL;
@@ -17,11 +19,14 @@ import java.sql.Array;
import java.sql.Blob;
import java.sql.Clob;
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;
@@ -833,4 +838,371 @@ public class MultiplePersistentResultSet implements ResultSet, Serializable
{
//resultSet.updateRef(columnName, x);
}
+
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getHoldability() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public Reader getNCharacterStream(int columnIndex) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Reader getNCharacterStream(String columnLabel) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob getNClob(int columnIndex) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob getNClob(String columnLabel) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getNString(int columnIndex) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getNString(String columnLabel) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public RowId getRowId(int columnIndex) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public RowId getRowId(String columnLabel) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML getSQLXML(int columnIndex) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML getSQLXML(String columnLabel) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(int columnIndex, InputStream x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateAsciiStream(String columnLabel, InputStream x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(int columnIndex, InputStream x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBinaryStream(String columnLabel, InputStream x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(String columnLabel, InputStream inputStream)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(int columnIndex, InputStream inputStream, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateBlob(String columnLabel, InputStream inputStream, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(String columnLabel, Reader reader)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(int columnIndex, Reader x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateCharacterStream(String columnLabel, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(int columnIndex, Reader reader) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(String columnLabel, Reader reader) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(int columnIndex, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateClob(String columnLabel, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(String columnLabel, Reader reader)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(int columnIndex, Reader x, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNCharacterStream(String columnLabel, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, Reader reader) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, Reader reader) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(int columnIndex, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNClob(String columnLabel, Reader reader, long length)
+ throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNString(int columnIndex, String nString) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateNString(String columnLabel, String nString) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateRowId(int columnIndex, RowId x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateRowId(String columnLabel, RowId x) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException
+ {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
index a249970..00418f8 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
@@ -875,5 +875,19 @@ public class R6_0_0from5_2_0RuntimeJob extends DbmsAwareRuntimeUpgradeJob
{
throw new UnsupportedOperationException();
}
+
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
}
diff --git a/stardust-engine-spring/.classpath b/stardust-engine-spring/.classpath
index f2bde03..9b04f2d 100644
--- a/stardust-engine-spring/.classpath
+++ b/stardust-engine-spring/.classpath
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="var" path="CARNOT_HOME/lib/carnot-engine.jar" sourcepath="/CARNOT_HOME/src/carnot-engine-src.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring.jar" sourcepath="/Q-ARCHIVE/thirdparty/spring/framework/2.5.6/spring-sources.jar"/>
<classpathentry kind="var" path="Q-ARCHIVE/thirdparty/servlet/2.4/servlet-2.4.jar"/>
diff --git a/stardust-engine-spring/.settings/org.eclipse.jdt.core.prefs b/stardust-engine-spring/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a1c5608
--- /dev/null
+++ b/stardust-engine-spring/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 23 15:13:04 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/stardust-engine-spring/build.xml b/stardust-engine-spring/build.xml
index 67beff6..b18750a 100644
--- a/stardust-engine-spring/build.xml
+++ b/stardust-engine-spring/build.xml
@@ -93,13 +93,13 @@
</target>
<target name="compile" depends="initBuildDirectories, initClasspath, init" description="Compiles the project's Java classes">
- <ipp:javac-java5 srcdir="${project.src}" destdir="${build.classes}">
+ <ipp:javac-java6 srcdir="${project.src}" destdir="${build.classes}">
<include name="**/*.java" />
- <classpath id="compile5.classpath">
+ <classpath id="compile6.classpath">
<path path="${build.classes}" />
<path refid="carnot-spring.classpath" />
</classpath>
- </ipp:javac-java5>
+ </ipp:javac-java6>
</target>
<target name="jar" depends="compile">
diff --git a/stardust-engine-spring/src/main/java/org/eclipse/stardust/engine/api/spring/SpringSessionInterceptor.java b/stardust-engine-spring/src/main/java/org/eclipse/stardust/engine/api/spring/SpringSessionInterceptor.java
index d363def..631ef4a 100644
--- a/stardust-engine-spring/src/main/java/org/eclipse/stardust/engine/api/spring/SpringSessionInterceptor.java
+++ b/stardust-engine-spring/src/main/java/org/eclipse/stardust/engine/api/spring/SpringSessionInterceptor.java
@@ -254,6 +254,20 @@ public class SpringSessionInterceptor extends AuditTrailPropertiesInterceptor
throw new UnsupportedOperationException(
"This Spring DataSource adapter is not intended to be used this way.");
}
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
private static final class DeferredConnectionDataSourceAdapter
@@ -366,5 +380,19 @@ public class SpringSessionInterceptor extends AuditTrailPropertiesInterceptor
throw new UnsupportedOperationException(
"This Spring DataSource adapter is not intended to be used this way.");
}
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isWrapperFor(Class< ? > iface) throws SQLException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
}