summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-28 06:33:06 (EST)
committer Stephan Born2012-04-27 06:35:19 (EDT)
commit236b890536733619c6047fb68376554f7c4f4b20 (patch)
tree52fff16bb26c2f2dc345cb1933d62bee7712282a
parentb346daef68e55f21b3685d7df10e61e3b9f3e9cc (diff)
downloadorg.eclipse.stardust.reporting.rt-236b890536733619c6047fb68376554f7c4f4b20.zip
org.eclipse.stardust.reporting.rt-236b890536733619c6047fb68376554f7c4f4b20.tar.gz
org.eclipse.stardust.reporting.rt-236b890536733619c6047fb68376554f7c4f4b20.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/reporting.rt@54102 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--org.eclipse.stardust.reporting.common.nl/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.common.nl/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.common/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.common/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingSession.java14
-rw-r--r--org.eclipse.stardust.reporting.oda.common.nl/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.common.nl/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.oda.common/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.common/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.oda.model.nl/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.model.nl/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.oda.model/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.model/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.oda.processes.nl/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.processes.nl/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.oda.processes/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.oda.processes/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--org.eclipse.stardust.reporting.reports.core/.classpath2
-rw-r--r--org.eclipse.stardust.reporting.reports.core/.settings/org.eclipse.jdt.core.prefs8
19 files changed, 75 insertions, 29 deletions
diff --git a/org.eclipse.stardust.reporting.common.nl/.classpath b/org.eclipse.stardust.reporting.common.nl/.classpath
index bd41578..0d5aa39 100644
--- a/org.eclipse.stardust.reporting.common.nl/.classpath
+++ b/org.eclipse.stardust.reporting.common.nl/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path=".eclipse/bin"/>
</classpath>
diff --git a/org.eclipse.stardust.reporting.common.nl/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.common.nl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0df4a63
--- /dev/null
+++ b/org.eclipse.stardust.reporting.common.nl/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Feb 27 10:38:27 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.common/.classpath b/org.eclipse.stardust.reporting.common/.classpath
index 64c5e31..ad32c83 100644
--- a/org.eclipse.stardust.reporting.common/.classpath
+++ b/org.eclipse.stardust.reporting.common/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.stardust.reporting.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.common/.settings/org.eclipse.jdt.core.prefs
index 9f99c51..8e75e13 100644
--- a/org.eclipse.stardust.reporting.common/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stardust.reporting.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Thu Oct 22 10:20:16 CEST 2009
+#Mon Feb 27 10:38:14 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
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingSession.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingSession.java
index 966ee74..672baae 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingSession.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingSession.java
@@ -306,6 +306,20 @@ public class ReportingSession extends org.eclipse.stardust.engine.core.persisten
{
throw new UnsupportedOperationException();
}
+
+ @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;
+ }
}
}
diff --git a/org.eclipse.stardust.reporting.oda.common.nl/.classpath b/org.eclipse.stardust.reporting.oda.common.nl/.classpath
index bd41578..0d5aa39 100644
--- a/org.eclipse.stardust.reporting.oda.common.nl/.classpath
+++ b/org.eclipse.stardust.reporting.oda.common.nl/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path=".eclipse/bin"/>
</classpath>
diff --git a/org.eclipse.stardust.reporting.oda.common.nl/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.common.nl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..ec574c0
--- /dev/null
+++ b/org.eclipse.stardust.reporting.oda.common.nl/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Feb 27 10:38:53 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.oda.common/.classpath b/org.eclipse.stardust.reporting.oda.common/.classpath
index 64c5e31..ad32c83 100644
--- a/org.eclipse.stardust.reporting.oda.common/.classpath
+++ b/org.eclipse.stardust.reporting.oda.common/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.stardust.reporting.oda.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.common/.settings/org.eclipse.jdt.core.prefs
index 72d83c4..79fd694 100644
--- a/org.eclipse.stardust.reporting.oda.common/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stardust.reporting.oda.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Tue Sep 29 14:52:04 CEST 2009
+#Mon Feb 27 10:38:37 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.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.oda.model.nl/.classpath b/org.eclipse.stardust.reporting.oda.model.nl/.classpath
index bd41578..0d5aa39 100644
--- a/org.eclipse.stardust.reporting.oda.model.nl/.classpath
+++ b/org.eclipse.stardust.reporting.oda.model.nl/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path=".eclipse/bin"/>
</classpath>
diff --git a/org.eclipse.stardust.reporting.oda.model.nl/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.model.nl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..65a81a3
--- /dev/null
+++ b/org.eclipse.stardust.reporting.oda.model.nl/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Feb 27 10:42:03 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.oda.model/.classpath b/org.eclipse.stardust.reporting.oda.model/.classpath
index 64c5e31..ad32c83 100644
--- a/org.eclipse.stardust.reporting.oda.model/.classpath
+++ b/org.eclipse.stardust.reporting.oda.model/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.stardust.reporting.oda.model/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.model/.settings/org.eclipse.jdt.core.prefs
index d3c6b18..a87e573 100644
--- a/org.eclipse.stardust.reporting.oda.model/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stardust.reporting.oda.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Tue Sep 29 14:52:43 CEST 2009
+#Mon Feb 27 10:41:51 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.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.oda.processes.nl/.classpath b/org.eclipse.stardust.reporting.oda.processes.nl/.classpath
index bd41578..0d5aa39 100644
--- a/org.eclipse.stardust.reporting.oda.processes.nl/.classpath
+++ b/org.eclipse.stardust.reporting.oda.processes.nl/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path=".eclipse/bin"/>
</classpath>
diff --git a/org.eclipse.stardust.reporting.oda.processes.nl/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.processes.nl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..66181a2
--- /dev/null
+++ b/org.eclipse.stardust.reporting.oda.processes.nl/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Feb 27 10:42:23 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.stardust.reporting.oda.processes/.classpath b/org.eclipse.stardust.reporting.oda.processes/.classpath
index 64c5e31..ad32c83 100644
--- a/org.eclipse.stardust.reporting.oda.processes/.classpath
+++ b/org.eclipse.stardust.reporting.oda.processes/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.stardust.reporting.oda.processes/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.oda.processes/.settings/org.eclipse.jdt.core.prefs
index 5340816..7b502c0 100644
--- a/org.eclipse.stardust.reporting.oda.processes/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stardust.reporting.oda.processes/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
-#Tue Sep 29 14:52:10 CEST 2009
+#Mon Feb 27 10:42:13 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.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/org.eclipse.stardust.reporting.reports.core/.classpath b/org.eclipse.stardust.reporting.reports.core/.classpath
index 64c5e31..ad32c83 100644
--- a/org.eclipse.stardust.reporting.reports.core/.classpath
+++ b/org.eclipse.stardust.reporting.reports.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.stardust.reporting.reports.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stardust.reporting.reports.core/.settings/org.eclipse.jdt.core.prefs
index 73a4f6b..343715f 100644
--- a/org.eclipse.stardust.reporting.reports.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stardust.reporting.reports.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Tue Sep 29 14:53:56 CEST 2009
+#Mon Feb 27 10:42:35 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.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6