diff --git a/build.xml b/build.xml
index 1710112928300b9af91c22dcae07fe096a5ae37f..033e01b9a0ddcc122be8d40ee221f1b0b5606d85 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 9a0b1efa3c62398cce4733d12b2211842c906d86..609dad2e56dd4f2e76a407562aa0b447f7bc3d67 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 ecc6f007827490e958162631b5736b3f0533463d..7094f09c1828c2e48340b72295255ecbab14125b 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 aeca8c62442b9ba5f0e72591ab909d72bc9e9730..382647bf9a6fa35d0641c6f19bd9c01c24d6b447 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 1e897e7f67fabb4da44c8f920855a52b2308d2a5..6f9ab44d4a99cee63965967c0f7546b573b4cd66 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 f22bfee2f9c7d3ec083247676dbe78f9c14c8ccb..30bab9be01e36a489c79d4cdb2b2f368496163a0 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 56a11fb5bc428e3e89ac5ef9b29daf2580e413d0..c69b106c65e09af30d4d41f65bff08ff3d7cc7b7 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 21ecd26162cfc54e99360cc34f3c3c197cb1cbbc..6f1fe5b5a6d87e481a10acdfab18e9e4514d87a8 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 17e6cca8511e31c19915d09dc2dbed1f354ee31d..74c0f82cf19a4746abcb52f1dc85ebcaab3afa77 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 87e422e99ebba918dddaaed16e172997d456c569..48f27c3d7e9aac20aabd57a3801c0ec51205482f 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 03d1a3c2fc8082d2c73467ad530678be21fbc69f..566c5db626efd8622bfe7d9fe84bcef2f21c5969 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 e2335d6c19f9b23af411dbfd0701b593d5eb493e..5ca331cc225fbdeec1213e1a7b292e8a9f41307f 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 59fe7bc8e010f1d53b204c49f654eacf1545ce47..524baa6a2de0729803962dbb607c08fd681daa0b 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 4acd3388011fbfb537e479521bc8f6251a1a3c0e..ce5653de476f058eef6ed702e350420c19c9b4e8 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 d22f0ca17c6ba7c78ef2792557e8088c4fc09ad8..120fce2683d6993f1881c72ad76e2c1867161099 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 6018ac0c58ed8894af81086be20eab1bb307414e..fe3984d0f946ade70e69b609595e6ce893781a87 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 28f973700c6abe3aea37d8e3c2b06efdd49d2563..e1a207e7f259a3889104ed4c2b6e38d7048b6692 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 9356e4b80ab3906348efebc10d0b0ce33b857772..579fdec2df3a73f61e4bb1350a55bb319403ad4d 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 f2515ed4691cda30f9e55d77102635a3f4d3b6da..20219d2b91212162cced9ca3556433ac41fcc960 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 5c45aba2644f6998278f68332a8512e74d312680..1fab9c3ac7b868e92ad3507f3c0cd256b825a95a 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 ed5aa14879a47f666272b876cd1b0a43d9cc9ccd..0e6f82a2aa5a263193ad5e1790cc87d0f45f376e 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 86888057406369c4b94b252fc5ca24dd7cd7044e..51b5e4d4d73ebb0f9c1bfe36b34455fe2ba56d19 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 7a422ae4ee7f8a30c28062584bee31569b07a70e..39f843c276a7f391b4858780a4343fe3fb576ca8 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 b07c1efb81beecbd74291164f2892d2d685af424..00bce12e07d08c2f59690015d22150a7ced9dc67 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 2d267b52ef6e3bcc03c0f443ded438b019ec94f6..69e8fd2a373f5f2270e211dfb8f23a2c320202de 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 2e202e03980825fab2ab684d09d7862e934888d8..8d778e1cc47e9b2cfe4f997d138d6d177f638fb2 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 4e4d767be103b26be6d9b9203b41e30ccbf8644d..b6ea6a7b1257210725288c103a67bb4d79e631e9 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 d1ddf12b8db30194cc58c3140df958c023eeea92..c19c769f269f4ea9c7af37c57ea4431d2738d67b 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 7553a7309be94e804035e84509fac979ec392709..a619104d1b049b115ce07dd167a4e3db017bb69a 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 2c0a5e55774cb0504a2b118c090acab1e5e4668c..ef0abf54c87889344d9938614add19043f429ef6 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 1e9ce5d7456ea9aa0db2ffadee1aa6efa62065c0..ff8935d5c4b5f6bf2128693a0ae3715a94c5a026 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 3b626350b3acd7198519a3c6373b56ca3cd48435..a4c800343acd06705be1963c87b4d00bad3cdf06 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 027d80ad44707d62d40cb013aee5e0a4e70727d5..f449c05f6dc73ae708fd957979b26e18a4db42df 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 57d23175f835cca99e6b2aabc9528bd0ee3f2546..b7563aac22ab374047e8420800994aca8bbc5923 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 a57dfbabad128e10f221b0cf2cffbaa47d79d325..f9101c65df38288a8f2cdc4b4ffc39ae5f8f8bc2 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 506d82bb5384afc9224546e3a70060e9b2dacf0c..d470f1af5676fa0a77e272b823b1cb9af792ec33 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 397c362a68d864543041aa3891177b4fa3c559cb..2816da5fda7b9c9c0dc82b2cceb168374b2e5ac2 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 675f91d3833ba2fcf47a8508b51fa4f2c5a99e2f..bfaf24d85b367a8e43dc16b43db87f8fd0a12482 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 8a649e3e3642bbaa358880ac82f4fbf3bf1b0b9c..e52820007717cf35c59b5596bb4746a9d916273c 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 6a56ef1b717c5c9a8602e320add89dc901858007..ded08e09b19ac3e2820ec7303116e22bb5417fcb 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 946e8ede9942ca0502814f5ed19fc010b1876aab..27db3b0f8bfbb81d435781c62455707f794a2442 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 7fd7afade9f7b6517e8c2916ae29d47f1776c226..28eecc924855dbbca931f9b656ec389e1d97e001 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 6b38556e0f4825e89d4dd444f1c79107d906e63f..af6bc8b11a593243db9966af57986124985b92ae 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 9477828bf654aaa63a99617fefda2c9f376b8daf..76312417f9cedd53dfb66f24b16ac3f2b90ccc87 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 7c62620d3048c484e377d0316489ed5d8b37074c..9a485650909a23fda754845d1dbc395c95749899 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.