From 2036fbae8600658caa0f08a4b5750f67baddba96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Sun, 7 Mar 2010 22:51:10 +0000
Subject: [PATCH] - set keyword expansion

---
 html/neontk/index.html                         |  2 +-
 html/relnotes.html                             |  4 ++--
 html/tutorial/tutorial1/server.html            |  2 +-
 html/tutorial/tutorial3/embed.html             |  2 +-
 .../plugin/neontk/AlignFormLayoutFactory.java  |  2 +-
 .../plugin/neontk/AlignFormSectionFactory.java |  2 +-
 .../exmo/align/plugin/neontk/OnlineDialog.java |  2 +-
 .../exmo/align/plugin/neontk/WSDialog.java     |  2 +-
 plugins/webcontent/build.xml                   |  2 +-
 .../align/impl/edoal/ClassConstruction.java    |  2 +-
 .../exmo/align/impl/edoal/ClassExpression.java |  2 +-
 .../impl/edoal/ClassOccurenceRestriction.java  |  2 +-
 .../align/impl/edoal/ClassRestriction.java     |  4 ++--
 .../align/impl/edoal/ClassTypeRestriction.java |  4 ++--
 .../impl/edoal/ClassValueRestriction.java      |  4 ++--
 .../exmo/align/impl/edoal/EDOALAlignment.java  |  2 +-
 .../exmo/align/impl/edoal/EDOALCell.java       |  4 ++--
 .../exmo/align/impl/edoal/EDOALRelation.java   |  6 +++---
 .../exmo/align/impl/edoal/Expression.java      |  2 +-
 src/fr/inrialpes/exmo/align/impl/edoal/Id.java |  2 +-
 .../align/impl/edoal/InstanceExpression.java   |  2 +-
 .../exmo/align/impl/edoal/PathExpression.java  |  2 +-
 .../align/impl/edoal/PropertyConstruction.java |  2 +-
 .../impl/edoal/PropertyDomainRestriction.java  |  4 ++--
 .../align/impl/edoal/PropertyExpression.java   |  4 ++--
 .../exmo/align/impl/edoal/PropertyId.java      |  4 ++--
 .../align/impl/edoal/PropertyRestriction.java  |  4 ++--
 .../impl/edoal/PropertyTypeRestriction.java    |  4 ++--
 .../impl/edoal/PropertyValueRestriction.java   |  4 ++--
 .../edoal/RelationCoDomainRestriction.java     |  2 +-
 .../align/impl/edoal/RelationConstruction.java |  2 +-
 .../impl/edoal/RelationDomainRestriction.java  |  4 ++--
 .../align/impl/edoal/RelationExpression.java   |  2 +-
 .../align/impl/edoal/RelationRestriction.java  |  4 ++--
 .../exmo/align/impl/edoal/TransfService.java   |  4 ++--
 .../inrialpes/exmo/align/impl/edoal/Value.java |  4 ++--
 .../exmo/align/impl/eval/SemPRecEvaluator.java |  2 +-
 .../renderer/HTMLMetadataRendererVisitor.java  |  4 ++--
 .../inrialpes/exmo/align/parser/RDFParser.java |  4 ++--
 .../exmo/align/parser/SyntaxElement.java       |  4 ++--
 .../inrialpes/exmo/align/parser/XMLParser.java | 18 +++++++++---------
 .../exmo/ontowrap/OntowrapException.java       |  2 +-
 42 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/html/neontk/index.html b/html/neontk/index.html
index 7607a768..b3db4c19 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 91a0db57..a33a5b6f 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&eacute;lite</h2-->
+<!--h2>Version 4.0 (1310): xx/03/2010 - Rouquine carm&eacute;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 5a924353..3245f745 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 8ea6c2c4..9ff98681 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 bd0e4721..7f7bca71 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 06db5193..7cc39efe 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 123df2ab..fd03dadb 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 708bfa1f..a7e03e75 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 586432fc..343717fe 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 29ffd063..50f6048e 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 aa0dbec6..80581715 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 f54915d9..a8221823 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 85c9cefc..c6ce6b45 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 c78f417e..b0608833 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 fafa76c7..1c78feb1 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 05ac35e4..00601408 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 b5a892c1..848e0599 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 c090fb4c..d087cb9c 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 c701ed07..00b371a4 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 7f2c3b20..12c583d4 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 48e56c27..614398fb 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 21a83960..f46e1af7 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 a321a33c..0edc0574 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 d9fac77f..6389c1a4 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 f8a2981f..d282b000 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 540bd944..e6012fc3 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 68d3570e..0c231f96 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 3148abb5..972c655a 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 c7e9f72c..aa34e0e5 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 ee32644b..15cb3b5a 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 a0b6f375..6c7cf10c 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 d107b848..220749ed 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 c6382edc..8ecc8b33 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 aea2ef71..ca12cdfc 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 bf3c8ac4..757397d2 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 3a2ce50f..11b7c379 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 ac3fc5a7..7123844b 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 847361cd..474df9cb 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 cb878b14..6901efc5 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 c978bdf9..ec570394 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 3b145126..564aa367 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 30d69b15..f86b175b 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 {
-- 
GitLab