diff --git a/examples/omwg/wine.xml b/examples/omwg/wine.xml
index a71d16d384b3bccf36ad084e678a8e399b2da6ff..830970a4f16bed399d1e093afc21b79778833e79 100644
--- a/examples/omwg/wine.xml
+++ b/examples/omwg/wine.xml
@@ -6,20 +6,19 @@
<!ENTITY proton "http://proton.semanticweb.org/">
]>
-<!-- JE: NOTE this is not complete with regard to 2.2.10:
- would be good to do it. This is also not correct for the
- relations
--->
-<rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#"
+<!-- JE2010: With the "#" in the end, this is parsed (by the RDF parser...)
+ without it, this is not! -->
+<rdf:RDF xmlns="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#"
xml:base="http://oms.omwg.org/wine-vin/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+ xmlns:align="http://knowledgeweb.semanticweb.org/heterogeneity/alignment#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ex="http://example.org"
xmlns:wine="http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#"
xmlns:vin="http://ontology.deri.org/vin#"
xmlns:proton="http://proton.semanticweb.org/"
- xmlns:omwg="http://www.omwg.org/TR/d7/ontology/alignment/">
+ xmlns:edoal="http://ns.inria.org/edoal/1.0/#">
<Alignment rdf:about="http://oms.omwg.org/wine-vin/">
<xml>yes</xml>
@@ -27,7 +26,7 @@
<dc:date>2006/06/07</dc:date>
<method>manual</method>
<purpose>example</purpose>
- <level>2OMWG</level>
+ <level>2EDOAL</level>
<type>**</type>
<onto1>
<Ontology rdf:about="&wine;">
@@ -43,80 +42,83 @@
<Ontology rdf:about="&vin;">
<location>http://www.scharffe.fr/ontologies/OntologieDuVin.wsml</location>
<formalism>
- <Formalism>
- <uri>http://www.wsmo.org/wsml/wsml-syntax/wsml-dl</uri>
- <name>wsml</name>
- </Formalism>
+ <Formalism align:uri="http://www.wsmo.org/wsml/wsml-syntax/wsml-dl"
+ align:name="wsml" />
</formalism>
</Ontology>
</onto2>
<map>
- <Cell rdf:about="MappingRule_0">
-
- <entity1><omwg:Class rdf:about="&wine;VintageYear"/></entity1>
- <entity2><omwg:Class rdf:about="&vin;Millesime"/></entity2>
+ <Cell rdf:about="MappingRule_0">
+ <entity1><edoal:Class rdf:about="&wine;VintageYear"/></entity1>
+ <entity2><edoal:Class rdf:about="&vin;Millesime"/></entity2>
<measure rdf:datatype="&xsd;float">1.0</measure>
<relation>Equivalence</relation>
- </Cell>
- </map>
- <map>
- <Cell rdf:about="MappingRule_1">
- <entity1><omwg:Attribute rdf:about="&wine;yearValue"/></entity1>
- <entity2><omwg:Attribute rdf:about="&vin;anneeMillesime"/></entity2>
+ </Cell>
+ </map>
+ <map>
+ <Cell rdf:about="MappingRule_1">
+ <entity1><edoal:Property rdf:about="&wine;yearValue"/></entity1>
+ <entity2><edoal:Property rdf:about="&vin;anneeMillesime"/></entity2>
<measure rdf:datatype="&xsd;float">1.0</measure>
<relation>Equivalence</relation>
- </Cell>
- </map>
- <map>
- <Cell rdf:about="MappingRule_2">
- <entity1><omwg:Relation rdf:about="&wine;locatedIn"/></entity1>
- <entity2><omwg:Relation rdf:about="&vin;hasTerroir"/></entity2>
+ </Cell>
+ </map>
+ <map>
+ <Cell rdf:about="MappingRule_2">
+ <entity1><edoal:Relation rdf:about="&wine;locatedIn"/></entity1>
+ <entity2><edoal:Relation rdf:about="&vin;hasTerroir"/></entity2>
<measure rdf:datatype="&xsd;float">1.0</measure>
<relation>SubsumedBy</relation>
- </Cell>
+ </Cell>
</map>
- <!--map>
- <Cell rdf:about="MappingRule_3">
- <entity1><omwg:Class rdf:about="&wine;Bordeaux"/></entity1>
+ <map>
+ <Cell rdf:about="MappingRule_3">
+ <entity1><edoal:Class rdf:about="&wine;Bordeaux"/></entity1>
<entity2>
- <omwg:Class rdf:about="&vin;Vin">
- <omwg:attributeValueCondition>
- <omwg:Restriction>
- <omwg:onProperty>
- <omwg:Path>
- <omwg:first><omwg:Relation rdf:about="&vin;hasTerroir"/></omwg:first>
- <omwg:next><omwg:Relation rdf:about="&proton;locatedIn"/></omwg:next>
- </omwg:Path>
- </omwg:onProperty>
- <omwg:comparator rdf:resource="&xsd;equals"/>
- <omwg:value>loc:Aquitaine</omwg:value>
- </omwg:Restriction>
- </omwg:attributeValueCondition>
- </omwg:Class>
+ <edoal:Class>
+ <edoal:and rdf:parseType="Collection">
+ <edoal:Class rdf:about="&vin;Vin"/>
+ <edoal:PropertyValueRestriction>
+ <edoal:onProperty>
+ <edoal:Relation>
+ <edoal:compose rdf:parseType="Collection">
+ <edoal:Relation rdf:about="&vin;hasTerroir"/>
+ <edoal:Relation rdf:about="&proton;locatedIn"/>
+ </edoal:compose>
+ </edoal:Relation>
+ </edoal:onProperty>
+ <edoal:comparator rdf:resource="&xsd;equals"/>
+ <!--edoal:value>loc:Aquitaine</edoal:value-->
+ <edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
+ </edoal:PropertyValueRestriction>
+ </edoal:and>
+ </edoal:Class>
</entity2>
<measure rdf:datatype='&xsd;float'>1.</measure>
<relation>SubsumedBy</relation>
- </Cell>
- </map-->
+ </Cell>
+ </map>
<map>
- <Cell rdf:about="MappingRule_4">
+ <Cell rdf:about="MappingRule_4">
<entity1>
- <omwg:Class>
- <omwg:or>
- <omwg:Collection>
- <omwg:item><omwg:Class rdf:about="&vin;Acidite"/></omwg:item>
- <omwg:item><omwg:Class rdf:about="&vin;Astreingence"/></omwg:item>
- <omwg:item><omwg:Class rdf:about="&vin;Amertume"/></omwg:item>
- </omwg:Collection>
- </omwg:or>
- </omwg:Class>
+ <edoal:Class>
+ <edoal:or rdf:parseType="Collection">
+ <edoal:Class rdf:about="&vin;Acidite"/>
+ <edoal:Class rdf:about="&vin;Astreingence"/>
+ <edoal:Class rdf:about="&vin;Amertume"/>
+ </edoal:or>
+ </edoal:Class>
</entity1>
<entity2>
- <omwg:Class rdf:about="&wine;WineFlavor"/>
+ <edoal:Class>
+ <edoal:not>
+ <edoal:Class rdf:about="&wine;WineFlavor"/>
+ </edoal:not>
+ </edoal:Class>
</entity2>
<measure rdf:datatype='&xsd;float'>1.</measure>
<relation>SubsumedBy</relation>
- </Cell>
+ </Cell>
</map>
</Alignment>
</rdf:RDF>