Include acorn db in db.client feature and make it the default db driver

refs #6596

Change-Id: I3be497696e5f0876387de5e6b5fb05144df2670b

diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
index 24f576bdc166c033c4278cf9ead5e248172fc664..9152acafd81bca244dc924c6c94350fc07b0730b 100644 (file)
--- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
@@ -4,17 +4,13 @@ Bundle-Name: Acorn Database for Simantics
 Bundle-SymbolicName: org.simantics.acorn
 Bundle-Version: 1.1.2.qualifier
 Bundle-Vendor: Semantum Oy
-Require-Bundle: org.apache.log4j;visibility:=reexport,
- org.simantics.db;bundle-version="0.8.0";visibility:=reexport,
- org.simantics.db.common;bundle-version="0.8.0";visibility:=reexport,
- gnu.trove3;bundle-version="3.0.0",
+Require-Bundle: gnu.trove3;bundle-version="3.0.0",
  gnu.trove2;bundle-version="2.0.4",
  org.simantics.db.impl;bundle-version="0.8.0",
  org.simantics.db.server;bundle-version="1.0.0",
  org.simantics.compressions;bundle-version="1.0.0",
  org.simantics.backup,
  org.eclipse.core.runtime;bundle-version="3.11.1",
- org.simantics.fastlz;bundle-version="1.2.1",
  org.simantics.db.procore
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.simantics.acorn/OSGI-INF/component.xml b/bundles/org.simantics.acorn/OSGI-INF/component.xml
index 75dd81fd9d6d4135a5e86c765822e742ff4ecf56..5b88ac3c0efb1a2b9831dec96decd72d6be8e2ed 100644 (file)
--- a/bundles/org.simantics.acorn/OSGI-INF/component.xml
+++ b/bundles/org.simantics.acorn/OSGI-INF/component.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.simantics.acorn.backupProvider">
-    <implementation class="org.siorg.simantics.acorn.backup.AcornBackupProvider"/>
+    <implementation class="org.simantics.acorn.backup.AcornBackupProvider"/>
     <service>
         <provide interface="org.simantics.backup.IBackupProvider"/>
     </service>

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
index 3bde5dc422a4a2a810f32ba4f6faf67d101e0b6e..4a673b97dce934bf7165bdded2744db8382b63f8 100644 (file)
--- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java
@@ -33,8 +33,8 @@ public class ServerManagerFactory {
     public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException {\r
         Driver driver = Manager.getDriver(databaseId);\r
         if (driver == null)\r
-            throw new IllegalArgumentException("Database driver for ID " + databaseId + " Could not be found!");\r
-        System.out.println("ServerManagerFactory.create called with databaseId=" + databaseId + " and driver is " + driver.toString());\r
+            throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!");\r
+        System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString());\r
         DatabaseUserAgent agent = Manager.getUserAgent(databaseId);\r
         if (agent != null)\r
             driver.setDatabaseUserAgent(address, agent);\r

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
index 2d054eaa7d0d7a1fa2367fce88996772f4023f5a..362102172a7a7a9d9c38a4302d8a4be8e41786c6 100644 (file)
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
@@ -134,7 +134,7 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
     /**\r
      * Default database ID\r
      */\r
-    private static final String DEFAULT_DATABASE_ID = "procore";\r
+    private static final String DEFAULT_DATABASE_ID = "acorn";\r
     \r
     /**\r
      * The arguments received by the application.\r

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
index 89a5d3dbd52df2e7376cafb836b9b7f7724145ec..611cfa575843857d7f6b4e476d15641e6185d29d 100644 (file)
--- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
@@ -39,8 +39,6 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;\r
 import org.eclipse.core.runtime.SubMonitor;\r
 import org.eclipse.osgi.service.resolver.BundleDescription;\r
-import org.simantics.SimanticsPlatform.OntologyRecoveryPolicy;\r
-import org.simantics.SimanticsPlatform.RecoveryPolicy;\r
 import org.simantics.databoard.Bindings;\r
 import org.simantics.databoard.Databoard;\r
 import org.simantics.datatypes.literal.Font;\r
@@ -286,7 +284,9 @@ public class SimanticsPlatform implements LifecycleListener {
                     // Check hash of transferable graph to know whether to update or not.\r
                     if (platformBundle.getHashcode() == existingBundle.getHashcode())\r
                         continue;\r
-                    System.out.println("Ontology hashcodes does not match! platformBundle" + platformBundle.getName() + ".getHashCode()=" + platformBundle.getHashcode() + " existingBundle" + existingBundle.getName() + ".getHashCode()=" + existingBundle.getHashcode());\r
+                    System.out.println("Ontology hashcodes do not match: platform bundle="\r
+                            + platformBundle.getVersionedId() + ", hash=" + platformBundle.getHashcode()\r
+                            + "; existing bundle=" + existingBundle.getVersionedId() + ", hash=" + existingBundle.getHashcode());\r
                     reinstallTGs.put(platformBundle, existingBundle);\r
                 }\r
             }\r

diff --git a/features/org.simantics.db.client.feature/feature.xml b/features/org.simantics.db.client.feature/feature.xml
index d6101139cacbbb1c5df0ad01a1c0990d71b4e387..14ecb0bf65a4112810ed8297ecb8f571d789dad5 100644 (file)
--- a/features/org.simantics.db.client.feature/feature.xml
+++ b/features/org.simantics.db.client.feature/feature.xml
@@ -73,6 +73,13 @@
          install-size="0"\r
          version="0.0.0"/>\r
 \r
+   <plugin\r
+         id="org.simantics.acorn"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
    <plugin\r
          id="org.simantics.databoard"\r
          download-size="0"\r
@@ -115,4 +122,11 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
+   <plugin\r
+         id="org.simantics.backup"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
 </feature>\r