From cf9963e1f702edb103d77c552b45d8f5623d62d9 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 27 Jul 2011 15:11:35 +0000
Subject: [PATCH] merging changes from 1.3 branch

---
 .../WEB-INF/filegraph/abox/continents.n3      | 11 ++++++++++
 .../WEB-INF/filegraph/abox/us-states.rdf      | 20 +++++++++----------
 .../geopolitical-1.1-individual-labels.rdf    |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 productMods/WEB-INF/filegraph/abox/continents.n3

diff --git a/productMods/WEB-INF/filegraph/abox/continents.n3 b/productMods/WEB-INF/filegraph/abox/continents.n3
new file mode 100644
index 00000000..77c6a955
--- /dev/null
+++ b/productMods/WEB-INF/filegraph/abox/continents.n3
@@ -0,0 +1,11 @@
+@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix core: <http://vivoweb.org/ontology/core#> .
+@prefix geo: <http://aims.fao.org/aos/geopolitical.owl#> .
+
+geo:Africa rdf:type core:Continent .
+geo:Asia rdf:type core:Continent .
+geo:Australia_and_New_Zealand rdf:type core:Continent .
+geo:Europe rdf:type core:Continent .
+geo:South_America rdf:type core:Continent .
+geo:northern_America rdf:type core:Continent .
+geo:Oceania rdf:type core:Continent .
diff --git a/productMods/WEB-INF/filegraph/abox/us-states.rdf b/productMods/WEB-INF/filegraph/abox/us-states.rdf
index 0ec90be5..01252b0d 100644
--- a/productMods/WEB-INF/filegraph/abox/us-states.rdf
+++ b/productMods/WEB-INF/filegraph/abox/us-states.rdf
@@ -117,27 +117,27 @@
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/New_Hampshire">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">New_Hampshire</rdfs:label>
+      <rdfs:label xml:lang="en">New Hampshire</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/New_Jersey">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">New_Jersey</rdfs:label>
+      <rdfs:label xml:lang="en">New Jersey</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/New_Mexico">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">New_Mexico</rdfs:label>
+      <rdfs:label xml:lang="en">New Mexico</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/New_York">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">New_York</rdfs:label>
+      <rdfs:label xml:lang="en">New York</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/North_Carolina">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">North_Carolina</rdfs:label>
+      <rdfs:label xml:lang="en">North Carolina</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/North_Dakota">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">North_Dakota</rdfs:label>
+      <rdfs:label xml:lang="en">North Dakota</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/Ohio">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
@@ -157,15 +157,15 @@
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/Rhode_Island">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">Rhode_Island</rdfs:label>
+      <rdfs:label xml:lang="en">Rhode Island</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/South_Carolina">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">South_Carolina</rdfs:label>
+      <rdfs:label xml:lang="en">South Carolina</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/South_Dakota">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">South_Dakota</rdfs:label>
+      <rdfs:label xml:lang="en">South Dakota</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/Tennessee">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
@@ -193,7 +193,7 @@
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/West_Virginia">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">West_Virginia</rdfs:label>
+      <rdfs:label xml:lang="en">West Virginia</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/Wisconsin">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
diff --git a/productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf b/productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf
index 77afdc07..74ae621b 100644
--- a/productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf
+++ b/productMods/WEB-INF/ontologies/user/abox/geopolitical-1.1-individual-labels.rdf
@@ -852,7 +852,7 @@
     <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Slovakia</rdfs:label>
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#northern_America">
-    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">northern America</rdfs:label>
+    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">North America</rdfs:label>
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#Germany">
     <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Germany</rdfs:label>