diff --git a/src/fr/inrialpes/exmo/align/impl/Namespace.java b/src/fr/inrialpes/exmo/align/impl/Namespace.java
index ff64d0624a899d881110d2dc78f56ee8b92302cc..ff64993407a1c9088e0dc95c85f0a086b416d71a 100644
--- a/src/fr/inrialpes/exmo/align/impl/Namespace.java
+++ b/src/fr/inrialpes/exmo/align/impl/Namespace.java
@@ -41,14 +41,11 @@ public enum Namespace {
EDOAL("http://ns.inria.org/edoal/1.0/", "edoal", true),
DUBLIN_CORE("http://purl.org/dc/elements/1.1/", "dc", false),
RDF_SCHEMA("http://www.w3.org/2000/01/rdf-schema#", "rdfs", false),
- SOAP_ENV("http://schemas.xmlsoap.org/soap/envelope/", "soapenv", false),
- XSD("http://www.w3.org/2001/XMLSchema#", "xsd", false),
- RDF("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "rdf", false);
- //WSML_CORE("http://www.wsmo.org/wsml/wsml-syntax/wsml-core", "wsml", true),
- //WSML_FLIGHT("http://www.wsmo.org/wsml/wsml-syntax/wsml-flight", "wsml", true),
- //WSML_RULE("http://www.wsmo.org/wsml/wsml-syntax/wsml-rule", "wsml", true),
- //WSML_DL("http://www.wsmo.org/wsml/wsml-syntax/wsml-dl", "wsml", true),
- //WSML_FULL("http://www.wsmo.org/wsml/wsml-syntax/wsml-full", "wsml", true);
+ SOAP_ENV("http://schemas.xmlsoap.org/soap/envelope/", "SOAP-ENV", false),
+ XSD("http://www.w3.org/2001/XMLSchema", "xsd", true),
+ XSI("http://www.w3.org/1999/XMLSchema-instance", "xsi", false),
+ RDF("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "rdf", false),
+ ATLMAP("http://www.atl.external.lmco.com/projects/ontology/ResultsOntology.n3#", "map", false);
public final String uri;
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/Comparator.java b/src/fr/inrialpes/exmo/align/impl/edoal/Comparator.java
index 6319eaeee4fc24d45aab2d14eddbb40c6083b2ab..745a4062e713ce5964056c60b99a7b55e345c44c 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/Comparator.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/Comparator.java
@@ -23,15 +23,17 @@ package fr.inrialpes.exmo.align.impl.edoal;
import java.net.URI;
import java.net.URISyntaxException;
+import fr.inrialpes.exmo.align.impl.Namespace;
+
public class Comparator {
URI uri = null;
// This replaces the Comparator class
// SHOULD CERTAINLY BE AN ENUM
- public static Comparator EQUAL = initComparator( "http://www.w3.org/2001/XMLSchema#equals", 0 );
- public static Comparator LOWER = initComparator( "http://www.w3.org/2001/XMLSchema#lower-than", -1 );
- public static Comparator GREATER = initComparator( "http://www.w3.org/2001/XMLSchema#greater-than", 1 );
+ public static Comparator EQUAL = initComparator( Namespace.XSD.prefix+"equals", 0 );
+ public static Comparator LOWER = initComparator( Namespace.XSD.prefix+"lower-than", -1 );
+ public static Comparator GREATER = initComparator( Namespace.XSD.prefix+"greater-than", 1 );
protected Comparator() {
super();
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
index 3c3c5ed5adb8f882379332a8f51ef2f1d7f47090..62a420903bbd541c612ed5c7e413b6d70b266e7a 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
@@ -24,6 +24,8 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
+import fr.inrialpes.exmo.align.parser.SyntaxElement;
+import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.ontowrap.HeavyLoadedOntology;
@@ -281,26 +283,26 @@ public class ExtPREvaluator extends BasicEvaluator {
*/
public void write(PrintWriter writer) throws java.io.IOException {
writer.println("<?xml version='1.0' encoding='utf-8' standalone='yes'?>");
- writer.println("<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'\n xmlns:map='http://www.atl.external.lmco.com/projects/ontology/ResultsOntology.n3#'>");
- writer.println(" <map:output rdf:about=''>");
+ writer.println("<"+SyntaxElement.RDF.print()+" xmlns:"+Namespace.RDF.shortCut+"='"+Namespace.RDF.prefix+"'\n xmlns:"+Namespace.ATLMAP.shortCut+"='"+Namespace.ATLMAP.prefix+"'>");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":output "+SyntaxElement.RDF_ABOUT.print()+"=''>");
//if ( ) {
- // writer.println(" <map:algorithm rdf:resource=\"http://co4.inrialpes.fr/align/algo/"+align1.get+"\">");
+ // writer.println(" <"+Namespace.ATLMAP.shortCut+":algorithm "+SyntaxElement.RDF_RESOURCE.print()+"=\"http://co4.inrialpes.fr/align/algo/"+align1.get+"\">");
//}
- writer.println(" <map:input1 rdf:resource=\""+((ObjectAlignment)align1).getOntologyObject1().getURI()+"\">");
- writer.println(" <map:input2 rdf:resource=\""+((ObjectAlignment)align1).getOntologyObject2().getURI()+"\">");
- writer.print(" <map:symmetricprecision>");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":input1 "+SyntaxElement.RDF_RESOURCE.print()+"=\""+((ObjectAlignment)align1).getOntologyObject1().getURI()+"\">");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":input2 "+SyntaxElement.RDF_RESOURCE.print()+"=\""+((ObjectAlignment)align1).getOntologyObject2().getURI()+"\">");
+ writer.print(" <"+Namespace.ATLMAP.shortCut+":symmetricprecision>");
writer.print(symprec);
- writer.print("</map:symmetricprecision>\n <map:symmetricrecall>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":symmetricprecision>\n <"+Namespace.ATLMAP.shortCut+":symmetricrecall>");
writer.print(symrec);
- writer.print("</map:symmetricrecall>\n <map:effortbasedprecision>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":symmetricrecall>\n <"+Namespace.ATLMAP.shortCut+":effortbasedprecision>");
writer.print(effprec);
- writer.print("</map:effortbasedprecision>\n <map:effortbasedrecall>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":effortbasedprecision>\n <"+Namespace.ATLMAP.shortCut+":effortbasedrecall>");
writer.print(effrec);
- writer.print("</map:effortbasedrecall>\n <map:orientedprecision>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":effortbasedrecall>\n <"+Namespace.ATLMAP.shortCut+":orientedprecision>");
writer.print(orientprec);
- writer.print("</map:orientedprecision>\n <map:orientedrecall>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":orientedprecision>\n <"+Namespace.ATLMAP.shortCut+":orientedrecall>");
writer.print(orientrec);
- writer.print("</map:orientedrecall>\n </map:output>\n</rdf:RDF>\n");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":orientedrecall>\n </"+Namespace.ATLMAP.shortCut+":output>\n</"+SyntaxElement.RDF.print()+">\n");
}
}
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
index 62c134dd1ca4e9ceaa7687e575a4e88b86c25e29..646cfbcf5ce9444c5f592f2c0aab68ab56d413f5 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
@@ -25,6 +25,9 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
+import fr.inrialpes.exmo.align.impl.Namespace;
+import fr.inrialpes.exmo.align.parser.SyntaxElement;
+
import java.util.Enumeration;
import java.util.Properties;
import java.util.Iterator;
@@ -160,8 +163,8 @@ public class PRGraphEvaluator extends GraphEvaluator {
*/
public void write(PrintWriter writer) throws java.io.IOException {
writer.println("<?xml version='1.0' encoding='utf-8' standalone='yes'?>");
- writer.println("<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>");
- writer.println(" <output rdf:about=''>");
+ writer.println("<"+SyntaxElement.RDF.print()+" xmlns:"+Namespace.RDF.shortCut+"='"+Namespace.RDF.prefix+"'>");
+ writer.println(" <output "+SyntaxElement.RDF_ABOUT.print()+"=''>");
for( int i=0; i <= STEP; i++ ){
writer.print(" <step>\n <recall>");
writer.print((double)i/STEP);
@@ -170,7 +173,7 @@ public class PRGraphEvaluator extends GraphEvaluator {
writer.print("</precision>\n </step>\n");
}
writer.print(" <MAP>"+map+"</MAP>\n");
- writer.print(" </output>\n</rdf:RDF>\n");
+ writer.print(" </output>\n</"+SyntaxElement.RDF.print()+">\n");
}
/* Write out the final interpolated recall/precision graph data.
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
index b3d473114bd9c29cabef3bc5912439203db618b9..ce5c131f5b69748b07fe4354cbf4d8e0cef79cc1 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
@@ -25,10 +25,11 @@ import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Evaluator;
+import fr.inrialpes.exmo.align.parser.SyntaxElement;
+import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.Annotations;
-import fr.inrialpes.exmo.align.impl.Namespace;
import java.util.Enumeration;
import java.util.Properties;
@@ -148,25 +149,25 @@ public class PRecEvaluator extends BasicEvaluator implements Evaluator {
public String HTMLString (){
String result = "";
- result += " <div xmlns:map='http://www.atl.external.lmco.com/projects/ontology/ResultsOntology.n3#' typeof=\"map:output\" href=''>";
+ result += " <div xmlns:"+Namespace.ATLMAP.shortCut+"='"+Namespace.ATLMAP.prefix+"' typeof=\""+Namespace.ATLMAP.shortCut+":output\" href=''>";
result += " <dl>";
//if ( ) {
- // result += " <dt>algorithm</dt><dd property=\"map:algorithm\">"+align1.get+"</dd>";
+ // result += " <dt>algorithm</dt><dd property=\""+Namespace.ATLMAP.shortCut+":algorithm\">"+align1.get+"</dd>";
//}
try {
- result += " <dt>input1</dt><dd rel=\"map:input1\" href=\""+align1.getOntology1URI()+"\">"+align1.getOntology1URI()+"</dd>";
- result += " <dt>input2</dt><dd rel=\"map:input2\" href=\""+align1.getOntology2URI()+"\">"+align1.getOntology2URI()+"</dd>";
+ result += " <dt>input1</dt><dd rel=\""+Namespace.ATLMAP.shortCut+":input1\" href=\""+align1.getOntology1URI()+"\">"+align1.getOntology1URI()+"</dd>";
+ result += " <dt>input2</dt><dd rel=\""+Namespace.ATLMAP.shortCut+":input2\" href=\""+align1.getOntology2URI()+"\">"+align1.getOntology2URI()+"</dd>";
} catch (AlignmentException e) { e.printStackTrace(); };
// Other missing items (easy to get)
- // result += " <map:falseNegative>");
- // result += " <map:falsePositive>");
- result += " <dt>precision</dt><dd property=\"map:precision\">"+precision+"</dd>\n";
- result += " <dt>recall</dt><dd property=\"map:recall\">"+recall+"</dd>\n";
- result += " <dt>fallout</dt><dd property=\"map:fallout\">"+fallout+"</dd>\n";
- result += " <dt>F-measure</dt><dd property=\"map:fMeasure\">"+fmeasure+"</dd>\n";
- result += " <dt>O-measure</dt><dd property=\"map:oMeasure\">"+overall+"</dd>\n";
- if ( time != 0 ) result += " <dt>time</dt><dd property=\"map:time\">"+time+"</dd>\n";
- result += " <dt>result</dt><dd property=\"map:result\">"+result+"</dd>\n";
+ // result += " <"+Namespace.ATLMAP.shortCut+":falseNegative>");
+ // result += " <"+Namespace.ATLMAP.shortCut+":falsePositive>");
+ result += " <dt>precision</dt><dd property=\""+Namespace.ATLMAP.shortCut+":precision\">"+precision+"</dd>\n";
+ result += " <dt>recall</dt><dd property=\""+Namespace.ATLMAP.shortCut+":recall\">"+recall+"</dd>\n";
+ result += " <dt>fallout</dt><dd property=\""+Namespace.ATLMAP.shortCut+":fallout\">"+fallout+"</dd>\n";
+ result += " <dt>F-measure</dt><dd property=\""+Namespace.ATLMAP.shortCut+":fMeasure\">"+fmeasure+"</dd>\n";
+ result += " <dt>O-measure</dt><dd property=\""+Namespace.ATLMAP.shortCut+":oMeasure\">"+overall+"</dd>\n";
+ if ( time != 0 ) result += " <dt>time</dt><dd property=\""+Namespace.ATLMAP.shortCut+":time\">"+time+"</dd>\n";
+ result += " <dt>result</dt><dd property=\""+Namespace.ATLMAP.shortCut+":result\">"+result+"</dd>\n";
result += " </dl>\n </div>\n";
return result;
}
@@ -176,32 +177,32 @@ return result;
*/
public void write(PrintWriter writer) throws java.io.IOException {
writer.println("<?xml version='1.0' encoding='utf-8' standalone='yes'?>");
- writer.println("<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'\n xmlns:map='http://www.atl.external.lmco.com/projects/ontology/ResultsOntology.n3#'>");
- writer.println(" <map:output rdf:about=''>");
+ writer.println("<"+SyntaxElement.RDF.print()+" xmlns:"+Namespace.RDF.shortCut+"='"+Namespace.RDF.prefix+"'\n xmlns:"+Namespace.ATLMAP.shortCut+"='"+Namespace.ATLMAP.prefix+"'>");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":output "+SyntaxElement.RDF_ABOUT.print()+"=''>");
//if ( ) {
- // writer.println(" <map:algorithm rdf:resource=\"http://co4.inrialpes.fr/align/algo/"+align1.get+"\">");
+ // writer.println(" <"+Namespace.ATLMAP.shortCut+":algorithm "+SyntaxElement.RDF_RESOURCE.print()+"=\"http://co4.inrialpes.fr/align/algo/"+align1.get+"\">");
//}
try {
- writer.println(" <map:input1 rdf:resource=\""+align1.getOntology1URI()+"\"/>");
- writer.println(" <map:input2 rdf:resource=\""+align1.getOntology2URI()+"\"/>");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":input1 "+SyntaxElement.RDF_RESOURCE.print()+"=\""+align1.getOntology1URI()+"\"/>");
+ writer.println(" <"+Namespace.ATLMAP.shortCut+":input2 "+SyntaxElement.RDF_RESOURCE.print()+"=\""+align1.getOntology2URI()+"\"/>");
} catch (AlignmentException e) { e.printStackTrace(); };
// Other missing items (easy to get)
- // writer.println(" <map:falseNegative>");
- // writer.println(" <map:falsePositive>");
- writer.print(" <map:precision>");
+ // writer.println(" <"+Namespace.ATLMAP.shortCut+":falseNegative>");
+ // writer.println(" <"+Namespace.ATLMAP.shortCut+":falsePositive>");
+ writer.print(" <"+Namespace.ATLMAP.shortCut+":precision>");
writer.print(precision);
- writer.print("</map:precision>\n <map:recall>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":precision>\n <"+Namespace.ATLMAP.shortCut+":recall>");
writer.print(recall);
- writer.print("</map:recall>\n <fallout>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":recall>\n <fallout>");
writer.print(fallout);
- writer.print("</fallout>\n <map:fMeasure>");
+ writer.print("</fallout>\n <"+Namespace.ATLMAP.shortCut+":fMeasure>");
writer.print(fmeasure);
- writer.print("</map:fMeasure>\n <map:oMeasure>");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":fMeasure>\n <"+Namespace.ATLMAP.shortCut+":oMeasure>");
writer.print(overall);
- writer.print("</map:oMeasure>\n");
+ writer.print("</"+Namespace.ATLMAP.shortCut+":oMeasure>\n");
if ( time != 0 ) writer.print(" <time>"+time+"</time>\n");
writer.print(" <result>"+result);
- writer.print("</result>\n </map:output>\n</rdf:RDF>\n");
+ writer.print("</result>\n </"+Namespace.ATLMAP.shortCut+":output>\n</"+SyntaxElement.RDF.print()+">\n");
}
public double getPrecision() { return precision; }
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
index ee3a085518aa8dbad126f84b9098e0e6b9ec26f1..aacf667ac4cfb9e4c9726b8725e69a88cbd0b6f8 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
@@ -25,6 +25,9 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
+import fr.inrialpes.exmo.align.impl.Namespace;
+import fr.inrialpes.exmo.align.parser.SyntaxElement;
+
import java.util.Enumeration;
import java.util.Properties;
import java.util.Iterator;
@@ -123,11 +126,11 @@ public class ROCCurveEvaluator extends GraphEvaluator {
*/
public void write(PrintWriter writer) throws java.io.IOException {
writer.println("<?xml version='1.0' encoding='utf-8' standalone='yes'?>");
- writer.println("<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>");
+ writer.println("<"+SyntaxElement.RDF.print()+" xmlns:"+Namespace.RDF.shortCut+"='"+Namespace.RDF.prefix+"'>");
writer.println(" <output rdf:about=''>");
writeXMLMap( writer );
writer.print(" <AUC>"+auc+"</AUC>\n");
- writer.print(" </output>\n</rdf:RDF>\n");
+ writer.print(" </output>\n</"+SyntaxElement.RDF.print()+">\n");
}
public void writePlot(PrintWriter writer) {
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
index 6c4c62011b1086ba42e6e21315959523d83e20ac..97324d9eedf420d88955ecbb7d4ee92ce8eb049b 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
@@ -24,6 +24,8 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
+import fr.inrialpes.exmo.align.parser.SyntaxElement;
+import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
@@ -107,7 +109,7 @@ public class SymMeanEvaluator extends BasicEvaluator {
}
public void write( PrintWriter writer ) throws java.io.IOException {
- writer.print("<rdf:RDF>\n <Evaluation class=\"SymMeanEvaluator\">\n <class>");
+ writer.print("<"+SyntaxElement.RDF.print()+">\n <Evaluation class=\"SymMeanEvaluator\">\n <class>");
writer.print(classScore);
writer.print("</class>\n <properties>");
writer.print(propScore);
@@ -115,7 +117,7 @@ public class SymMeanEvaluator extends BasicEvaluator {
writer.print(indScore);
writer.print("</individuals>\n <result>");
writer.print(result);
- writer.print("</result>\n </Evaluation>\n</rdf:RDF>\n");
+ writer.print("</result>\n </Evaluation>\n</"+SyntaxElement.RDF.print()+">\n");
}
}
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
index 2144b987524966bdcad219a01cadcbc47ac0f2ff..d82552c341a9cf8f289cfc77d4cdc4e55ffbd6b2 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
@@ -40,7 +40,6 @@ import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.Extensions;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.ObjectCell;
-import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.Ontology; //?
@@ -180,7 +179,7 @@ public class RDFRendererVisitor implements AlignmentVisitor {
writer.print("<?xml version='1.0' encoding='utf-8");
writer.print("' standalone='no'?>"+NL);
}
- writer.print("<rdf:RDF xmlns='"+Namespace.ALIGNMENT.prefix+"'");
+ writer.print("<"+SyntaxElement.RDF.print(DEF)+" xmlns='"+Namespace.ALIGNMENT.prefix+"'");
//writer.print(NL+" xml:base='"+Namespace.ALIGNMENT.uri+"'");
for ( Enumeration e = nslist.keys() ; e.hasMoreElements(); ) {
String k = (String)e.nextElement();
@@ -198,7 +197,7 @@ public class RDFRendererVisitor implements AlignmentVisitor {
indentedOutput("<"+SyntaxElement.ALIGNMENT.print(DEF));
String idext = align.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID );
if ( idext != null ) {
- writer.print(" rdf:about=\""+idext+"\"");
+ writer.print(" "+SyntaxElement.RDF_ABOUT.print(DEF)+"=\""+idext+"\"");
}
writer.print(">"+NL);
increaseIndent();
@@ -227,11 +226,11 @@ public class RDFRendererVisitor implements AlignmentVisitor {
for( Cell c : align ){ c.accept( this ); };
decreaseIndent();
indentedOutputln("</"+SyntaxElement.ALIGNMENT.print(DEF)+">");
- writer.print("</rdf:RDF>"+NL);
+ writer.print("</"+SyntaxElement.RDF.print(DEF)+">"+NL);
}
private void printBasicOntology ( URI u, URI f ) {
- indentedOutput("<"+SyntaxElement.ONTOLOGY.print(DEF)+" rdf:about=\""+u+"\">"+NL);
+ indentedOutput("<"+SyntaxElement.ONTOLOGY.print(DEF)+" "+SyntaxElement.RDF_ABOUT.print(DEF)+"=\""+u+"\">"+NL);
increaseIndent();
if ( f != null ) {
indentedOutputln("<"+SyntaxElement.LOCATION.print(DEF)+">"+f+"</"+SyntaxElement.LOCATION.print(DEF)+">");
@@ -245,7 +244,7 @@ public class RDFRendererVisitor implements AlignmentVisitor {
public void printOntology( Ontology onto ) {
URI u = onto.getURI();
URI f = onto.getFile();
- indentedOutput("<"+SyntaxElement.ONTOLOGY.print(DEF)+" rdf:about=\""+u+"\">"+NL);
+ indentedOutput("<"+SyntaxElement.ONTOLOGY.print(DEF)+" "+SyntaxElement.RDF_ABOUT.print(DEF)+"=\""+u+"\">"+NL);
increaseIndent();
if ( f != null ) {
indentedOutputln("<"+SyntaxElement.LOCATION.print(DEF)+">"+f+"</"+SyntaxElement.LOCATION.print(DEF)+">");
@@ -276,7 +275,7 @@ public class RDFRendererVisitor implements AlignmentVisitor {
increaseIndent();
indentedOutput("<"+SyntaxElement.CELL.print(DEF));
if ( cell.getId() != null && !cell.getId().equals("") ){
- writer.print(" rdf:about=\""+cell.getId()+"\"");
+ writer.print(" "+SyntaxElement.RDF_ABOUT.print(DEF)+"=\""+cell.getId()+"\"");
}
writer.print(">"+NL);
// Would be better to put it more generic
@@ -296,13 +295,13 @@ public class RDFRendererVisitor implements AlignmentVisitor {
writer.print(NL);
indentedOutputln("</"+SyntaxElement.ENTITY2.print(DEF)+">");
} else {
- indentedOutputln("<"+SyntaxElement.ENTITY1.print(DEF)+" rdf:resource='"+u1.toString()+"'/>");
- indentedOutputln("<"+SyntaxElement.ENTITY2.print(DEF)+" rdf:resource='"+u2.toString()+"'/>");
+ indentedOutputln("<"+SyntaxElement.ENTITY1.print(DEF)+" "+SyntaxElement.RDF_RESOURCE.print(DEF)+"='"+u1.toString()+"'/>");
+ indentedOutputln("<"+SyntaxElement.ENTITY2.print(DEF)+" "+SyntaxElement.RDF_RESOURCE.print(DEF)+"='"+u2.toString()+"'/>");
}
indentedOutput("<"+SyntaxElement.RULE_RELATION.print(DEF)+">");
cell.getRelation().accept( this );
writer.print("</"+SyntaxElement.RULE_RELATION.print(DEF)+">"+NL);
- indentedOutputln("<"+SyntaxElement.MEASURE.print(DEF)+" rdf:datatype='http://www.w3.org/2001/XMLSchema#float'>"+cell.getStrength()+"</"+SyntaxElement.MEASURE.print(DEF)+">");
+ indentedOutputln("<"+SyntaxElement.MEASURE.print(DEF)+" "+SyntaxElement.RDF_DATATYPE.print(DEF)+"='"+Namespace.XSD.getUriPrefix()+"float'>"+cell.getStrength()+"</"+SyntaxElement.MEASURE.print(DEF)+">");
if ( cell.getSemantics() != null &&
!cell.getSemantics().equals("") &&
!cell.getSemantics().equals("first-order") )
diff --git a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
index ec5703948c80be2c6f34474596f254fecd37d063..b72ccb248716a8cbcf48a551e62f4b80586beec6 100644
--- a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
+++ b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
@@ -48,6 +48,7 @@ public enum SyntaxElement {
// RDF NAMESPACE
RDF( Namespace.RDF, "RDF", true), // This is not a resource, nor a property
+ RDF_ID( Namespace.RDF, "ID"),
RDF_ABOUT( Namespace.RDF, "about"),
RDF_DATATYPE( Namespace.RDF, "datatype"),
RDF_PARSETYPE( Namespace.RDF, "parseType"),
diff --git a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
index f9d816db628fc8e3e34ffa2efa3e721dea65d46f..322006db8323a6129c39f74212efc0c5047f2bb5 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
@@ -391,7 +391,14 @@ public class WSAServProfile implements AlignmentServiceProfile {
if ( restful ) {
return msg;
} else {
- return "<SOAP-ENV:Envelope\n xmlns='http://exmo.inrialpes.fr/align/service'\n xml:base='http://exmo.inrialpes.fr/align/service'\n xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'\n xmlns:xsi='http://www.w3.org/1999/XMLSchema-instance'\n xmlns:xsd='http://www.w3.org/1999/XMLSchema'>\n <SOAP-ENV:Body>\n"+msg+" </SOAP-ENV:Body>\n</SOAP-ENV:Envelope>\n";
+ return "<"+Namespace.SOAP_ENV.shortCut+":Envelope\n" +
+ " xmlns='"+Namespace.ALIGNSVC.prefix+"'\n" +
+ " xml:base='"+Namespace.ALIGNSVC.prefix+"'\n" +
+ " xmlns:"+Namespace.SOAP_ENV.shortCut+"='"+Namespace.SOAP_ENV.prefix+"'\n" +
+ " xmlns:"+Namespace.XSI.shortCut+"='"+Namespace.XSI.prefix+"'\n" +
+ " xmlns:"+Namespace.XSD.shortCut+"='"+Namespace.XSD.uri+"'>\n" +
+ " <"+Namespace.SOAP_ENV.shortCut+":Body>\n"+msg+" </"+Namespace.SOAP_ENV.shortCut+":Body>\n" +
+ "</"+Namespace.SOAP_ENV.shortCut+":Envelope>\n";
}
}
diff --git a/src/fr/inrialpes/exmo/align/service/WSAlignment.java b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
index f3c1a59e7a99fbecab3d3641dca7e8a147398a67..787f628b03aae02f0ffdd857166da1f98dce357a 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAlignment.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
@@ -96,10 +96,13 @@ public class WSAlignment extends URIAlignment implements AlignmentProcess {
} catch (IOException ioex) {
throw new AlignmentException("Malformed service address");
}
- String message = "<SOAP-ENV:Envelope\n xmlns='http://exmo.inrialpes.fr/align/service'\n xml:base='http://exmo.inrialpes.fr/align/service'\n xmlns:SOAP-ENV=\'http://schemas.xmlsoap.org/soap/envelope/\'\n " +
- "xmlns:xsi=\'http://www.w3.org/1999/XMLSchema-instance\'\n " +
- "xmlns:xsd=\'http://www.w3.org/1999/XMLSchema\'>\n" +
- " <SOAP-ENV:Body>\n";
+ String message = "<"+Namespace.SOAP_ENV.shortCut+":Envelope\n" +
+ " xmlns='"+Namespace.ALIGNSVC.prefix+"'\n" +
+ " xml:base='"+Namespace.ALIGNSVC.prefix+"'\n" +
+ " xmlns:"+Namespace.SOAP_ENV.shortCut+"='"+Namespace.SOAP_ENV.prefix+"'\n" +
+ " xmlns:"+Namespace.XSI.shortCut+"='"+Namespace.XSI.prefix+"'\n" +
+ " xmlns:"+Namespace.XSD.shortCut+"='"+Namespace.XSD.uri+"'>\n" +
+ " <"+Namespace.SOAP_ENV.shortCut+":Body>\n";
// URI encoding
String uri1 = ((URI)getOntology1()).toString();
String uri2 = ((URI)getOntology2()).toString();
@@ -114,7 +117,8 @@ public class WSAlignment extends URIAlignment implements AlignmentProcess {
message += " <param name=\""+k+"\">"+params.getProperty(k)+"</param>\n";
}
- message += " </SOAP-ENV:Body>\n</SOAP-ENV:Envelope>\n";
+ message += " </"+Namespace.SOAP_ENV.shortCut+":Body>\n"+
+ "</"+Namespace.SOAP_ENV.shortCut+":Envelope>\n";
byte[] byteMess = message.getBytes();
//System.err.println("SOAP for sending=" + message);