Author: ito
Date: Mon Jan 18 13:29:55 2010
New Revision: 900392
URL: http://svn.apache.org/viewvc?rev=900392&view=rev
Log:
CLEREZZA-72: property languages added to platform.rdf and remove from
language.rdf
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/ontologies/language.rdf
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java?rev=900392&r1=900391&r2=900392&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
Mon Jan 18 13:29:55 2010
@@ -32,7 +32,6 @@
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.config.SystemConfig;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.platform.language.ontologies.LANGUAGE;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Graph;
import org.osgi.service.component.ComponentContext;
@@ -179,12 +178,12 @@
private NonLiteral getListNode() {
Iterator<Triple> langListIter =
systemGraph.filter(PLATFORM.Instance,
- LANGUAGE.languages, null);
+ PLATFORM.languages, null);
if (langListIter.hasNext()) {
return (NonLiteral) langListIter.next().getObject();
}
BNode listNode = new BNode();
- systemGraph.add(new TripleImpl(PLATFORM.Instance,
LANGUAGE.languages,
+ systemGraph.add(new TripleImpl(PLATFORM.Instance,
PLATFORM.languages,
listNode));
return listNode;
}
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java?rev=900392&r1=900391&r2=900392&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
Mon Jan 18 13:29:55 2010
@@ -104,7 +104,7 @@
node.addProperty(PLATFORM.instance, instance);
node.getGraph().add(new TripleImpl(instance, RDF.type,
PLATFORM.Instance));
BNode lang = getLanguagesList(node.getGraph());
- node.getGraph().add(new TripleImpl(instance,
LANGUAGE.languages, lang));
+ node.getGraph().add(new TripleImpl(instance,
PLATFORM.languages, lang));
node = new GraphNode(node.getNode(), new
UnionMGraph(node.getGraph(),
cgProvider.getContentGraph()));
return node;
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/ontologies/language.rdf
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/ontologies/language.rdf?rev=900392&r1=900391&r2=900392&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/ontologies/language.rdf
(original)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/ontologies/language.rdf
Mon Jan 18 13:29:55 2010
@@ -27,18 +27,5 @@
<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2010/01/language#"/>
</rdfs:Class>
-<!-- Properties -->
-
-<rdf:Property rdf:about="http://clerezza.org/2010/01/language#languages";>
- <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"; />
- <rdfs:label xml:lang="en">languages</rdfs:label>
- <skos:definition xml:lang="en">Points to a rdf list containing the
languages
- supported by a subject. The first langague in the list is
- the default language.
- </skos:definition>
- <rdfs:isDefinedBy rdf:resource="http://clerezza.org/2010/01/language#";
/>
- <rdfs:range
rdf:resource="http://clerezza.org/2010/01/language#LanguageList"/>
-</rdf:Property>
-
</rdf:RDF>
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf?rev=900392&r1=900391&r2=900392&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
(original)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
Mon Jan 18 13:29:55 2010
@@ -66,8 +66,7 @@
the default language.
</skos:definition>
<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/08/platform#";
/>
- <rdfs:domain
rdf:resource="http://clerezza.org/2009/08/platform#Instance"/>
- <rdfs:range
rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
+ <rdfs:range
rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
</rdf:Property>
<rdf:Property rdf:about="http://clerezza.org/2009/08/platform#instance";>
