[458349] Consolidate UI (Update to Mars)

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

2 files changed, 14 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF
index 0bb87d0e24..feaeb28fcf 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.db4o;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.200",
- org.eclipse.emf.cdo.server.internal.db4o;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.db4o",
- org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.200";x-internal:=true
-Import-Package: com.db4o;version="[7.4.0,8.0.0)",
- com.db4o.config;version="[7.4.0,8.0.0)",
- com.db4o.constraints;version="[7.4.0,8.0.0)",
- com.db4o.ext;version="[7.4.0,8.0.0)",
- com.db4o.query;version="[7.4.0,8.0.0)",
- com.db4o.reflect;version="[7.4.0,8.0.0)",
- com.db4o.reflect.jdk;version="[7.4.0,8.0.0)",
+Export-Package: org.eclipse.emf.cdo.server.db4o;version="4.0.300",
+ org.eclipse.emf.cdo.server.internal.db4o;version="4.0.300";x-friends:="org.eclipse.emf.cdo.tests.db4o",
+ org.eclipse.emf.cdo.server.internal.db4o.bundle;version="4.0.300";x-internal:=true
+Import-Package: com.db4o;version="[7.4.0,9.0.0)",
+ com.db4o.config;version="[7.4.0,9.0.0)",
+ com.db4o.constraints;version="[7.4.0,9.0.0)",
+ com.db4o.ext;version="[7.4.0,9.0.0)",
+ com.db4o.query;version="[7.4.0,9.0.0)",
+ com.db4o.reflect;version="[7.4.0,9.0.0)",
+ com.db4o.reflect.jdk;version="[7.4.0,9.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java
index f26ddaeff5..e928c52af5 100644
--- a/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db4o/src/org/eclipse/emf/cdo/server/internal/db4o/DB4OStore.java
@@ -204,6 +204,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore
     }
   }
 
+  @SuppressWarnings("deprecation")
   protected void initObjectServer()
   {
     Configuration configuration = serverConfiguration;
@@ -347,6 +348,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore
 
   protected Configuration createServerConfiguration()
   {
+    @SuppressWarnings("deprecation")
     Configuration config = Db4o.newConfiguration();
     config.reflectWith(new JdkReflector(getClass().getClassLoader()));
 
@@ -440,7 +442,7 @@ public class DB4OStore extends LongIDStore implements IDB4OStore
 
   /**
    * Carries {@link IStore}-related information.
-   * 
+   *
    * @author Victor Roldan Betancort
    */
   private static final class ServerInfo