Merge pull request #277 from mnamici/owlapi-rebuild

Update bundled OWLAPI to 4.5.29

eddy.spec

@@ -95,7 +95,7 @@ excludes = [
 
 datas = [
     (os.path.relpath(os.path.join(WORK_PATH, 'plugins')), 'plugins'),
-    ('eddy/core/jvm/lib/*.jar', 'resources/lib'),
+    ('eddy/core/jvm/*.jar', 'resources/lib'),
     ('eddy/ui/style/*.qss', 'resources/styles'),
     ('examples', 'examples'),
     ('LICENSE', '.'),

eddy/core/application.py

@@ -613,7 +613,7 @@ def checkboxStateChanged(state):
                     addJVMClasspath(path)
     else:
         from importlib.resources import files
-        for path in files(eddy.core.jvm.__name__).joinpath('lib').iterdir():
+        for path in files(eddy.core.jvm.__name__).iterdir():
             if File.forPath(path.as_posix()) is File.Jar:
                 addJVMClasspath(path.as_posix())
 

eddy/core/functions/path.py

@@ -47,7 +47,7 @@
 )
 
 if IS_FROZEN:
-    __MODULE_PATH = os.path.normpath(os.path.expanduser(os.path.dirname(sys.executable)))
+    __MODULE_PATH = os.path.normpath(os.path.expanduser(sys._MEIPASS))
     __ROOT_PATH = __MODULE_PATH
 else:
     __MODULE_PATH = os.path.normpath(os.path.expanduser(os.path.dirname(sys.modules['eddy'].__file__)))

support/java/eddy-runtime/.gitignore

@@ -0,0 +1,53 @@
+## Maven-generated resources
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+## Java-related output resources
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+## IDEA-related files
+
+# User-specific stuff
+.idea/
+
+# File-based project format
+*.iws
+
+# IntelliJ output dir
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+## Eclipse workspace and project files
+.metadata/
+.recommenders/
+.classpath
+.project
+
+# Google Application credentials
+/**/google-services.json
+
+# Logs directories
+**/logs/

support/java/eddy-runtime/pom.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.obdasystems</groupId>
+  <artifactId>eddy-runtime</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>eddy-runtime</name>
+  <description>Eddy's runtime classpath library.</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <owlapi.version>4.5.29</owlapi.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.sourceforge.owlapi</groupId>
+      <artifactId>owlapi-apibinding</artifactId>
+      <version>${owlapi.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-tools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-rio</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-oboformat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.owlapi</groupId>
+      <artifactId>org.semanticweb.hermit</artifactId>
+      <version>1.4.5.456</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-distribution</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.owlapi</groupId>
+      <artifactId>owlexplanation</artifactId>
+      <version>5.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-tools</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sourceforge.owlapi</groupId>
+          <artifactId>owlapi-parsers</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>2.0.12</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.10.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>3.0.0-M1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+            <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+            </descriptorRefs>
+            <finalName>${project.artifactId}</finalName>
+            <appendAssemblyId>false</appendAssemblyId>
+          </configuration>
+          <executions>
+            <execution>
+              <id>make-assembly</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
+
+<!-- vim: set ft=xml ts=2 sw=2: -->

support/java/eddy-runtime/src/main/java/com/obdasystems/eddy/ImportListener.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) OBDA Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.obdasystems.eddy;
+
+import org.semanticweb.owlapi.model.MissingImportEvent;
+import org.semanticweb.owlapi.model.MissingImportListener;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Implementation of {@code MissingImportListener} that records
+ * all {@code MissingImportEvent}s.
+ */
+public class ImportListener implements MissingImportListener {
+    private final List<MissingImportEvent> missing = new ArrayList<>();
+
+    @Override
+    public void importMissing(MissingImportEvent missingImportEvent) {
+        missing.add(missingImportEvent);
+    }
+
+    public List<MissingImportEvent> getMissingImportEvents() {
+        return Collections.unmodifiableList(missing);
+    }
+
+}

tests/conftest.py

@@ -102,7 +102,7 @@ def qapp(qapp_args, tmpdir_factory):
                 path.insert(0, os.path.join(bindir, 'server'))
             os.environ['PATH'] = os.pathsep.join(path)
 
-        for path in files(eddy.core.jvm.__name__).joinpath('lib').iterdir():
+        for path in files(eddy.core.jvm.__name__).iterdir():
             if File.forPath(path.as_posix()) is File.Jar:
                 addJVMClasspath(path.as_posix())
         # noinspection PyTypeChecker