diff --git a/build.xml b/build.xml
index 5ce80c604fc57ebc5db794b1a1c1e5d4b6d87d45..461def8b4f0f1ef5e2623a18071e60cf6996c8d2 100644
--- a/build.xml
+++ b/build.xml
@@ -113,7 +113,7 @@
<target name="lint" depends="bind" description="Check sources for warnings">
<echo message="Setting property..."/>
<!-- values: all,cast,classfile,deprecation,dep-ann,divzero,empty,fallthrough,finally,options,overrides,path,processing,rawtypes,serial,static,try,unchecked,varargs,-cast,-classfile,-deprecation,-dep-ann,-divzero,-empty,-fallthrough,-finally,-options,-overrides,-path,-processing,-rawtypes,-serial,-static,-try,-unchecked,-varargs,none -->
- <!--property name="javacargs" value="-Xlint:" /-->
+ <!--property name="javacargs" value="-Xlint:" or "-Xdiags:verbose" but not both /-->
<property name="javacargs" value="-Xlint:all" />
<antcall target="compileall"/>
</target>
@@ -216,7 +216,7 @@
<onejar file="ontowrap"
group="fr.inrialpes.exmo"
desc="Ontology wrapper"
- path="jena/arq.jar jena/iri.jar jena/jena.jar skosapi/skosapi.jar owlapi10/api.jar owlapi10/impl.jar owlapi10/io.jar owlapi10/rdfapi.jar owlapi10/rdfparser.jar owlapi3/owlapi-bin.jar">
+ path="jena/jena-arq.jar jena/jena-iri.jar jena/jena-core.jar jena/jena-base.jar jena/jena-shaded-guava.jar skosapi/skosapi.jar owlapi10/api.jar owlapi10/impl.jar owlapi10/io.jar owlapi10/rdfapi.jar owlapi10/rdfparser.jar owlapi3/owlapi-bin.jar">
<files>
<fileset dir="classes">
<include name="fr/inrialpes/exmo/ontowrap/**/*.class" />
@@ -230,7 +230,7 @@
group="fr.inrialpes.exmo.align"
desc="Alignment API implementation"
main="fr.inrialpes.exmo.align.cli.Procalign"
- path="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar cli/commons-cli.jar slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jwnl/jwnl.jar lucene/lucene-core.jar lucene/lucene-analyzers-common.jar jena/jena.jar jena/iri.jar jena/httpcore.jar jena/httpclient.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/hermit.jar align.jar ontowrap.jar procalign.jar">
+ path="skosapi/skosapi.jar owlapi30/owlapi-bin.jar ontosim/ontosim.jar cli/commons-cli.jar slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jwnl/jwnl.jar lucene/lucene-core.jar lucene/lucene-analyzers-common.jar jena/jena-base.jar jena/jena-core.jar jena/jena-iri.jar jena/httpcore.jar jena/httpclient.jar jena/jena-shaded-guava.jar iddl/iddl.jar xerces/xercesImpl.jar xerces/resolver.jar xerces/xml-apis.jar hermit/hermit.jar align.jar ontowrap.jar procalign.jar">
<files>
<fileset dir="classes">
<include name="fr/inrialpes/exmo/align/impl/**/*.class"/>
@@ -249,7 +249,7 @@
group="fr.inrialpes.exmo.align"
desc="Alignment server"
main="fr.inrialpes.exmo.align.service.AlignmentService"
- path="procalign.jar osgi/osgi-core.jar jade/jade.jar jade/iiop.jar jade/http.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar fileupload/commons-fileupload.jar fileupload/commons-io.jar jetty/jetty-util.jar jetty/jetty-server.jar jetty/jetty-http.jar jetty/jetty-io.jar gson/gson.jar xerces/xercesImpl.jar lang/commons-lang3.jar">
+ path="procalign.jar osgi/osgi-core.jar jade/jade.jar jdbc/mysql-connector-java.jar jdbc/postgresql-jdbc4.jar servlet/servlet-api.jar fileupload/commons-fileupload.jar fileupload/commons-io.jar jetty/jetty-util.jar jetty/jetty-server.jar jetty/jetty-http.jar jetty/jetty-io.jar gson/gson.jar xerces/xercesImpl.jar lang/commons-lang3.jar">
<files>
<fileset dir="classes">
<include name="fr/inrialpes/exmo/align/service/**/*.class"/>
@@ -384,7 +384,7 @@
<!--packageset dir="plugins/neon/src" defaultexcludes="yes">
<include name="fr/inrialpes/**"/>
</packageset-->
- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+ <!--link href="http://java.sun.com/j2se/1.5.0/docs/api"/-->
</javadoc>
</target>
@@ -529,14 +529,12 @@
<onepom file="cli/commons-cli" />
<onepom file="hermit/hermit" />
<onepom file="iddl/iddl" />
- <onepom file="jade/jade-http" />
- <onepom file="jade/iiop" />
<onepom file="jade/jade" />
<onepom file="jdbc/mysql-connector-java" />
<onepom file="jdbc/postgresql-jdbc4" />
- <onepom file="jena/arq" />
- <onepom file="jena/iri" />
- <onepom file="jena/jena" />
+ <onepom file="jena/jena-arq" />
+ <onepom file="jena/jena-iri" />
+ <onepom file="jena/jena-core" />
<onepom file="jetty/jetty-util" />
<onepom file="jetty/jetty" />
<onepom file="jwnl/jwnl" />
@@ -576,6 +574,7 @@
<ant dir="plugins/android" target="clean" />
<delete dir="examples/aligns"/>
<delete dir="mvn-repo"/>
+ <delete dir="WAR" />
<delete>
<fileset dir="classes" includes="**/*.class"/>
<fileset dir="examples" includes="**/*.class"/>
diff --git a/html/lib.html b/html/lib.html
index 0b5ce9cc62c34e453a093a2cf787ac991d6083af..182f5854461966e8aaecb532adac0fe905331568 100644
--- a/html/lib.html
+++ b/html/lib.html
@@ -52,8 +52,8 @@ This is a simplified view: <a href="img/dependencies.png">click here
<h3>Required for using EDOAL</h3>
<dl>
-<dt><a href="http://jena.sourceforge.net/">Jena</a> 2.9.0:
- jena.jar iri.jar arq.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a>]</dt>
+<dt><a href="http://jena.sourceforge.net/">Jena</a> 3.0.0:
+ jena-base.jar jena-core.jar jena-iri.jar jena-arq.jar jena-shaded-guava.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache</a>]</dt>
<dd>Provides the RDF parser.</dd>
<dt><a href="http://xerces.apache.org">Xerces</a> 2.11.0: xercesImpl.jar resolver.jar xml-apis.jar [<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache</a>]</dt>
<dd>Required by Jena for parsing international characters.</dd-->
diff --git a/html/relnotes.html b/html/relnotes.html
index 31645479d3d4ab00430fb1e610d13d82c725d98a..d66be9eab5e90117c5f876babd9d5fd0849e4ed0 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -86,6 +86,7 @@ with a warning:
<li>Upgraded to <span style="color: green">lang3 3.4</span> (lib)</li>
<li>Upgraded to <span style="color: green">lucene 5.3.1</span> (lib)</li>
<li>Upgraded to <span style="color: green">commons cli 1.3.1</span> (lib)</li>
+<li>Upgraded to <span style="color: green">Jena 3.0.0</span> (lib)</li>
</ul></p>
<h2>Version 4.7 (2014): 06/12/2014 - Al pesto</h2>
diff --git a/lib/jena/arq.jar b/lib/jena/arq.jar
deleted file mode 100644
index 0d3c9a7763f1bbc591ddf9e3892e400838963424..0000000000000000000000000000000000000000
Binary files a/lib/jena/arq.jar and /dev/null differ
diff --git a/lib/jena/httpclient.jar b/lib/jena/httpclient.jar
index 53c1c262b37b43f929ad012affa269f835e60d1d..11331df8722ff3f52cbe1bdf40a57cdd54f6390a 100644
Binary files a/lib/jena/httpclient.jar and b/lib/jena/httpclient.jar differ
diff --git a/lib/jena/httpclient.pom b/lib/jena/httpclient.pom
index 65150b23dc99aacbb44b4b6666b3c485deb7b59e..aa80aa831266008331fb186113d07b9e65dae545 100644
--- a/lib/jena/httpclient.pom
+++ b/lib/jena/httpclient.pom
@@ -30,21 +30,15 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.2.3</version>
+ <version>4.2.6</version>
</parent>
<artifactId>httpclient</artifactId>
- <name>HttpClient</name>
+ <name>Apache HttpClient</name>
<description>
- HttpComponents Client (base module)
+ HttpComponents Client
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
<dependencies>
<dependency>
@@ -117,24 +111,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -163,22 +139,28 @@
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${hc.project-info.version}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-info</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>${hc.jxr.version}</version>
+ <version>${hc.jxr.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${hc.surefire-report.version}</version>
+ <version>${hc.surefire-report.version}</version>
</plugin>
</plugins>
diff --git a/lib/jena/httpcore.jar b/lib/jena/httpcore.jar
index a64cd2f5e3eff5ea0ff91a545ba2da4dc3fd612b..498144c447457c0d338c4f12c9f049e2ff983944 100644
Binary files a/lib/jena/httpcore.jar and b/lib/jena/httpcore.jar differ
diff --git a/lib/jena/httpcore.pom b/lib/jena/httpcore.pom
index cbb5239215d07c3a5f574db7a449b3684bb2a34d..b4a60aae13aaa5dcb863a63dc577594fb09c72c6 100644
--- a/lib/jena/httpcore.pom
+++ b/lib/jena/httpcore.pom
@@ -1,22 +1,45 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Software Foundation. For more
+ information on the Apache Software Foundation, please see
+ <http://www.apache.org />.
+ -->
- <groupId>org.apache.httpcomponents</groupId>
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcomponents-core</artifactId>
+ <version>4.2.5</version>
+ </parent>
<artifactId>httpcore</artifactId>
- <version>4.2.2</version>
- <name>HttpCore</name>
+ <name>Apache HttpCore</name>
<inceptionYear>2005</inceptionYear>
<description>
HttpComponents Core (blocking I/O)
</description>
<url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License Version 2.0, January 2004</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -75,24 +98,6 @@
<jvm>${httpcore.surefire.java}</jvm>
</configuration>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -119,15 +124,6 @@
</reportSets>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
-
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version>
diff --git a/lib/jena/iri.jar b/lib/jena/iri.jar
deleted file mode 100644
index ef0ff7edb4132510f0afbec659f2b7792680a826..0000000000000000000000000000000000000000
Binary files a/lib/jena/iri.jar and /dev/null differ
diff --git a/lib/jena/jena-arq.jar b/lib/jena/jena-arq.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4a4f327934c038386d8ae1e7d7fc18c02091e02f
Binary files /dev/null and b/lib/jena/jena-arq.jar differ
diff --git a/lib/jena/arq.pom b/lib/jena/jena-arq.pom
similarity index 97%
rename from lib/jena/arq.pom
rename to lib/jena/jena-arq.pom
index 702ea8f24a0e433d3bac13b3298f212178beff0d..fd516aeee2746c236406ad6d9b9043be232794db 100644
--- a/lib/jena/arq.pom
+++ b/lib/jena/jena-arq.pom
@@ -3,7 +3,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
- <version>2.11.0</version>
+ <version>3.0.0</version>
<name>ARQ</name>
<description>ARQ is a SPARQL 1.1 query engine for Jena</description>
<packaging>jar</packaging>
diff --git a/lib/jena/jena-base.jar b/lib/jena/jena-base.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4dde7964a443e3a5a23dd305b9f6e1aa7965672d
Binary files /dev/null and b/lib/jena/jena-base.jar differ
diff --git a/lib/jena/jena-base.pom b/lib/jena/jena-base.pom
new file mode 100644
index 0000000000000000000000000000000000000000..f023fcaa623fb8ed8649e427a0bd3d1c9db2eee9
--- /dev/null
+++ b/lib/jena/jena-base.pom
@@ -0,0 +1,38 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-base</artifactId>
+ <version>3.0.0</version>
+ <name>Jena core</name>
+ <description>Jena is a Java framework for building Semantic Web applications. It provides a programmatic environment for RDF, RDFS and OWL, SPARQL and includes a rule-based inference engine.</description>
+ <packaging>jar</packaging>
+ <licenses>
+ <license>
+ <name>Apache License Version 2.0, January 2004</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <url></url>
+ <!--distributionManagement>
+ <downloadUrl></downloadUrl>
+ </distributionManagement-->
+
+ <!-- There is a decent pom in the Jar-file -->
+ <!--dependencies>
+ <dependency>
+ <groupId>org.apache.xml</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>xerces</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-iri</artifactId>
+ </dependency>
+ </dependencies-->
+
+</project>
diff --git a/lib/jena/jena-core.jar b/lib/jena/jena-core.jar
new file mode 100644
index 0000000000000000000000000000000000000000..25a24a3dc7b6169c96a0b2d1c79fbb0cc7ce2b61
Binary files /dev/null and b/lib/jena/jena-core.jar differ
diff --git a/lib/jena/jena.pom b/lib/jena/jena-core.pom
similarity index 97%
rename from lib/jena/jena.pom
rename to lib/jena/jena-core.pom
index 3ac98467764673ec6f3084916239c00b039fdc50..680795acf19c9c0a361852361143feb7daa59f2b 100644
--- a/lib/jena/jena.pom
+++ b/lib/jena/jena-core.pom
@@ -3,7 +3,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>2.11.0</version>
+ <version>3.0.0</version>
<name>Jena core</name>
<description>Jena is a Java framework for building Semantic Web applications. It provides a programmatic environment for RDF, RDFS and OWL, SPARQL and includes a rule-based inference engine.</description>
<packaging>jar</packaging>
diff --git a/lib/jena/jena-iri.jar b/lib/jena/jena-iri.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6f24a77b010bbda2f1ebf1ac838b1650c6076786
Binary files /dev/null and b/lib/jena/jena-iri.jar differ
diff --git a/lib/jena/iri.pom b/lib/jena/jena-iri.pom
similarity index 96%
rename from lib/jena/iri.pom
rename to lib/jena/jena-iri.pom
index 0af55190b4a461f942d5faa5b4089b3ca323f453..206fc21213ad759e509825e233a9d8559371da0f 100644
--- a/lib/jena/iri.pom
+++ b/lib/jena/jena-iri.pom
@@ -3,7 +3,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-iri</artifactId>
- <version>1.0.0</version>
+ <version>3.0.0</version>
<name>IRI</name>
<packaging>jar</packaging>
<licenses>
diff --git a/lib/jena/jena-shaded-guava.jar b/lib/jena/jena-shaded-guava.jar
new file mode 100644
index 0000000000000000000000000000000000000000..167e4ada15754577c8087807de96bc1cf3361cf3
Binary files /dev/null and b/lib/jena/jena-shaded-guava.jar differ
diff --git a/lib/jena/jena-shaded-guava.pom b/lib/jena/jena-shaded-guava.pom
new file mode 100644
index 0000000000000000000000000000000000000000..b3768b1f9123f8da85add98b3e36c479d6a1b599
--- /dev/null
+++ b/lib/jena/jena-shaded-guava.pom
@@ -0,0 +1,33 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-shaded-guava</artifactId>
+ <version>3.0.0</version>
+ <name>shaded guava</name>
+ <packaging>jar</packaging>
+ <licenses>
+ <license>
+ <name>Apache License Version 2.0, January 2004</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <url></url>
+ <distributionManagement>
+ <downloadUrl></downloadUrl>
+ </distributionManagement>
+
+ <!-- There is a decent pom in the Jar-file -->
+ <!--dependencies>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xml</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ </dependencies-->
+
+</project>
diff --git a/lib/jena/jena.jar b/lib/jena/jena.jar
deleted file mode 100644
index c646971ecea3b2904376796706d485d4ea3d8141..0000000000000000000000000000000000000000
Binary files a/lib/jena/jena.jar and /dev/null differ
diff --git a/lib/owlapi30/owlapi-bin.pom b/lib/owlapi30/owlapi-bin.pom
index fc17f015e39295b02dd13f39fccef119de86ed24..c06710034b8abf4c752361326d9a969b85593a0e 100644
--- a/lib/owlapi30/owlapi-bin.pom
+++ b/lib/owlapi30/owlapi-bin.pom
@@ -4,7 +4,16 @@
<groupId>org.semanticweb</groupId>
<artifactId>owlapi</artifactId>
<version>3.5.0</version>
- <!-- version 3.5.1 does not work strangely -->
+ <!-- version 3.5.1 does not work, strangely -->
+ <!-- versions 3.5.3 has the issue:
+ ClassNotFoundException: com.google.common.cache.CacheLoader
+ when running: OWLManager.createOWLOntologyManager()
+ [that's relying on guava without providing it]
+ or Could not initialize class uk.ac.manchester.cs.owl.owlapi.OWLDataFactoryImpl
+ -->
+ <!-- version 4.0.2 has a drastically modified API
+ and the path to this API is poorly documented
+ (it has to be done...) -->
<name>OWL API</name>
<description>API and implementation for OWL</description>
<licenses>
@@ -15,11 +24,5 @@
</licenses>
<url>http://owlapi.sourceforge.org/</url>
- <!--dependencies>
- <dependency>
- <groupId>org.apache.xml</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies-->
+ <url>https://github.com/owlcs/owlapi</url>
</project>
diff --git a/lib/xerces/resolver.pom b/lib/xerces/resolver.pom
index 25afae8ce20a7652d21d59425fcbc3a398998336..bb56f5328ca0ed2453516825c74c36f6ab4e7003 100644
--- a/lib/xerces/resolver.pom
+++ b/lib/xerces/resolver.pom
@@ -3,7 +3,7 @@
<groupId>org.apache.xml</groupId>
<artifactId>resolver</artifactId>
- <version>1.2</version>
+ <version>2.11.0</version>
<name>xml-commons Resolver code</name>
<description></description>
<licenses>
diff --git a/lib/xerces/xml-apis.pom b/lib/xerces/xml-apis.pom
index 428cdb40d5d0848187f65f4928ddad198c675f45..988054e16d45e47eff4bcec59a8ef530893be81c 100644
--- a/lib/xerces/xml-apis.pom
+++ b/lib/xerces/xml-apis.pom
@@ -3,7 +3,7 @@
<groupId>org.apache.xml</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
+ <version>2.11.0</version>
<name>Java XML APIs</name>
<description>Standard XML APIs (SAX 2.0.2, DOM 1.0, StAX 1.0, datatype, namespace, JAXP 1.4)</description>
<licenses>
diff --git a/plugins/android/build.xml b/plugins/android/build.xml
index 18d38987f094a1a0a66c0dc2594d433ad6b92f56..bccaff1d64bc90b2e069820dedb9e33d92dc1d5d 100644
--- a/plugins/android/build.xml
+++ b/plugins/android/build.xml
@@ -7,14 +7,13 @@
<filelist id="mujar" dir="../../lib">
<!-- JEoid: maybe check better those which are necessary -->
<file name="align.jar"/>
- <file name="jena/icu4j.jar"/>
- <file name="jena/iri.jar"/>
- <file name="jena/jena.jar"/>
+ <file name="jena/jena-iri.jar"/>
+ <file name="jena/jena-core.jar"/>
+ <file name="jena/jena-base.jar"/> <!-- not sure it is necessary -->
<file name="slf4j/slf4j-api.jar"/>
<file name="xerces/resolver.jar"/>
- <file name="xerces/xercesImpl.jar"/> <!-- redundancy in the two following -->
+ <file name="xerces/xercesImpl.jar"/>
<file name="xsdlib/xsdlib.jar"/>
- <!--file name="xsdlib/relaxngDatatype.jar"/--> <!-- is this one in the JDK? -->
</filelist>
<fileset id="musrc" dir="../../src">
@@ -71,7 +70,7 @@
<isset property="tempdit"/>
</condition>
<!-- two first jars seem useless -->
- <property name="jarclasspath" value="slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jena/jena.jar jena/iri.jar jena/icu4j.jar xerces/xercesImpl.jar xerces/resolver.jar align.jar microalign.jar"/>
+ <property name="jarclasspath" value="slf4j/jcl-over-slf4j.jar slf4j/log4j-over-slf4j.jar slf4j/slf4j-api.jar jena/jena-core.jar jena/jena-base.jar jena/jena-iri.jar xerces/xercesImpl.jar xerces/resolver.jar align.jar microalign.jar"/>
<tstamp><format locale="fr,fr" pattern="dd/MM/yyyy" property="date"/></tstamp>
<exec executable="svnversion" outputproperty="svn.rev" failifexecutionfails="false"/>
<condition property="svn.revision" value="${svn.rev}" else="nosvn">
diff --git a/src/fr/inrialpes/exmo/align/gen/Alterator.java b/src/fr/inrialpes/exmo/align/gen/Alterator.java
index b9b3d9762ddf04ec0fbbcf720041e693a48efccd..3f3d6f4f1effda06f13e50a694b46485b0a79471 100644
--- a/src/fr/inrialpes/exmo/align/gen/Alterator.java
+++ b/src/fr/inrialpes/exmo/align/gen/Alterator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, INRIA
+ * Copyright (C) 2011, 2015 INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.semanticweb.owl.align.Alignment;
-import com.hp.hpl.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModel;
/**
* An abstract test generator which takes as input an ontology and an
diff --git a/src/fr/inrialpes/exmo/align/gen/ClassHierarchy.java b/src/fr/inrialpes/exmo/align/gen/ClassHierarchy.java
index 63a1f3db917b1d13d56f01b31293c1558db868f7..79cacbfd739fdda3174c01c475985139e8a11086 100644
--- a/src/fr/inrialpes/exmo/align/gen/ClassHierarchy.java
+++ b/src/fr/inrialpes/exmo/align/gen/ClassHierarchy.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2014, INRIA
+ * Copyright (C) 2011-2015, INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -26,13 +26,13 @@
package fr.inrialpes.exmo.align.gen;
//Jena
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.Restriction;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.rdf.model.AnonId;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.Restriction;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.vocabulary.OWL;
+import org.apache.jena.rdf.model.AnonId;
//Java
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/TestGenerator.java b/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
index 37242c799c726c7bd684cbf083ff52bdd00dd8a5..ff47e1caa59a87747cd8f8badd6de1fe20f2ee49 100644
--- a/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
+++ b/src/fr/inrialpes/exmo/align/gen/TestGenerator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) 2011-2013, 2015 INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -53,11 +53,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
//Jena API classes
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.util.FileManager;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.RDFWriter;
+import org.apache.jena.util.FileManager;
import fr.inrialpes.exmo.align.gen.alt.EmptyModification;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
index 50e754f1f6dd703c4112d6b139dc8eae595a0d6e..42507e0ffc248ac3bf7a5ef3c2f5ec296dc6e591 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddClassLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) 2011-2013, 2015 INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntClass;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
index e1252025cc0d3ca0ff0a30142316770f54e6d48d..50d082ff8f7ae758e5b00cd099df54e17436eb5f 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, INRIA
+ * Copyright (C) INRIA, 2011, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntClass;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java b/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
index 33731affb95eb058ef69c586a8f69f24b7dbeaa9..437c6bef066c384bbcee758236a7fa4f81708c10 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/AddProperties.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, INRIA
+ * Copyright (C) INRIA, 2011, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,11 +21,11 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.DatatypeProperty;
-import com.hp.hpl.jena.vocabulary.XSD;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.vocabulary.XSD;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
index 6173f451b843268fe6013681fc8d2de6aa82687d..53357f3dbfefff7f58a3805235fec7fd7569ff44 100644
--- a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
@@ -1,7 +1,7 @@
/**
* $Id$
*
- * Copyright (C) 2011-2014, INRIA
+ * Copyright (C) INRIA, 2011-2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -58,24 +58,24 @@ import org.semanticweb.owl.align.AlignmentException;
import fr.inrialpes.exmo.align.impl.URIAlignment;
//JENA classes
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.util.ResourceUtils;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.Ontology;
-import com.hp.hpl.jena.ontology.Restriction;
-import com.hp.hpl.jena.ontology.AllValuesFromRestriction;
-import com.hp.hpl.jena.ontology.SomeValuesFromRestriction;
+import org.apache.jena.rdf.model.RDFWriter;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.vocabulary.OWL;
+import org.apache.jena.vocabulary.RDFS;
+import org.apache.jena.util.ResourceUtils;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.Ontology;
+import org.apache.jena.ontology.Restriction;
+import org.apache.jena.ontology.AllValuesFromRestriction;
+import org.apache.jena.ontology.SomeValuesFromRestriction;
//gen
import fr.inrialpes.exmo.align.gen.Alterator;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
index 6027603e82d6c9b7a65ce22b3aedc5343445b0f8..7cb7835be5357ab15c17f2fc0f6cab0d18771e40 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) INRIA, 2011-2013, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,11 +21,11 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.Ontology;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.Ontology;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
index 8b221041863d401e7033f99a9c99e82a06187504..d0dba44d57966bd513dedacb7a9483158930e3e2 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/FlattenLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) INRIA, 2011-2013, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,9 +21,9 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.Restriction;
-import com.hp.hpl.jena.vocabulary.OWL;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.Restriction;
+import org.apache.jena.vocabulary.OWL;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
index 84dc6e7d5f08815611af375db6601ed6d380d78c..848383286ed72abe3d6aee6125fd7fa421d32e60 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClassLevel.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) INRIA, 2011-2013, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntClass;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
index beced885dc8ae8e095e446437cd4832e917f5778..fd398cd18eee48ae8edcc32629b808724d1a70d6 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2012, INRIA
+ * Copyright (C) INRIA, 2011-2012, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntClass;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
index a3b41a1201a9e5b3790ea6a176b17c3775290844..a79ba784c70920e9ed64f8a44926a1082672cdee 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveComments.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, 2014, INRIA
+ * Copyright (C) INRIA, 2011, 2014-2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,15 +21,15 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.ontology.Ontology;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.Individual;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.ontology.Ontology;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.Individual;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
index 0feec64e7039e4d645f5dd21b28a6bc714aafbdd..26aedbb8179f00ed01c82cae2b176b5899f8a96d 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveIndividuals.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2012, INRIA
+ * Copyright (C) INRIA, 2011-2012, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,10 +21,10 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.ontology.Individual;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.ontology.Individual;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
index dc49ea752f4421055e446d583bc7f734945bac3c..d9eeda13e325102c6d48e8b0f9a5a9de5fdfc8f1 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveProperties.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2014, INRIA
+ * Copyright (C) INRIA, 2011-2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,16 +21,16 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.ontology.OntResource;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.UnionClass;
-import com.hp.hpl.jena.ontology.Restriction;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.ontology.OntResource;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.UnionClass;
+import org.apache.jena.ontology.Restriction;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java b/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
index 6e15105ec5580a5b1549e0ebdf3159da86473b42..47b66a9e421c6decbc3448aa6b786068d9d5e27b 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RemoveRestrictions.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011, INRIA
+ * Copyright (C) INRIA, 2011, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,8 +21,8 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.Restriction;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.Restriction;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java b/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
index e864da9968dbd222f5affa7ab4c036854ecab556..73f8cc54c3a228a58154d3f5f2d2736044ec7427 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RenameClasses.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2012, INRIA
+ * Copyright (C) INRIA, 2011-2012, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,9 +21,9 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.Restriction;
-import com.hp.hpl.jena.vocabulary.OWL;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.Restriction;
+import org.apache.jena.vocabulary.OWL;
import java.util.Properties;
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java b/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
index bba01d02e0ca24b8388ec7a057a4ed73483e77f6..ad53276d8135e59ddb10e73b2c0c60d30b0e6422 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/RenameThings.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) INRIA, 2011-2013, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,15 +21,15 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.ontology.OntClass;
//activeRandomString is true -> we replace the label with a random string
//activeTranslateString is true -> we translate the label
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java b/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
index e3ae8ea99de8e4db72563cd2e6efb25811562eed..d8e230643d6b72dbef9f81db5cbbbf6a89e1cdd8 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/SuppressHierarchy.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2012, INRIA
+ * Copyright (C) INRIA, 2011-2012, 2015
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.gen.alt;
-import com.hp.hpl.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntClass;
import java.util.Properties;
import java.util.List;
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
index a37d621c19136ccfd2dd98dd03775cf0c4df675c..3634413e6593b3afc48d710a3dfa4d96a13cdb2a 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
@@ -39,14 +39,14 @@ import java.io.InputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.vocabulary.RDF;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.vocabulary.RDF;
import fr.inrialpes.exmo.align.parser.SyntaxElement;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
diff --git a/src/fr/inrialpes/exmo/align/parser/RDFParser.java b/src/fr/inrialpes/exmo/align/parser/RDFParser.java
index 7d56f93b77e0e9aec618eff65537a4776a41da9f..8e9faaab118f8e868a6d037411fceb59ea73534b 100644
--- a/src/fr/inrialpes/exmo/align/parser/RDFParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/RDFParser.java
@@ -89,16 +89,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// Yes we are relying on Jena for parsing RDF
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.LiteralRequiredException;
-import com.hp.hpl.jena.vocabulary.RDF;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.LiteralRequiredException;
+import org.apache.jena.vocabulary.RDF;
/**
* <p>
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index df1eba829207485948da89680cb4443df714c7d0..8f35625df3454841dc7c1bab13d6e427aed96e15 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -71,8 +71,8 @@ import org.semanticweb.owl.align.OntologyNetwork;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
import java.lang.ClassNotFoundException;
import java.lang.NoClassDefFoundError;
diff --git a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java
index 7595929cabedaaf7da3bc0b0f38f9acdf8f6d18c..bc1b9b9bacc29e2c9edb44c98914b205a1cb8ff9 100644
--- a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2008, 2010, 2012
+ * Copyright (C) INRIA, 2003-2008, 2010, 2012, 2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -26,25 +26,23 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-
-
-import com.hp.hpl.jena.ontology.DatatypeProperty;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.AnnotationProperty;
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntProperty;
-import com.hp.hpl.jena.ontology.OntResource;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-
-import com.hp.hpl.jena.util.iterator.Map1;
-
-import com.hp.hpl.jena.rdf.model.impl.LiteralImpl;
+import java.util.function.Function;
+
+import org.apache.jena.ontology.DatatypeProperty;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.AnnotationProperty;
+import org.apache.jena.ontology.OntClass;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntProperty;
+import org.apache.jena.ontology.OntResource;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+
+import org.apache.jena.rdf.model.impl.LiteralImpl;
import fr.inrialpes.exmo.ontowrap.Annotation;
import fr.inrialpes.exmo.ontowrap.BasicOntology;
@@ -231,11 +229,10 @@ public class JENAOntology extends BasicOntology<OntModel> implements HeavyLoaded
//return getEntitySet(onto.listDatatypeProperties());
}
- protected final static Map1<OntProperty,OntResource> mapProperty = new Map1<OntProperty,OntResource> () { public OntResource map1 ( OntProperty o ) { return o; } };
- protected final static Map1<OntClass,OntResource> mapClass = new Map1<OntClass,OntResource> () { public OntResource map1 ( OntClass o ) { return o; } };
- protected final static Map1<Individual,OntResource> mapInd = new Map1<Individual,OntResource> () { public OntResource map1 ( Individual o ) { return o; } };
- protected final static Map1<OntClass,Object> mapClassToObj = new Map1<OntClass,Object> () { public Object map1 ( OntClass o ) { return o; } };
-
+ protected final static Function<OntProperty,OntResource> mapProperty = new Function<OntProperty,OntResource>() { public OntResource apply( OntProperty o ) { return o; } };
+ protected final static Function<OntClass,OntResource> mapClass = new Function<OntClass,OntResource>() { public OntResource apply( OntClass o ) { return o; } };
+ protected final static Function<Individual,OntResource> mapInd = new Function<Individual,OntResource>() { public OntResource apply( Individual o ) { return o; } };
+ protected final static Function<OntClass,Object> mapClassToObj = new Function<OntClass,Object>() { public Object apply( OntClass o ) { return o; } };
public Set<OntResource> getEntities() {
return getFilteredOrNot((onto.listAllOntProperties().mapWith( mapProperty )
diff --git a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java
index 65e8320bb3d9235968f92a1579836f80631cd35d..d120686ab2c145b243f337547f7073bb17409b37 100644
--- a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java
+++ b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2008, 2010, 2013
+ * Copyright (C) INRIA, 2003-2008, 2010, 2013, 2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -27,10 +27,10 @@ import java.util.NoSuchElementException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.ontology.Ontology;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.ontology.Ontology;
+import org.apache.jena.rdf.model.ModelFactory;
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
diff --git a/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteOntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteOntologyFactory.java
index 8c412061821ce067daddfe72b4025548ec378b0d..d6421a6cdc9a72df1aeb5f24a16062e8fb2033b9 100644
--- a/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteOntologyFactory.java
+++ b/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteOntologyFactory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2010, 2013
+ * Copyright (C) INRIA, 2008-2010, 2013, 2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -26,7 +26,7 @@ import java.net.URISyntaxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
import fr.inrialpes.exmo.ontowrap.OntologyCache;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
diff --git a/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteThesaurus.java b/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteThesaurus.java
index 497726ac442aa332614e5f3f00f1c6d869050d95..71a8fb0ffef186cee3b6a70b1abd131b3720c9f1 100644
--- a/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteThesaurus.java
+++ b/src/fr/inrialpes/exmo/ontowrap/skoslite/SKOSLiteThesaurus.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2010, 2012-2013
+ * Copyright (C) INRIA, 2008-2010, 2012-2013, 2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -30,18 +30,18 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.rdf.model.InfModel;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.ResIterator;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
+import org.apache.jena.graph.Node;
+import org.apache.jena.rdf.model.InfModel;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.ResIterator;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
import fr.inrialpes.exmo.ontowrap.Annotation;
import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
diff --git a/test/src/IOTest.java b/test/src/IOTest.java
index e5dc7a85b0715606ee27b32cc695ed4931397ed4..f76d3aeba5f02b118d8ac48f3db237f296e93235 100644
--- a/test/src/IOTest.java
+++ b/test/src/IOTest.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2011, 2014
+ * Copyright (C) INRIA, 2008-2011, 2014-2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -47,11 +47,11 @@ public class IOTest {
aparser = new AlignmentParser( 0 );
assertNotNull( aparser );
try { // shut-up log4j
- com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = true;
+ org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = true;
alignment = aparser.parse( "test/input/soap.xml" );
// error (we forgot to tell the parser that the alignment is embedded)
} catch (Exception ex) {
- com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = false;
+ org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = false;
throw ex;
}
}
@@ -82,11 +82,11 @@ public class IOTest {
aparser = new AlignmentParser( 0 );
assertNotNull( aparser );
try { // shut-up log4j
- com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = true;
+ org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = true;
alignment = aparser.parseString( readFileAsString( "test/input/soap.xml" ) );
// error (we forgot to tell the parser that the alignment is embedded)
} catch (Exception ex) {
- com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = false;
+ org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler.silent = false;
throw ex;
}
}
diff --git a/test/src/SPARQLLinkkerRendererVisitorTest.java b/test/src/SPARQLLinkkerRendererVisitorTest.java
index b9574d7de5ab89e5e49f18d4dee178a561641afd..9c9e732351ea466efd0982b8cb6d2cec41836465 100644
--- a/test/src/SPARQLLinkkerRendererVisitorTest.java
+++ b/test/src/SPARQLLinkkerRendererVisitorTest.java
@@ -18,14 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Cell;
@@ -52,149 +52,6 @@ import org.testng.annotations.Test;
public class SPARQLLinkkerRendererVisitorTest {
- // JE2015:
- // This is a test which has no sense, because there is no linkkey
- // In this case, my new SPARQLLinkkey does not return a query
- // It would link all pairs of RootElement / MusicalWork
- /*
- @Test(groups = {"full", "impl", "raw"})
- public void QueryWithoutLinkkey() throws Exception {
- String alignmentFileName = "alignment3.rdf";
- EDOALAlignment alignment = Utils.loadAlignement(alignmentFileName);
- assertEquals(alignment.nbCells(), 1);
- StringWriter stringWriter = new StringWriter();
- PrintWriter writer = new PrintWriter(stringWriter);
- SPARQLLinkkerRendererVisitor renderer = new SPARQLLinkkerRendererVisitor(writer);
- Properties properties = new Properties();
- properties.setProperty( "select", "true" );
- renderer.init(properties);
- alignment.render(renderer);
- Cell cell = alignment.getElements().nextElement();
-System.err.println( cell );
-System.err.println( renderer.getQuery( cell ) );
- String expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
- + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors#>\n"
- + "PREFIX xsd:<http://www.w3.org/2001/XMLSchema#>\n"
- + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
- + "SELECT DISTINCT ?s1 ?s2 \n"
- + "WHERE {\n"
- + "?s1 rdf:type ns0:RootElement .\n"
- + "?s2 rdf:type ns1:MusicalWork .\n"
- + "FILTER(?s1 != ?s2)\n"
- + "}\n";
- assertEquals( renderer.getQuery( cell ), expectedQuery );
-
- // Same thing as above on the inverted alignment
- Alignment newal = alignment.inverse();
- stringWriter = new StringWriter();
- writer = new PrintWriter(stringWriter);
- renderer = new SPARQLLinkkerRendererVisitor(writer);
- renderer.init(properties);
- alignment.render(renderer);
- cell = alignment.getElements().nextElement();
-
- expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
- + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors#>\n"
- + "PREFIX xsd:<http://www.w3.org/2001/XMLSchema#>\n"
- + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
- + "SELECT DISTINCT ?s1 ?s2 \n"
- + "WHERE {\n"
- + "?s2 rdf:type ns0:RootElement .\n"
- + "?s1 rdf:type ns1:MusicalWork .\n"
- + "FILTER(?s1 != ?s2)\n"
- + "}\n";
- assertEquals(renderer.getQuery(cell), expectedQuery);
- }*/
-
-// @Test(groups = {"full", "impl", "raw"}, dependsOnMethods = {"QueryWithoutLinkkey"})
-// public void QueryFromAndProperty() throws Exception {
-// String alignmentFileName = "alignment_with_and_property.rdf";
-// EDOALAlignment alignment = Utils.loadAlignement(alignmentFileName);
-// StringWriter stringWriter = new StringWriter();
-// PrintWriter writer = new PrintWriter(stringWriter);
-// SPARQLLinkkerRendererVisitor renderer = new SPARQLLinkkerRendererVisitor(writer);
-// Properties properties = new Properties();
-// properties.setProperty( "select", "true" );
-// renderer.init(properties);
-// alignment.render(renderer);
-// assertEquals(alignment.nbCells(), 2);
-// Enumeration<Cell> cells = alignment.getElements();
-//
-// Cell cell1 = null;
-// Cell cell2 = null;
-// while (cells.hasMoreElements()) {
-// Cell cell = cells.nextElement();
-// if (cell.getId().equals("http://exmo.inrialpes.fr/connectors-core#cell1")) {
-// cell1 = cell;
-// } else {
-// cell2 = cell;
-// }
-// }
-// //First test : with "and" property on linkkey
-// String expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-// + "PREFIX ns2:<http://exmo.inrialpes.fr/connectors-data#>\n"
-// + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors-core#>\n"
-// + "PREFIX ns3:<http://purl.org/NET/c4dm/keys.owl#>\n"
-// + "PREFIX ns4:<http://www.w3.org/2000/01/rdf-schema#>\n"
-// + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
-// + "SELECT DISTINCT ?s1 ?s2 \n"
-// + "WHERE {\n"
-// + "?s1 rdf:type ns0:RootElement .\n"
-// + "?s2 rdf:type ns1:MusicalWork .\n"
-// + "?s1 ns2:tonalite ?o1 .\n"
-// + "?s2 rdf:type ns3:Key .\n"
-// + "?s2 ns4:label ?o1 .\n"//@ Jérôme : we have ?o2 instead of ?o1
-// + "FILTER(?s1 != ?s2)\n"
-// + "}\n";
-// assertEquals(renderer.getQuery(cell1), expectedQuery);
-// expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-// + "PREFIX ns2:<http://exmo.inrialpes.fr/connectors-data#>\n"
-// + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors-core#>\n"
-// + "PREFIX ns3:<http://purl.org/NET/c4dm/keys.owl#>\n"
-// + "PREFIX ns4:<http://www.w3.org/2000/01/rdf-schema#>\n"
-// + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
-// + "SELECT DISTINCT ?s1 ?s2 \n"
-// + "WHERE {\n"
-// + "?s2 rdf:type ns0:RootElement .\n"
-// + "?s1 rdf:type ns1:MusicalWork .\n"
-// + "?s2 ns2:tonalite ?o1 .\n"
-// + "?s1 rdf:type ns3:Key .\n"
-// + "?s1 ns4:label ?o1 .\n"//@ Jérôme : we have ?o2 instead of ?o1
-// + "FILTER(?s1 != ?s2)\n"
-// + "}\n";
-// Need inverse() first
-// assertEquals(renderer.getQuery(cell1), expectedQuery);
-// //Second test : with "and" property on entity
-// expectedQuery = "SELECT QUERY 1 : PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-// + "PREFIX ns2:<http://exmo.inrialpes.fr/connectors-data#>\n"
-// + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors-core#>\n"
-// + "PREFIX ns3:<http://purl.org/NET/c4dm/keys.owl#>\n"
-// + "PREFIX ns4:<http://www.w3.org/2000/01/rdf-schema#>\n"
-// + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
-// + "SELECT DISTINCT ?s1 ?s2 \n"
-// + "WHERE {\n"
-// + "?s1 ns2:tonalite ?o .\n"
-// + "?s2 rdf:type ns3:Key .\n"
-// + "?s2 ns4:label ?o .\n"//@ Jérôme : we have ?o2 instead of ?o
-// + "FILTER(?s1 != ?s2)\n"
-// + "}\n";
-// assertEquals(renderer.getQuery(cell2), expectedQuery);
-// expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-// + "PREFIX ns2:<http://exmo.inrialpes.fr/connectors-data#>\n"
-// + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors-core#>\n"
-// + "PREFIX ns3:<http://purl.org/NET/c4dm/keys.owl#>\n"
-// + "PREFIX ns4:<http://www.w3.org/2000/01/rdf-schema#>\n"
-// + "PREFIX ns1:<http://purl.org/ontology/mo/>\n"
-// + "SELECT DISTINCT ?s1 ?s2 \n"
-// + "WHERE {\n"
-// + "?s2 ns2:tonalite ?o .\n"
-// + "?s1 rdf:type ns3:Key .\n"
-// + "?s1 ns4:label ?o .\n"//@ Jérôme : we have ?o2 instead of ?o
-// + "FILTER(?s1 != ?s2)\n"
-// + "}\n";
-// Need inverse() first ??
-// assertEquals(renderer.getQueryFromOnto2ToOnto1(cell2), expectedQuery);
-// }
@Test(groups = {"full", "impl", "raw"}) //, dependsOnMethods = {"QueryWithoutLinkkey"})
public void QueryFromSimpleLinkkeyAndIntersects() throws Exception {
@@ -810,113 +667,4 @@ System.err.println( renderer.getQuery( cell ) );
assertTrue(resultValues.contains(expected), "For expected : " + expected);
}
}
-//
-// @Test(groups = {"full", "impl", "raw"}, dependsOnMethods = {"QueryFromSimpleLinkkeyAndEquals"})
-// public void QueryFromRelationLinkkeyAndEquals() throws Exception {
-// //With Equals Linkkey => throw Exception, I already don't know to do it, could be performances innefficiente ...
-// String alignmentFileName = "people_relation_equals_alignment.rdf";
-// EDOALAlignment alignment = Utils.loadAlignement(alignmentFileName);
-// StringWriter stringWriter = new StringWriter();
-// PrintWriter writer = new PrintWriter(stringWriter);
-// SPARQLLinkkerRendererVisitor renderer = new SPARQLLinkkerRendererVisitor(writer);
-// Properties properties = new Properties();
-// properties.setProperty( "select", "true" );
-// renderer.init(properties);
-// alignment.render(renderer);
-//
-// assertEquals(alignment.nbCells(), 1);
-// Enumeration<Cell> cells = alignment.getElements();
-// Cell cell = cells.nextElement();
-// String expectedQuery = "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
-// + "PREFIX ns0:<http://exmo.inrialpes.fr/connectors-core/>\n"
-// + "PREFIX ns1:<http://xmlns.com/foaf/0.1/>\n\n"
-// + "SELECT DISTINCT ?s1 ?s2\n"
-// + "WHERE {\n"
-// + "?s1 rdf:type ns0:Personne .\n"
-// + "?s2 rdf:type ns1:Person .\n"
-// + "?s1 ns0:connait ?o1 .\n"
-// + "?o2 rdf:type ns1:Person .\n"
-// + "?s2 ns1:knows ?o2 .\n"
-// + "?o2 ns1:givenName ?o1 .\n"
-// + "MINUS { \n"
-// + "?s1 ns0:connait ?o1 .\n"
-// + "?s1 ns0:connait ?o2 .\n"
-// + "?o4 rdf:type ns1:Person .\n"
-// + "?s2 ns1:knows ?o4 .\n"
-// + "?o4 ns1:givenName ?o1 .\n"
-// + "FILTER(?s1 != ?s2 && ?o2 != ?o1 && NOT EXISTS {\n"
-// + "?o6 rdf:type ns1:Person .\n"
-// + "?s2 ns1:knows ?o6 .\n"
-// + "?o6 ns1:givenName ?o2 .\n"
-// + "}) \n"
-// + "} \n"
-// + "MINUS {\n"
-// + "?s1 ns0:connait ?o1 .\n"
-// + "?o8 rdf:type ns1:Person .\n"
-// + "?s2 ns1:knows ?o8 .\n"
-// + "?o8 ns1:givenName ?o1 .\n"
-// + "?o10 rdf:type ns1:Person .\n"
-// + "?s2 ns1:knows ?o10 .\n"
-// + "?o10 ns1:givenName ?o4 .\n"
-// + "FILTER(?s1 != ?s2 && ?o1 != ?o4 && NOT EXISTS {\n"
-// + "?s1 ns0:connait ?o4 .\n"
-// + "}) \n"
-// + "} \n"
-// + "FILTER(?s1 != ?s2)\n"
-// + "}";
-//
-// String query = renderer.getQuery(cell);
-// System.out.println("QueryFromRelationLinkkeyAndEquals expectedQuery : " + expectedQuery);
-// System.out.println("QueryFromRelationLinkkeyAndEquals Query : " + query);
-// assertEquals( query, expectedQuery );
-// Model values = Utils.loadValues(new String[]{"equals_people_1.rdf", "equals_people_2.rdf"});
-//
-// Query selectQuery = QueryFactory.create(query);
-// QueryExecution selectQueryExec = QueryExecutionFactory.create(selectQuery, values);
-// ResultSet results = selectQueryExec.execSelect();
-// String[] expectedS1 = {
-// "http://exmo.inrialpes.fr/connectors-data/people#alice_c2_1"};
-// String[] expectedS2 = {
-// "http://exmo.inrialpes.fr/connectors-data/people#alice_c2_2"};
-// HashMap<String, Collection<String>> allResultValues = Utils.getResultValues(results);
-// Collection<String> resultValues = allResultValues.get("s1");
-// assertEquals(resultValues.size(), expectedS1.length);
-// for (String expected : expectedS1) {
-// assertTrue(resultValues.contains(expected));
-// }
-//
-// resultValues = allResultValues.get("s2");
-// assertEquals(resultValues.size(), expectedS2.length);
-// for (String expected : expectedS2) {
-// assertTrue(resultValues.contains(expected));
-// }
-//
-// //Other sens
-// Needs inverse() first
-// query = renderer.getQueryFromOnto2ToOnto1(cell);
-//// System.out.println("QueryFromSimpleLinkkeyFromIntersects : " + query);
-// values = Utils.loadValues(new String[]{"equals_people_1.rdf", "equals_people_2.rdf"});
-//
-// selectQuery = QueryFactory.create(query);
-// selectQueryExec = QueryExecutionFactory.create(selectQuery, values);
-// results = selectQueryExec.execSelect();
-// allResultValues = Utils.getResultValues(results);
-// resultValues = allResultValues.get("s1");
-// assertEquals(resultValues.size(), expectedS2.length);
-// for (String expected : expectedS2) {
-// assertTrue(resultValues.contains(expected));
-// }
-//
-// resultValues = allResultValues.get("s2");
-// assertEquals(resultValues.size(), expectedS1.length);
-// for (String expected : expectedS1) {
-// assertTrue(resultValues.contains(expected));
-// }
-//
-// }
-
-// @Test(groups = {"full", "impl", "raw"}, dependsOnMethods = {"QueryWithoutLinkkey", "QueryFromSimpleLinkkeyFromEquals"})
-// public void QueryFromSimpleLinkkeyFromIntersectsAndRelation() throws Exception {
-// fail("HAVE TODO : with (in + eq) => OPTIONAL (with SERVICE call on remote) / many correspondances / With transformations / On local (FROM ...) or remote sparql endpoint (SERVICE) ");
-// }
}
diff --git a/test/src/Utils.java b/test/src/Utils.java
index 67662dc59d2d58401e975231702a8cdc8c21b889..91ae5aabfc91c67e40075739dbafcec3bef3a512 100644
--- a/test/src/Utils.java
+++ b/test/src/Utils.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2014
+ * Copyright (C) INRIA, 2014, 2015
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -23,11 +23,11 @@ import fr.inrialpes.exmo.align.impl.edoal.EDOALAlignment;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.align.parser.RDFParser;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -52,14 +52,14 @@ public class Utils {
return loadedAlignment;
}
- public static Model loadValues(String[] filesNames) throws Exception {
+ public static Model loadValues( String[] filesNames ) throws Exception {
// Model model = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF, null);
Dataset dataset = DatasetFactory.createMem();
Model model = dataset.getDefaultModel();
- for (String fileName : filesNames) {
+ for( String fileName : filesNames ) {
String fullPathName = "test/input/" + fileName;
String source = "file:" + fullPathName;
- InputStream descIn = new FileInputStream(fullPathName);
+ InputStream descIn = new FileInputStream( fullPathName );
model.read(descIn, source);
descIn.close();
}