diff --git a/html/neontk/index.html b/html/neontk/index.html
index 7607a7682193e24d82c9c369b5a9ad8cc821a8d4..b3db4c1994c5258ec2f5c18cd22d04058cbb3ae6 100755
--- a/html/neontk/index.html
+++ b/html/neontk/index.html
@@ -125,7 +125,7 @@ Alignment plug-in</a></i>.
<hr />
<center>http://alignapi.gforge.inria.fr/neontk/</center>
<hr />
-$Id: index.html 759 2008-07-20 09:01:34Z euzenat $
+$Id$
</small>
</body>
</html>
diff --git a/html/relnotes.html b/html/relnotes.html
index 91a0db57704768fa4905cb7907666d7ea001a8b6..a33a5b6f45594ae6c5e9d051566c3cfbf8859f3c 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -73,7 +73,7 @@ likely to include:
<!--h2>Version 4.2 (1xxx): xx/09/2009 - Zimt</h2-->
<!--h2>Version 4.1 (1xxx): xx/09/2009 - Tring</h2-->
-<!--h2>Version 4.0 (1229): xx/09/2009 - Rouquine carmélite</h2-->
+<!--h2>Version 4.0 (1310): xx/03/2010 - Rouquine carmélite</h2-->
<!--p><span style="color: red;">BEWARE (major upgrade):</span>
UPGRADE ALL LIBRARIES
@@ -85,7 +85,7 @@ UPGRADE ALL LIBRARIES
<li>Separated the Alignment API from <a href="http://ontosim.gforge.inria.fr">OntoSim</a> (impl/ling)</li>
<li>Replacement of <tt>Parameters</tt> by Java <tt>Property</tt> (api/impl)</li>
<li>Reintegrated <tt>JWNLAlignment</tt> in implementation (procalign)</li>
-<li>Separated <tt>ontowrap</tt> (previously <tt>onto</tt>) as a dinstinct library (ontowrap)</li>
+<li>Separated <tt>ontowrap</tt> (previously <tt>onto</tt>) as a distinct library (ontowrap)</li>
<li>Migrated to <span style="color: green">OWL API 3</span> as the default Ontology implementation (ontowrap)</li>
<li>Lifted OWL API 3 as <tt>HeavyLoadedOntology</tt> (ontowrap)</li>
<li>Added cache management to <tt>JENAOntology</tt> (ontowrap)</li>
diff --git a/html/tutorial/tutorial1/server.html b/html/tutorial/tutorial1/server.html
index 5a9243536597ee51af7172f17e2d7a84f2b0c66c..3245f74588ac262e4b28937c4f9fce528da0036e 100644
--- a/html/tutorial/tutorial1/server.html
+++ b/html/tutorial/tutorial1/server.html
@@ -198,6 +198,6 @@ Planning:
<p style="text-align: center;">http://alignapi.gforge.inria.fr/tutorial//tutorial1/server.html</p>
</small>
<hr />
-<p>$Id: index.html 384 2007-02-02 11:09:40Z euzenat $</p>
+<p>$Id$</p>
</body>
</html>
diff --git a/html/tutorial/tutorial3/embed.html b/html/tutorial/tutorial3/embed.html
index 8ea6c2c4d6a03f0c5724764acf23ef63d7adbbc8..9ff9868197303d31be95fd367fa50eec9638d774 100644
--- a/html/tutorial/tutorial3/embed.html
+++ b/html/tutorial/tutorial3/embed.html
@@ -224,6 +224,6 @@ Threshold 1.0 : 0.5151515151515151 over 18 cells
<p style="text-align: center;">http://alignapi.gforge.inria.fr/tutorial/tutorial3/embed.html</p>
</small>
<hr />
-<p>$Id: index.html 1046 2009-07-09 12:24:53Z euzenat $</p>
+<p>$Id$</p>
</body>
</html>
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormLayoutFactory.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormLayoutFactory.java
index bd0e472164997df51b0fbb6f89e871a94d4f2775..7f7bca71c8bada38db8920e99a551e8670d9a7ef 100644
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormLayoutFactory.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormLayoutFactory.java
@@ -1,5 +1,5 @@
/*
- * $Id: View.java 860 2008-10-17 07:43:35Z cleduc $
+ * $Id$
*
* Copyright (C) INRIA, 2007-2008
*
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormSectionFactory.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormSectionFactory.java
index 06db5193d5321bbf8fdc21ad7821d653cd54de38..7cc39efe1963680184f11ea3901ef9ccfb9ab03d 100644
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormSectionFactory.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignFormSectionFactory.java
@@ -1,5 +1,5 @@
/*
- * $Id: View.java 860 2008-10-17 07:43:35Z cleduc $
+ * $Id$
*
* Copyright (C) INRIA, 2007-2009
*
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineDialog.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineDialog.java
index 123df2ab0881b5c6ede8c8a4a5c4012eb8c48ee8..fd03dadb3b4c63189be830758e2eeb5219c919bf 100644
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineDialog.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OnlineDialog.java
@@ -1,5 +1,5 @@
/*
- * $Id: View.java 860 2008-10-17 07:43:35Z cleduc $
+ * $Id$
*
* Copyright (C) INRIA, 2007-2008
*
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/WSDialog.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/WSDialog.java
index 708bfa1f60d502041951fedd75afc4eb0446ce45..a7e03e759f6c960ef81793b25ff29ef6ebb40d1a 100644
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/WSDialog.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/WSDialog.java
@@ -1,5 +1,5 @@
/*
- * $Id: View.java 860 2008-10-17 07:43:35Z cleduc $
+ * $Id$
*
* Copyright (C) INRIA, 2007-2008
*
diff --git a/plugins/webcontent/build.xml b/plugins/webcontent/build.xml
index 586432fccaf9859fdc7ef722b0e9fa14ba6f514b..343717febfeaee8d001b273404bc1d460636a2f4 100644
--- a/plugins/webcontent/build.xml
+++ b/plugins/webcontent/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
-<!-- $Id: build.xml 710 2008-04-24 13:43:20Z euzenat $ -->
+<!-- $Id$ -->
<project name="align" default="compile" basedir=".">
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassConstruction.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassConstruction.java
index 29ffd06337638aa2e24ac9f438448142ee9e546e..50f6048ea6f426d26a0c1ece993cfdbb444b51b1 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassConstruction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassConstruction.java
@@ -43,7 +43,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/ClassExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
// JE2010: Should it be abstract with ClassConjunction??
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassExpression.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassExpression.java
index aa0dbec62a5058db0c21782235582e847a2e9e4c..80581715b7af17d899f180637be57c9e49da9b03 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassExpression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassExpression.java
@@ -39,7 +39,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/ClassExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class ClassExpression extends Expression {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassOccurenceRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassOccurenceRestriction.java
index f54915d91700a338c4a2a3076a8052597f402b30..a8221823354bdb07ab73eec01a638d3895c6c2b7 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassOccurenceRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassOccurenceRestriction.java
@@ -37,7 +37,7 @@ package fr.inrialpes.exmo.align.impl.edoal;
* @author Francois Scharffe
* @author Adrian Mocan
* @author Richard Pöttler
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class ClassOccurenceRestriction extends ClassRestriction implements Cloneable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassRestriction.java
index 85c9cefcb95604f68ef00f0832fda649e90b961c..c6ce6b45d0f5ba23635438f63446fe8f8ad9ad9c 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassRestriction.java
@@ -40,13 +40,13 @@ import org.semanticweb.owl.align.Visitable;
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
* </p>
* <p>
- * $Id: ClassRestriction.java,v 1.6 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Francois Scharffe
* @author Adrian Mocan
* @author Richard Pöttler
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class ClassRestriction extends ClassExpression {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassTypeRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassTypeRestriction.java
index c78f417e44ee9c2ea5d31c6d70f7aca1e424e062..b0608833bd146b563e7225cbaab68ccf4b723e1e 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassTypeRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassTypeRestriction.java
@@ -27,7 +27,7 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Represents a type typeCondition tag for PropertyExpressions.
* </p>
* <p>
- * $Id: ClassTypeRestriction.java,v 1.5 2006/11/27 16:39:09 poettler_ric Exp $
+ * $Id$
* </p>
* <p>
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
@@ -36,7 +36,7 @@ package fr.inrialpes.exmo.align.impl.edoal;
* @author Francois Scharffe
* @author Adrian Mocan
* @author Richard Pöttler
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 21:55:23 +0100 (Sun, 07 Mar 2010) $
*/
public class ClassTypeRestriction extends ClassRestriction implements Cloneable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/ClassValueRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/ClassValueRestriction.java
index fafa76c7ab1033a1b914988b57ee75c3c90548b0..1c78feb118ac56eb4a01910219649d4a09c9e6a9 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/ClassValueRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/ClassValueRestriction.java
@@ -27,14 +27,14 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Represents a type valueCondition tag for PropertyExpressions.
* </p>
* <p>
- * $Id: ClassValueRestriction.java,v 1.6 2006/11/27 16:39:09 poettler_ric Exp $
+ * $Id$
* </p>
* <p>
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
* </p>
*
* @author Richard Pöttler
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class ClassValueRestriction extends ClassRestriction implements Cloneable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
index 05ac35e4b9b704a8d18df6e4a42c9dd2d66512f0..006014086442796a4ed4a79ee9853b11da53be90 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
@@ -1,5 +1,5 @@
/*
- * $Id: EDOALAlignment.java,v 1.6 2008/09/15 08:38:54 jeuzenat Exp $
+ * $Id$
*
* Sourceforge version 1.6 - 2008 - was OMWGAlignment
* Copyright (C) INRIA, 2007-2010
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALCell.java b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALCell.java
index b5a892c1aa95f6eca04dc3d744271074f98e3f7f..848e0599bdda00956a7c93bde7b6060f92d018be 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALCell.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALCell.java
@@ -1,5 +1,5 @@
/*
- * $Id: EDOALCell.java,v 1.2 2008/06/29 16:18:49 jeuzenat Exp $
+ * $Id$
*
* Sourceforge version 1.2 - 2008
* Copyright (C) INRIA, 2007-2009
@@ -61,7 +61,7 @@ import fr.inrialpes.exmo.align.impl.rel.*;
* -- no real use of direction.
*
* @author Jérôme Euzenat
- * @version $Id: EDOALCell.java,v 1.2 2008/06/29 16:18:49 jeuzenat Exp $
+ * @version $Id$
*/
public class EDOALCell extends BasicCell {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALRelation.java b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALRelation.java
index c090fb4ccaed25df89c78978842785b3d195d7b6..d087cb9cad747979fb9f7f5dc190d28b6ed8ae77 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALRelation.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALRelation.java
@@ -1,5 +1,5 @@
/*
- * $Id: EDOALRelation.java,v 1.3 2008/02/28 20:14:10 jeuzenat Exp $
+ * $Id$
*
* Sourceforge version 1.3 - 2008
* Copyright (C) INRIA, 2007-2009
@@ -42,7 +42,7 @@ import org.xml.sax.ContentHandler;
* but should be rewritten in order to achive a better implementation
*
* @author Jérôme Euzenat
- * @version $Id: EDOALRelation.java,v 1.3 2008/02/28 20:14:10 jeuzenat Exp $
+ * @version $Id$
*/
public class EDOALRelation implements Relation {
@@ -52,7 +52,7 @@ public class EDOALRelation implements Relation {
* Enumeration to distinuish the direction of the mapping.
* </p>
* <p>
- * $Id: MappingRule.java,v 1.10 2008/01/22 18:24:58 jeuzenat Exp $
+ * $Id$
* </p>
*
* @author richi
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/Expression.java b/src/fr/inrialpes/exmo/align/impl/edoal/Expression.java
index c701ed070d4fc834bae84ec36260040078ca0536..00b371a40f682b116ee0bf0149e66f987647cb58 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/Expression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/Expression.java
@@ -55,7 +55,7 @@ import org.semanticweb.owl.align.AlignmentVisitor;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/Expression.java,v $,
- * @version $Revision: 1.7 $ $Date$
+ * @version $Revision: 1.7 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class Expression implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/Id.java b/src/fr/inrialpes/exmo/align/impl/edoal/Id.java
index 7f2c3b201dbf43a2b0dee2548508d3d680596f7b..12c583d49678d8fea0afc175a232167a5efb6c70 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/Id.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/Id.java
@@ -33,7 +33,7 @@ import java.net.URI;
* Committed by $Author: poettler_ric $
*
* $Source: /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/Id.java,v $,
- * @version $Revision: 1.3 $ $Date$
+ * @version $Revision: 1.3 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public interface Id {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/InstanceExpression.java b/src/fr/inrialpes/exmo/align/impl/edoal/InstanceExpression.java
index 48e56c27feb2a2784f2091489c4f396d232dab29..614398fb0e25ee1e024342532dc1c6974ddef551 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/InstanceExpression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/InstanceExpression.java
@@ -37,7 +37,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/InstanceExpr.java,v $,
- * @version $Revision: 1.4 $ $Date$
+ * @version $Revision: 1.4 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class InstanceExpression extends Expression {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PathExpression.java b/src/fr/inrialpes/exmo/align/impl/edoal/PathExpression.java
index 21a83960b1d123e0cae20d5a39ab0ec111cba2fc..f46e1af742ae2823ee3565205d238aabbbac1ee8 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PathExpression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PathExpression.java
@@ -40,7 +40,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/RelationExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class PathExpression extends Expression implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyConstruction.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyConstruction.java
index a321a33c9985f7fc5a1f4a6e18c386bb8d89c601..0edc0574735e65a1f782fa37eec5c4b6e2c1fc3a 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyConstruction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyConstruction.java
@@ -43,7 +43,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/PropertyExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
// JE2010: Should it be abstract with RelationConjunction??
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyDomainRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyDomainRestriction.java
index d9fac77f11f77f4d7e39f83bd8c08ac448a9c5e3..6389c1a459e77e5501699121b3b00c66402876f6 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyDomainRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyDomainRestriction.java
@@ -27,12 +27,12 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Represents a domainRestriction tag for PropertyExpressions.
* </p>
* <p>
- * $Id: PropertyDomainRestriction.java,v 1.4 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Richard Pöttler
* @version $Revision: 1.4 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*
*/
public class PropertyDomainRestriction extends PropertyRestriction {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyExpression.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyExpression.java
index f8a2981f48b99d43d37e32fb0613700e435f757a..d282b000bbda495beff1977e2849932336d9c80e 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyExpression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyExpression.java
@@ -34,13 +34,13 @@ import org.semanticweb.owl.align.Visitable;
* Represents a PropertyExpression.
* </p>
* <p>
- * $Id: PropertyExpr.java,v 1.7 2006/11/30 12:21:41 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Francois Scharffe, Adrian Mocan
* @author richi
* @version $Revision: 1.7 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class PropertyExpression extends PathExpression implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyId.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyId.java
index 540bd944f6793c69bba7b9f3d935c6a80429c18e..e6012fc36d62333cf2ac8e14db27738c47c5ce8d 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyId.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyId.java
@@ -30,12 +30,12 @@ import java.net.URISyntaxException;
* A simple Id to represent a Property.
* </p>
* <p>
- * $Id: PropertyExpr.java,v 1.7 2006/11/30 12:21:41 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author richi
* @version $Revision: 1.7 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class PropertyId extends PropertyExpression implements Id {
/** Holds the identifier. */
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyRestriction.java
index 68d3570e8f8153bfdda93e992c2e6ecdb5123b46..0c231f961c559f9e6135648dbfbf02a796a62415 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyRestriction.java
@@ -40,13 +40,13 @@ import org.semanticweb.owl.align.Visitable;
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
* </p>
* <p>
- * $Id: PropertyCondition.java,v 1.6 2006/11/27 16:39:09 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Richard Pöttler
* @author Adrian Mocan
* @author Francois Scharffe
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class PropertyRestriction extends PropertyExpression implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyTypeRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyTypeRestriction.java
index 3148abb563f646c6a24d6a0193a16d9ec32578a4..972c655a9b17f7b65ca6617356d3472e310214f7 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyTypeRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyTypeRestriction.java
@@ -30,13 +30,13 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
* </p>
* <p>
- * $Id: PropertyTypeRestriction.java,v 1.6 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Francois Scharffe
* @author Adrian Mocan
* @author Richard Pöttler
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class PropertyTypeRestriction extends PropertyRestriction implements Cloneable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyValueRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyValueRestriction.java
index c7e9f72c5d9ae2a8b64a660f03a8db16a4856508..aa34e0e5da74b2019ff3a57000121e5861f0ba0c 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/PropertyValueRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/PropertyValueRestriction.java
@@ -28,13 +28,13 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Created on 24-Mar-2005 Committed by $Author: poettler_ric $
* </p>
* <p>
- * $Id: PropertyValueRestriction.java,v 1.6 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Francois Scharffe
* @author Adrian Mocan
* @author Richard Pöttler
- * @version $Revision: 1.6 $ $Date$
+ * @version $Revision: 1.6 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class PropertyValueRestriction extends PropertyRestriction implements Cloneable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/RelationCoDomainRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/RelationCoDomainRestriction.java
index ee32644bafac90026ed65bbe13582b56c29eb857..15cb3b5a584e0e6aadfb88e742649f3262c3ff2b 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/RelationCoDomainRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/RelationCoDomainRestriction.java
@@ -33,7 +33,7 @@ package fr.inrialpes.exmo.align.impl.edoal;
*
* @author Richard Pöttler
* @version $Revision: 1.4 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*
*/
public class RelationCoDomainRestriction extends RelationRestriction {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/RelationConstruction.java b/src/fr/inrialpes/exmo/align/impl/edoal/RelationConstruction.java
index a0b6f3759e996759c1f4dced4f8a6528d2f05837..6c7cf10c35c91c061c1f3d0e802799c88004e8f9 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/RelationConstruction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/RelationConstruction.java
@@ -43,7 +43,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/RelationExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
// JE2010: Should it be abstract with RelationConjunction??
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/RelationDomainRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/RelationDomainRestriction.java
index d107b848f9d59ae979562ffa41f19da1ec704feb..220749ed532119446c4d2bdd07204cef900d7245 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/RelationDomainRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/RelationDomainRestriction.java
@@ -27,12 +27,12 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Represents a domainRestriction tag for RelationExpressions.
* </p>
* <p>
- * $Id: RelationDomainRestriction.java,v 1.4 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author Richard Pöttler
* @version $Revision: 1.4 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*
*/
public class RelationDomainRestriction extends RelationRestriction {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/RelationExpression.java b/src/fr/inrialpes/exmo/align/impl/edoal/RelationExpression.java
index c6382edc04dd6eb32065d31ecdfb5379a76e293a..8ecc8b337b4812ecd3d30604dc92ab2b89518eae 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/RelationExpression.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/RelationExpression.java
@@ -40,7 +40,7 @@ import org.semanticweb.owl.align.Visitable;
*
* $Source:
* /cvsroot/mediation/mappingapi/src/fr.inrialpes.exmo.align.impl.edoal/RelationExpr.java,v $,
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class RelationExpression extends PathExpression implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/RelationRestriction.java b/src/fr/inrialpes/exmo/align/impl/edoal/RelationRestriction.java
index aea2ef71b5056613192eb72261453d7345842cf5..ca12cdfccdb3efc7663fc9a1fe024d15f3998d88 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/RelationRestriction.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/RelationRestriction.java
@@ -40,13 +40,13 @@ import org.semanticweb.owl.align.Visitable;
* Created on 23-Mar-2005 Committed by $Author: poettler_ric $
* </p>
* <p>
- * $Id: RelationCondition.java,v 1.5 2006/11/27 16:39:08 poettler_ric Exp $
+ * $Id$
* </p>
*
*
* @author Richard Pöttler
* @author Francois Scharffe
- * @version $Revision: 1.5 $ $Date$
+ * @version $Revision: 1.5 $ $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public abstract class RelationRestriction extends RelationExpression implements Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/TransfService.java b/src/fr/inrialpes/exmo/align/impl/edoal/TransfService.java
index bf3c8ac487eccdb76d0b9b08de7d7bdc3b55054e..757397d2a2329d5579c60014f6ed2acb82824e78 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/TransfService.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/TransfService.java
@@ -48,12 +48,12 @@ import org.semanticweb.owl.align.Visitable;
* needed for the function to compute the transformaion.
* </p>
* <p>
- * $Id: TransfService.java,v 1.2 2006/12/06 12:54:09 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author richi
* @version $Revision: 1.2 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class TransfService implements Cloneable, Visitable {
/** resource (uri) to the service */
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/Value.java b/src/fr/inrialpes/exmo/align/impl/edoal/Value.java
index 3a2ce50f937d4042857b35b005a57d911bf41fef..11b7c37974e16120cb8dc0722087ca0aeb492146 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/Value.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/Value.java
@@ -27,12 +27,12 @@ package fr.inrialpes.exmo.align.impl.edoal;
* Id to represent a simple valuestring.
* </p>
* <p>
- * $Id: Value.java,v 1.2 2006/10/30 15:24:43 poettler_ric Exp $
+ * $Id$
* </p>
*
* @author richi
* @version $Revision: 1.2 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:05 +0100 (Sun, 07 Mar 2010) $
*/
public class Value { //implements Cloneable, Visitable {
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
index ac3fc5a7d742bce7e4c45d6331222493b8a9b113..7123844b2b564611516fcf2d98a237a0e3bc7ca2 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
@@ -48,7 +48,7 @@ import java.net.URI;
* is thus the expected one.
*
* @author Jerome Euzenat
- * @version $Id: PRecEvaluator.java 968 2009-04-01 13:11:02Z euzenat $
+ * @version $Id$
*/
public class SemPRecEvaluator //extends BasicEvaluator
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
index 847361cd66c3e9619fc4d6fe95aa6c8eb77fcc52..474df9cb5c9af6c9b16db933e635ae8225eeb33c 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
@@ -1,5 +1,5 @@
/*
- * $Id: HTMLRendererVisitor.java 918 2009-02-08 14:30:30Z euzenat $
+ * $Id$
*
* Copyright (C) INRIA, 2006-2010
*
@@ -46,7 +46,7 @@ import fr.inrialpes.exmo.ontowrap.LoadedOntology;
* - add resource chooser
*
* @author Jérôme Euzenat
- * @version $Id: HTMLRendererVisitor.java 918 2009-02-08 14:30:30Z euzenat $
+ * @version $Id$
*/
public class HTMLMetadataRendererVisitor implements AlignmentVisitor
diff --git a/src/fr/inrialpes/exmo/align/parser/RDFParser.java b/src/fr/inrialpes/exmo/align/parser/RDFParser.java
index cb878b149e0b273576f437a72cdd3caa430e02c5..6901efc55088c3aceab30969e450e806df542de1 100644
--- a/src/fr/inrialpes/exmo/align/parser/RDFParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/RDFParser.java
@@ -109,12 +109,12 @@ import com.hp.hpl.jena.vocabulary.RDF;
*
* </p>
* <p>
- * $Id: RDFParser.java,v 1.7 2008/01/26 16:24:58 jeuzenat Exp $
+ * $Id$
* </p>
*
* @author Richard Pöttler
* @version $Revision: 1.7 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:41:03 +0100 (Sun, 07 Mar 2010) $
*/
public class RDFParser {
diff --git a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
index c978bdf90ded7f31476956330e4887c4aa3a712b..ec5703948c80be2c6f34474596f254fecd37d063 100644
--- a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
+++ b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
@@ -36,12 +36,12 @@ import org.semanticweb.owl.align.AlignmentException;
* also the string representations for the different elements defined.
* </p>
* <p>
- * $Id: OmwgElement.java,v 1.6 2008/01/26 16:24:58 jeuzenat Exp $
+ * $Id$
* </p>
*
* @author richi
* @version $Revision: 1.6 $
- * @date $Date$
+ * @date $Date: 2010-03-07 20:40:40 +0100 (Sun, 07 Mar 2010) $
*/
public enum SyntaxElement {
diff --git a/src/fr/inrialpes/exmo/align/parser/XMLParser.java b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
index 3b145126a1a3547a7213f82a95fc48bcda84a5ec..564aa367fc571a8d5bdd08956956395b8228d078 100644
--- a/src/fr/inrialpes/exmo/align/parser/XMLParser.java
+++ b/src/fr/inrialpes/exmo/align/parser/XMLParser.java
@@ -255,7 +255,7 @@ public class XMLParser extends DefaultHandler {
if( namespaceURI.equals( Namespace.ALIGNMENT.uri+"#" )
|| namespaceURI.equals( Namespace.ALIGNMENT.uri ) ) {
if (pName.equals( SyntaxElement.RULE_RELATION.name )) {
- } else if (pName.equals("semantics")) {
+ } else if (pName.equals( SyntaxElement.SEMANTICS.name )) {
} else if (pName.equals( SyntaxElement.MEASURE.name )) {
} else if (pName.equals( SyntaxElement.ENTITY2.name )) {
if(debugMode > 2)
@@ -320,11 +320,11 @@ public class XMLParser extends DefaultHandler {
curronto = onto2;
} else if (pName.equals( SyntaxElement.MAPPING_SOURCE.name )) {
curronto = onto1;
- } else if (pName.equals("uri2")) {
- } else if (pName.equals("uri1")) {
+ } else if (pName.equals("uri2")) { // Legacy
+ } else if (pName.equals("uri1")) { // Legacy
} else if (pName.equals( SyntaxElement.TYPE.name )) {
} else if (pName.equals( SyntaxElement.LEVEL.name )) {
- } else if (pName.equals("xml")) {
+ } else if (pName.equals( SyntaxElement.XML.name )) {
} else if (pName.equals( SyntaxElement.ALIGNMENT.name )) {
alignLevel = parseLevel;
parseLevel = 2; // for embeded (RDF is usually 1)
@@ -407,7 +407,7 @@ public class XMLParser extends DefaultHandler {
relation = content;
} else if (pName.equals( SyntaxElement.MEASURE.name )) {
measure = content;
- } else if (pName.equals("semantics")) {
+ } else if (pName.equals( SyntaxElement.SEMANTICS.name )) {
sem = content;
} else if (pName.equals( SyntaxElement.ENTITY2.name )) {
} else if (pName.equals( SyntaxElement.ENTITY1.name )) {
@@ -431,7 +431,7 @@ public class XMLParser extends DefaultHandler {
if ( sem != null ) cell.setSemantics( sem );
if ( extensions != null ) ((BasicCell)cell).setExtensions( extensions );
} else if (pName.equals( SyntaxElement.MAP.name )) {
- } else if (pName.equals("uri1")) {
+ } else if (pName.equals("uri1")) { // Legacy
if ( onto1.getURI() == null ){//JE: Onto
try {
URI u = new URI( content );
@@ -442,7 +442,7 @@ public class XMLParser extends DefaultHandler {
throw new SAXException("uri1: malformed URI");
}
}
- } else if (pName.equals("uri2")) {
+ } else if (pName.equals("uri2")) { // Legacy
if ( onto2.getURI() == null ){//JE: Onto
try {
URI u = new URI( content );
@@ -478,9 +478,9 @@ public class XMLParser extends DefaultHandler {
} else {
alignment.setLevel( content );
}
- } else if (pName.equals("xml")) {
+ } else if (pName.equals( SyntaxElement.XML.name )) {
//if ( content.equals("no") )
- // { throw new SAXException("Non parseable alignment"); }
+ // { throw new SAXException("Cannot parse non XML alignments"); }
} else if (pName.equals( SyntaxElement.ALIGNMENT.name )) {
parseLevel = alignLevel; // restore level²<
alignLevel = -1;
diff --git a/src/fr/inrialpes/exmo/ontowrap/OntowrapException.java b/src/fr/inrialpes/exmo/ontowrap/OntowrapException.java
index 30d69b152e0d50e8048269c22bb4fba2c153379e..f86b175b0e740dfca4d1541a2ad296ef6c61b5a5 100644
--- a/src/fr/inrialpes/exmo/ontowrap/OntowrapException.java
+++ b/src/fr/inrialpes/exmo/ontowrap/OntowrapException.java
@@ -27,7 +27,7 @@ import java.lang.Exception;
*
*
* @author Jérôme Euzenat
- * @version $Id: OntowrapException.java 670 2008-03-02 00:06:16Z euzenat $
+ * @version $Id$
*/
public class OntowrapException extends Exception {