From 27861f6386d0ff96b06619c55e91a18369cbc494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Sun, 10 Jan 2010 21:00:31 +0000
Subject: [PATCH] - separated the ontowrap library
---
build.xml | 26 +++++++++----------
.../exmo/align/impl/BasicAlignment.java | 10 +++----
.../exmo/align/impl/BasicOntologyNetwork.java | 4 +--
.../exmo/align/impl/DistanceAlignment.java | 4 +--
.../exmo/align/impl/IDDLOntologyNetwork.java | 4 +--
.../exmo/align/impl/MatrixMeasure.java | 4 +--
.../exmo/align/impl/ObjectAlignment.java | 8 +++---
.../inrialpes/exmo/align/impl/ObjectCell.java | 5 ++--
.../inrialpes/exmo/align/impl/Similarity.java | 4 +--
.../exmo/align/impl/URIAlignment.java | 4 +--
.../exmo/align/impl/eval/ExtPREvaluator.java | 8 +++---
.../align/impl/eval/SymMeanEvaluator.java | 4 +--
.../impl/method/ClassStructAlignment.java | 8 +++---
.../impl/method/NameAndPropertyAlignment.java | 8 +++---
.../impl/method/StrucSubsDistAlignment.java | 6 ++---
.../renderer/COWLMappingRendererVisitor.java | 4 +--
.../renderer/HTMLMetadataRendererVisitor.java | 4 +--
.../impl/renderer/HTMLRendererVisitor.java | 4 +--
.../renderer/OWLAxiomsRendererVisitor.java | 4 +--
.../renderer/SEKTMappingRendererVisitor.java | 4 +--
.../impl/renderer/SKOSRendererVisitor.java | 4 +--
.../impl/renderer/SWRLRendererVisitor.java | 4 +--
.../impl/renderer/XSLTRendererVisitor.java | 4 +--
.../exmo/align/parser/AlignmentParser.java | 9 ++++---
.../exmo/align/parser/XMLParser.java | 9 ++++---
.../align/service/AServProtocolManager.java | 9 ++++---
.../exmo/align/service/OysterDirectory.java | 4 +--
.../exmo/align/service/WSAlignment.java | 5 ++--
.../exmo/align/util/ExtGroupEval.java | 5 ++--
src/fr/inrialpes/exmo/align/util/GenPlot.java | 5 ++--
.../inrialpes/exmo/align/util/GroupAlign.java | 5 ++--
.../inrialpes/exmo/align/util/GroupEval.java | 5 ++--
.../exmo/align/util/GroupOutput.java | 5 ++--
.../exmo/ontowrap/BasicOntology.java | 4 +--
.../exmo/ontowrap/HeavyLoadedOntology.java | 4 +--
.../exmo/ontowrap/LoadedOntology.java | 4 +--
src/fr/inrialpes/exmo/ontowrap/Ontology.java | 4 +--
.../exmo/ontowrap/OntologyCache.java | 4 +--
.../exmo/ontowrap/OntologyFactory.java | 6 ++---
.../exmo/ontowrap/jena25/JENAEntityIt.java | 22 +++++++++++++++-
.../exmo/ontowrap/jena25/JENAOntology.java | 8 +++---
.../ontowrap/jena25/JENAOntologyFactory.java | 10 +++----
.../ontowrap/owlapi2/OWLAPI2Ontology.java | 10 +++----
.../owlapi2/OWLAPI2OntologyFactory.java | 10 +++----
.../owl/align/OntologyNetwork.java | 4 +--
45 files changed, 159 insertions(+), 131 deletions(-)
diff --git a/build.xml b/build.xml
index 17101129..033e01b9 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
<filter token="DATE" value="${date}"/>
<filter token="VERS" value="${version}"/>
- <property name="jarclasspath" value="mappingapi/mappingapilite.jar owlapi2/owlapi-bin.jar ontosim/ontosim.jar getopt/getopt.jar log4j/commons-logging.jar log4j/log4j.jar align.jar procalign.jar"/>
+ <property name="jarclasspath" value="mappingapi/mappingapilite.jar owlapi2/owlapi-bin.jar ontosim/ontosim.jar getopt/getopt.jar log4j/commons-logging.jar log4j/log4j.jar align.jar ontowrap.jar procalign.jar"/>
</target>
@@ -110,6 +110,16 @@
<fileset dir="classes" includes="org/semanticweb/owl/align/*.class"/>
<fileset dir="classes" includes="LICENSE.TXT"/>
</jar>
+ <delete file="lib/ontowrap.jar"/>
+ <jar jarfile="lib/ontowrap.jar">
+ <manifest>
+ <attribute name="Built-Date" value="${TODAY}"/>
+ <attribute name="Specification-Title" value="Ontology wrapper"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ </manifest>
+ <fileset dir="classes" includes="fr/inrialpes/exmo/ontowrap/**/*.class"/>
+ <fileset dir="classes" includes="LICENSE.TXT"/>
+ </jar>
<delete file="lib/procalign.jar"/>
<jar jarfile="lib/procalign.jar">
<manifest>
@@ -120,7 +130,6 @@
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
<fileset dir="classes" includes="fr/inrialpes/exmo/align/util/**/*.class"/>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/onto/**/*.class"/>
<fileset dir="classes" includes="fr/inrialpes/exmo/align/parser/**/*.class"/>
<fileset dir="classes" includes="fr/inrialpes/exmo/align/impl/**/*.class"/>
<fileset dir="classes" includes="fr/inrialpes/exmo/align/ling/**/*.class"/>
@@ -141,24 +150,13 @@
<fileset dir="classes" includes="fr/inrialpes/exmo/queryprocessor/**/*.class"/>
<fileset dir="classes" includes="LICENSE.TXT"/>
</jar>
- <!-- anticipate separate onto release -->
- <!--delete file="lib/alonto.jar"/>
- <jar jarfile="lib/alonto.jar">
- <manifest>
- <attribute name="Built-Date" value="${TODAY}"/>
- <attribute name="Main-Class" value="fr.inrialpes.exmo.align.service.AlignmentService"/>
- <attribute name="Implementation-Title" value="Ontology wrapping API"/>
- <attribute name="Implementation-Version" value="${version}"/>
- </manifest>
- <fileset dir="classes" includes="fr/inrialpes/exmo/align/onto/**/*.class"/>
- <fileset dir="classes" includes="LICENSE.TXT"/>
- </jar-->
</target>
<!-- tested -->
<target name="cleanjar" depends="init">
<echo message="Erasing..."/>
<delete file="lib/align.jar"/>
+ <delete file="lib/ontowrap.jar"/>
<delete file="lib/alignsvc.jar"/>
<delete file="lib/procalign.jar"/>
</target>
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index 9a0b1efa..609dad2e 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2009
+ * Copyright (C) INRIA, 2003-2010
* Copyright (C) CNR Pisa, 2005
*
* This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.Ontology;
-import fr.inrialpes.exmo.align.onto.BasicOntology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+import fr.inrialpes.exmo.ontowrap.BasicOntology;
/**
* Represents a basic ontology alignment, i.e., a fully functionnal alignment
@@ -94,9 +94,9 @@ public class BasicAlignment implements Alignment {
/**
* Initialises the Alignment object with two ontologies.
- * These two ontologies can be either an instance of fr.inrialpes.exmo.align.onto.Ontology
+ * These two ontologies can be either an instance of fr.inrialpes.exmo.ontowrap.Ontology
* which will then replaced the one that was there at creation time
- * or a "concrete" ontology which will be inserted in the fr.inrialpes.exmo.align.onto.Ontology
+ * or a "concrete" ontology which will be inserted in the fr.inrialpes.exmo.ontowrap.Ontology
* object.
*/
public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException {
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
index ecc6f007..7094f09c 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2009
+ * Copyright (C) INRIA, 2009-2010
*
* 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,7 +30,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.net.URI;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
diff --git a/src/fr/inrialpes/exmo/align/impl/DistanceAlignment.java b/src/fr/inrialpes/exmo/align/impl/DistanceAlignment.java
index aeca8c62..382647bf 100644
--- a/src/fr/inrialpes/exmo/align/impl/DistanceAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/DistanceAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2009
+ * Copyright (C) INRIA, 2003-2010
*
* 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
@@ -33,7 +33,7 @@ import org.semanticweb.owl.align.AlignmentProcess;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontosim.util.HungarianAlgorithm;
diff --git a/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
index 1e897e7f..6f9ab44d 100644
--- a/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
@@ -1,7 +1,7 @@
/*
* $Id: IDDLOntologyNetwork.java 987 2009-05-27 13:48:33Z euzenat $
*
- * Copyright (C) INRIA, 2009
+ * Copyright (C) INRIA, 2009-2010
*
* 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
@@ -29,7 +29,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.net.URI;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
diff --git a/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java b/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
index f22bfee2..30bab9be 100644
--- a/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
+++ b/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2009
+ * Copyright (C) INRIA, 2003-2010
*
* 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
@@ -31,7 +31,7 @@ import org.semanticweb.owl.align.AlignmentProcess;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.align.impl.Similarity;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
index 56a11fb5..c69b106c 100644
--- a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2009
+ * Copyright (C) INRIA, 2003-2010
*
* 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
@@ -40,9 +40,9 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
-import fr.inrialpes.exmo.align.onto.Ontology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Represents an OWL ontology alignment. An ontology comprises a number of
diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectCell.java b/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
index 21ecd261..6f1fe5b5 100644
--- a/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
+++ b/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2009
+ * Copyright (C) INRIA, 2003-2005, 2007-2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -33,7 +33,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
+
import fr.inrialpes.exmo.align.impl.BasicAlignment;
/**
diff --git a/src/fr/inrialpes/exmo/align/impl/Similarity.java b/src/fr/inrialpes/exmo/align/impl/Similarity.java
index 17e6cca8..74c0f82c 100644
--- a/src/fr/inrialpes/exmo/align/impl/Similarity.java
+++ b/src/fr/inrialpes/exmo/align/impl/Similarity.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004, 2006-2009
+ * Copyright (C) INRIA, 2004, 2006-2010
*
* 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
@@ -24,7 +24,7 @@ import org.semanticweb.owl.align.Alignment;
import java.util.Properties;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Represents the implementation of a similarity measure
diff --git a/src/fr/inrialpes/exmo/align/impl/URIAlignment.java b/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
index 87e422e9..48f27c3d 100644
--- a/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2008
+ * Copyright (C) INRIA, 2003-2008, 2010
*
* 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
@@ -44,7 +44,7 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
/**
* Represents an ontology alignment relating entities identified by their URIs
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
index 03d1a3c2..566c5db6 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2009
+ * Copyright (C) INRIA, 2004-2010
*
* 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,9 +26,9 @@ import org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.util.Enumeration;
import java.util.Properties;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
index e2335d6c..5ca331cc 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2009
+ * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2010
*
* 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 org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import java.lang.Math;
import java.util.Enumeration;
diff --git a/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
index 59fe7bc8..524baa6a 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
@@ -1,7 +1,7 @@
/*
- * $Id$
+ * $id: ClassStructAlignment.java 1189 2010-01-03 17:57:13Z euzenat $
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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,8 +30,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import fr.inrialpes.exmo.align.impl.DistanceAlignment;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import fr.inrialpes.exmo.ontosim.string.StringDistances;
diff --git a/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
index 4acd3388..ce5653de 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
@@ -1,7 +1,7 @@
/*
- * $Id$
+ * $id: NameAndPropertyAlignment.java 1189 2010-01-03 17:57:13Z euzenat $
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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
@@ -31,8 +31,8 @@ import org.semanticweb.owl.align.AlignmentProcess;
import org.semanticweb.owl.align.AlignmentException;
import fr.inrialpes.exmo.align.impl.DistanceAlignment;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import fr.inrialpes.exmo.ontosim.string.StringDistances;
diff --git a/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
index d22f0ca1..120fce26 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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
@@ -32,8 +32,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import fr.inrialpes.exmo.align.impl.DistanceAlignment;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import fr.inrialpes.exmo.ontosim.string.StringDistances;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
index 6018ac0c..fe3984d0 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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
@@ -36,7 +36,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment as a new ontology merging these.
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
index 28f97370..e1a207e7 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id: HTMLRendererVisitor.java 918 2009-02-08 14:30:30Z euzenat $
*
- * Copyright (C) INRIA, 2006-2009
+ * Copyright (C) INRIA, 2006-2010
*
* 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
@@ -36,7 +36,7 @@ import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment in HTML
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
index 9356e4b8..579fdec2 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2006-2009
+ * Copyright (C) INRIA, 2006-2010
*
* 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
@@ -37,7 +37,7 @@ import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.ObjectCell;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment in HTML
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
index f2515ed4..20219d2b 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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
@@ -36,7 +36,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.BasicRelation;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.align.impl.rel.*;
/**
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
index 5c45aba2..1fab9c3a 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2009
+ * Copyright (C) INRIA, 2003-2005, 2007-2010
*
* 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
@@ -37,7 +37,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment as a new ontology merging these.
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
index ed5aa148..0e6f82a2 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2006-2009
+ * Copyright (C) INRIA, 2003-2004, 2006-2010
* Copyright (C) Quentin Reul, 2008
*
* This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.rel.*;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment as a new ontology merging these.
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
index 86888057..51b5e4d4 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2009
+ * Copyright (C) INRIA, 2003-2004, 2007-2010
*
* 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
@@ -37,7 +37,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment as a SWRL rule set interpreting
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
index 7a422ae4..39f843c2 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2006-2009
+ * Copyright (C) INRIA, 2003-2004, 2006-2010
*
* 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
@@ -37,7 +37,7 @@ import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.rel.*;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
/**
* Renders an alignment as a XSLT stylesheet transforming
diff --git a/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java b/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
index b07c1efb..00bce12e 100644
--- a/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/AlignmentParser.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2009
+ * Copyright (C) INRIA, 2003-2005, 2007-2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -40,9 +40,10 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.Ontology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
-import fr.inrialpes.exmo.align.onto.BasicOntology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.BasicOntology;
+
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.Annotations;
diff --git a/src/fr/inrialpes/exmo/align/parser/XMLParser.java b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
index 2d267b52..69e8fd2a 100644
--- a/src/fr/inrialpes/exmo/align/parser/XMLParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2009
+ * Copyright (C) INRIA, 2003-2005, 2007-2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -47,9 +47,10 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
-import fr.inrialpes.exmo.align.onto.Ontology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
-import fr.inrialpes.exmo.align.onto.BasicOntology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.BasicOntology;
+
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.BasicCell;
import fr.inrialpes.exmo.align.impl.BasicParameters;
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index 2e202e03..8d778e1c 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2006-2009
+ * Copyright (C) INRIA, 2006-2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -28,9 +28,10 @@ import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
-import fr.inrialpes.exmo.align.onto.Ontology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentProcess;
diff --git a/src/fr/inrialpes/exmo/align/service/OysterDirectory.java b/src/fr/inrialpes/exmo/align/service/OysterDirectory.java
index 4e4d767b..b6ea6a7b 100644
--- a/src/fr/inrialpes/exmo/align/service/OysterDirectory.java
+++ b/src/fr/inrialpes/exmo/align/service/OysterDirectory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2007-2009
+ * Copyright (C) INRIA, 2007-2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -29,7 +29,7 @@ import org.semanticweb.owl.align.AlignmentException;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
import org.neon_toolkit.registry.api.Oyster2Manager;
import org.neon_toolkit.registry.api.Oyster2Connection;
diff --git a/src/fr/inrialpes/exmo/align/service/WSAlignment.java b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
index d1ddf12b..c19c769f 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAlignment.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-2010
*
* 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
@@ -55,7 +55,8 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
+
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.URICell;
import fr.inrialpes.exmo.align.impl.BasicParameters;
diff --git a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
index 7553a730..a619104d 100644
--- a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2005, 2007-2009 INRIA
+ * Copyright (C) 2003-2005, 2007-2010 INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -36,7 +36,8 @@ import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.eval.ExtPREvaluator;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.PrintStream;
diff --git a/src/fr/inrialpes/exmo/align/util/GenPlot.java b/src/fr/inrialpes/exmo/align/util/GenPlot.java
index 2c0a5e55..ef0abf54 100644
--- a/src/fr/inrialpes/exmo/align/util/GenPlot.java
+++ b/src/fr/inrialpes/exmo/align/util/GenPlot.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2003-2009, INRIA
+ * Copyright (C) 2003-2010, INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -28,7 +28,8 @@ import org.semanticweb.owl.align.Alignment;
import fr.inrialpes.exmo.align.impl.eval.GraphEvaluator;
import fr.inrialpes.exmo.align.impl.eval.PRGraphEvaluator;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.PrintStream;
diff --git a/src/fr/inrialpes/exmo/align/util/GroupAlign.java b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
index 1e9ce5d7..ff8935d5 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupAlign.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2008, INRIA
+ * Copyright (C) 2003-2008, 2010, INRIA
* Copyright (C) 2004, Université de Montréal
*
* Modifications to the initial code base are copyright of their
@@ -39,7 +39,8 @@ import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index 3b626350..a4c80034 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2009, INRIA
+ * Copyright (C) 2003-2010, INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,8 @@ import org.semanticweb.owl.align.Evaluator;
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.PrintStream;
diff --git a/src/fr/inrialpes/exmo/align/util/GroupOutput.java b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
index 027d80ad..f449c05f 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupOutput.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2009, INRIA
+ * Copyright (C) 2003-2010, INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +33,8 @@ import org.semanticweb.owl.align.Evaluator;
import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
+
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/src/fr/inrialpes/exmo/ontowrap/BasicOntology.java b/src/fr/inrialpes/exmo/ontowrap/BasicOntology.java
index 57d23175..b7563aac 100644
--- a/src/fr/inrialpes/exmo/ontowrap/BasicOntology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/BasicOntology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2007-2008
+ * Copyright (C) INRIA, 2007-2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/ontowrap/HeavyLoadedOntology.java b/src/fr/inrialpes/exmo/ontowrap/HeavyLoadedOntology.java
index a57dfbab..f9101c65 100644
--- a/src/fr/inrialpes/exmo/ontowrap/HeavyLoadedOntology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/HeavyLoadedOntology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008
+ * Copyright (C) INRIA, 2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
import java.util.Set;
diff --git a/src/fr/inrialpes/exmo/ontowrap/LoadedOntology.java b/src/fr/inrialpes/exmo/ontowrap/LoadedOntology.java
index 506d82bb..d470f1af 100644
--- a/src/fr/inrialpes/exmo/ontowrap/LoadedOntology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/LoadedOntology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
import java.net.URI;
import java.util.Set;
diff --git a/src/fr/inrialpes/exmo/ontowrap/Ontology.java b/src/fr/inrialpes/exmo/ontowrap/Ontology.java
index 397c362a..2816da5f 100644
--- a/src/fr/inrialpes/exmo/ontowrap/Ontology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/Ontology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008
+ * Copyright (C) INRIA, 2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/ontowrap/OntologyCache.java b/src/fr/inrialpes/exmo/ontowrap/OntologyCache.java
index 675f91d3..bfaf24d8 100644
--- a/src/fr/inrialpes/exmo/ontowrap/OntologyCache.java
+++ b/src/fr/inrialpes/exmo/ontowrap/OntologyCache.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2007-2008
+ * Copyright (C) INRIA, 2007-2008, 2010
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -19,7 +19,7 @@
* USA.
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
// import java classes
import java.util.Hashtable;
diff --git a/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
index 8a649e3e..e5282000 100644
--- a/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
+++ b/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008
+ * Copyright (C) INRIA, 2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto;
+package fr.inrialpes.exmo.ontowrap;
import java.net.URI;
import java.util.Hashtable;
@@ -45,7 +45,7 @@ public abstract class OntologyFactory {
protected static Hashtable<String,OntologyFactory> instances = null;
- private static String API_NAME="fr.inrialpes.exmo.align.onto.owlapi2.OWLAPI2OntologyFactory";
+ private static String API_NAME="fr.inrialpes.exmo.ontowrap.owlapi2.OWLAPI2OntologyFactory";
public static String getDefaultFactory(){
return API_NAME;
diff --git a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAEntityIt.java b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAEntityIt.java
index 6a56ef1b..ded08e09 100644
--- a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAEntityIt.java
+++ b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAEntityIt.java
@@ -1,4 +1,24 @@
-package fr.inrialpes.exmo.align.onto.jena25;
+/*
+ * $Id$
+ *
+ * Copyright (C) INRIA, 2008-2010
+ *
+ * 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
+ * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package fr.inrialpes.exmo.ontowrap.jena25;
import java.net.URI;
import java.util.AbstractSet;
diff --git a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntology.java
index 946e8ede..27db3b0f 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-2009
+ * Copyright (C) INRIA, 2003-2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto.jena25;
+package fr.inrialpes.exmo.ontowrap.jena25;
import java.net.URI;
import java.util.AbstractSet;
@@ -42,8 +42,8 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.impl.LiteralImpl;
-import fr.inrialpes.exmo.align.onto.BasicOntology;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.BasicOntology;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
public class JENAOntology extends BasicOntology<OntModel> implements LoadedOntology<OntModel>{
diff --git a/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/jena25/JENAOntologyFactory.java
index 7fd7afad..28eecc92 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
+ * Copyright (C) INRIA, 2003-2008, 2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto.jena25;
+package fr.inrialpes.exmo.ontowrap.jena25;
import java.net.URI;
import java.net.URISyntaxException;
@@ -31,9 +31,9 @@ import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.ontology.Ontology;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-import fr.inrialpes.exmo.align.onto.LoadedOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
-import fr.inrialpes.exmo.align.onto.OntologyCache;
+import fr.inrialpes.exmo.ontowrap.LoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.OntologyCache;
public class JENAOntologyFactory extends OntologyFactory {
diff --git a/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2Ontology.java b/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2Ontology.java
index 6b38556e..af6bc8b1 100644
--- a/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2Ontology.java
+++ b/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2Ontology.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto.owlapi2;
+package fr.inrialpes.exmo.ontowrap.owlapi2;
import java.net.URI;
import java.util.HashSet;
@@ -45,9 +45,9 @@ import org.semanticweb.owl.model.OWLObjectAllRestriction;
import org.semanticweb.owl.model.OWLException;
import org.semanticweb.owl.vocab.OWLRDFVocabulary;
-import fr.inrialpes.exmo.align.onto.BasicOntology;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.BasicOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
public class OWLAPI2Ontology extends BasicOntology<OWLOntology> implements
HeavyLoadedOntology<OWLOntology> {
diff --git a/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2OntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2OntologyFactory.java
index 9477828b..76312417 100644
--- a/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2OntologyFactory.java
+++ b/src/fr/inrialpes/exmo/ontowrap/owlapi2/OWLAPI2OntologyFactory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-2010
*
* 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
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.onto.owlapi2;
+package fr.inrialpes.exmo.ontowrap.owlapi2;
import java.net.URI;
import java.net.URISyntaxException;
@@ -29,9 +29,9 @@ import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLOntologyCreationException;
import org.semanticweb.owl.model.OWLOntologyManager;
-import fr.inrialpes.exmo.align.onto.OntologyCache;
-import fr.inrialpes.exmo.align.onto.OntologyFactory;
-import fr.inrialpes.exmo.align.onto.HeavyLoadedOntology;
+import fr.inrialpes.exmo.ontowrap.OntologyCache;
+import fr.inrialpes.exmo.ontowrap.OntologyFactory;
+import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
public class OWLAPI2OntologyFactory extends OntologyFactory {
diff --git a/src/org/semanticweb/owl/align/OntologyNetwork.java b/src/org/semanticweb/owl/align/OntologyNetwork.java
index 7c62620d..9a485650 100644
--- a/src/org/semanticweb/owl/align/OntologyNetwork.java
+++ b/src/org/semanticweb/owl/align/OntologyNetwork.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2009
+ * Copyright (C) INRIA, 2009-2010
*
* 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,7 +27,7 @@ import java.util.Iterator;
import java.util.Set;
import java.net.URI;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
/**
* Represents a distributed system of aligned ontologies or network of ontologies.
--
GitLab