Added missing Automatic-module-name headers and fixed split package

org.simantics.jdbc and org.simantics.jdbc.ontology had a split package
problem with package org.simantics.jdbc. JDBCResource was moved to
org.simantics.jdbc.ontology as it should have been.

gitlab #125
gitlab #165

Change-Id: I308d53c968ba0812f86554e38b8bbd0b487434b6

diff --git a/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF b/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF
index 566d3bad20318ff7d2a6b4e43a15e83584586d1a..66804effbace2b09065cce9743cdadae4f2b84b4 100644 (file)
--- a/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF
+++ b/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Export-Package: hdf.hdf5lib,
 Bundle-NativeCode: hdf5_java.dll; processor=x86_64; osname=win32,
  libhdf5.so.101; libhdf5_java.so; processor=x86_64; osname=linux
 Require-Bundle: org.slf4j.api;bundle-version="1.7.2"
+Automatic-Module-Name: hdf.hdf5lib

diff --git a/bundles/org.simantics.jdbc.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.jdbc.ontology/META-INF/MANIFEST.MF
index 69dae10ab491298c51de7c8596c71173ce7b7dae..200d69f6c37d2bdd8f78bfa8d09cfcbe74564b77 100644 (file)
--- a/bundles/org.simantics.jdbc.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.jdbc.ontology/META-INF/MANIFEST.MF
@@ -3,10 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: http://www.simantics.org/JDBC-1.0
 Bundle-SymbolicName: org.simantics.jdbc.ontology
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.simantics.jdbc.ontology.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.layer0,
  org.simantics.selectionview.ontology;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: org.simantics.jdbc
+Export-Package: org.simantics.jdbc.ontology
+Automatic-Module-Name: org.simantics.jdbc.ontology

diff --git a/bundles/org.simantics.jdbc.ontology/graph/JDBC.pgraph b/bundles/org.simantics.jdbc.ontology/graph/JDBC.pgraph
index 432e10c88de1fd9b1b82f8b59f3285827dc57656..d092795d93aeb919ea25d2f42ceeb0b766192d99 100644 (file)
--- a/bundles/org.simantics.jdbc.ontology/graph/JDBC.pgraph
+++ b/bundles/org.simantics.jdbc.ontology/graph/JDBC.pgraph
@@ -3,7 +3,7 @@ SEL = <http://www.simantics.org/SelectionView-1.2>
 
 JDBC = <http://www.simantics.org/JDBC-1.0> : L0.Ontology
     @L0.new
-    L0.HasResourceClass "org.simantics.jdbc.JDBCResource"
+    L0.HasResourceClass "org.simantics.jdbc.ontology.JDBCResource"
     
 JDBC.Session <T L0.Entity
     >-- JDBC.Session.hasValue --> L0.Value <R L0.HasProperty : SEL.GenericParameterType

diff --git a/bundles/org.simantics.jdbc.ontology/src/org/simantics/jdbc/ontology/Activator.java b/bundles/org.simantics.jdbc.ontology/src/org/simantics/jdbc/ontology/Activator.java
deleted file mode 100644 (file)
index 596e25d..0000000
--- a/bundles/org.simantics.jdbc.ontology/src/org/simantics/jdbc/ontology/Activator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.simantics.jdbc.ontology;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-       private static BundleContext context;
-
-       static BundleContext getContext() {
-               return context;
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-        */
-       public void start(BundleContext bundleContext) throws Exception {
-               Activator.context = bundleContext;
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-        */
-       public void stop(BundleContext bundleContext) throws Exception {
-               Activator.context = null;
-       }
-
-}

diff --git a/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF b/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF
index 9aff2f49081b55e60654237ce88bc1b4ef34b232..8199e8979efb74286f134edbfa55cc81a13ebd6a 100644 (file)
--- a/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.osgi,
  pgjdbc-ng;bundle-version="0.7.1"
 Export-Package: org.simantics.jdbc,
  org.simantics.jdbc.variable
+Automatic-Module-Name: org.simantics.jdbc

diff --git a/bundles/org.simantics.jdbc/src/org/simantics/jdbc/SimanticsJDBC.java b/bundles/org.simantics.jdbc/src/org/simantics/jdbc/SimanticsJDBC.java
index ac287e6e42418a19da445ea500a9f3834f0cb133..a402f5962cd1fa895de07c41ce4e91ec02b51da2 100644 (file)
--- a/bundles/org.simantics.jdbc/src/org/simantics/jdbc/SimanticsJDBC.java
+++ b/bundles/org.simantics.jdbc/src/org/simantics/jdbc/SimanticsJDBC.java
@@ -7,6 +7,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables;
+import org.simantics.jdbc.ontology.JDBCResource;
 import org.simantics.layer0.Layer0;
 
 /**