Author: ito
Date: Thu Jan 14 16:33:07 2010
New Revision: 899276
URL: http://svn.apache.org/viewvc?rev=899276&view=rev
Log:
CLEREZZA:72 multimodule project created, UserContextProvider implemented to add
languages to context node
Added:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/
- copied from r899259,
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/
(with props)
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/pom.xml
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/src/main/resources/org/apache/clerezza/platform/language/
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/
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
Removed:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/NOTICE.txt
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/pom.xml
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/src/
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
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
Modified:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml?rev=899276&r1=899259&r2=899276&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
Thu Jan 14 16:33:07 2010
@@ -2,15 +2,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.apache.clerezza.parent</artifactId>
+ <artifactId>org.apache.clerezza.platform.language</artifactId>
<groupId>org.apache.clerezza</groupId>
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.language</artifactId>
+ <artifactId>org.apache.clerezza.platform.language.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Platform Language</name>
+ <name>Clerezza - Platform Language Core</name>
<description>This bundles provides methods to manage languages in the
Clerezza platform
</description>
<dependencies>
@@ -54,5 +54,9 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.language.ontologies</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
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=899276&r1=899259&r2=899276&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
Thu Jan 14 16:33:07 2010
@@ -28,13 +28,16 @@
import javax.ws.rs.PathParam;
import javax.ws.rs.core.MediaType;
+import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.osgi.service.component.ComponentContext;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
+import org.apache.clerezza.platform.language.ontologies.LANGUAGE;
import org.apache.clerezza.platform.typerendering.RenderletManager;
+import org.apache.clerezza.platform.typerendering.UserContextProvider;
import
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.TripleCollection;
@@ -43,6 +46,7 @@
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.RdfList;
+import org.apache.clerezza.rdf.utils.UnionMGraph;
import org.apache.clerezza.web.fileserver.BundlePathNode;
import org.apache.clerezza.web.fileserver.FileServer;
import org.apache.felix.scr.annotations.Services;
@@ -57,15 +61,15 @@
*
* @author tio
*/
-...@component
+...@component(enabled=true, immediate=true)
@Services({
@Service(Object.class),
- @Service(LanguageWidget.class)
+ @Service(UserContextProvider.class)
})
@Property(name = "javax.ws.rs", boolValue = true)
@Path("/language-widget")
-public class LanguageWidget {
+public class LanguageWidget implements UserContextProvider {
private FileServer fileServer;
@@ -89,28 +93,31 @@
URL template = getClass().getResource("language-list.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- PLATFORM.LanguageList, "naked",
+ LANGUAGE.LanguageList, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
- /**
- * Stores a list of available languages in a triple collection and
returns the
- * root node of the list.
- *
- * @param graph specifies the graph to store the language list
- *
- * @return BNode
- *
- */
- public BNode getLanguagesList(TripleCollection graph) {
+ @Override
+ public GraphNode addUserContext(GraphNode node) {
+ BNode instance = new BNode();
+ 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 = new GraphNode(node.getNode(), new
UnionMGraph(node.getGraph(),
+ cgProvider.getContentGraph()));
+ return node;
+ }
+
+ private BNode getLanguagesList(TripleCollection graph) {
BNode listNode = new BNode();
RdfList list = new RdfList(listNode, graph);
List<LanguageDescription> languages =
languageService.getLanguages();
for (LanguageDescription languageDescription : languages) {
list.add(languageDescription.getResource().getNode());
}
- graph.add(new TripleImpl(listNode, RDF.type,
PLATFORM.LanguageList));
+ graph.add(new TripleImpl(listNode, RDF.type,
LANGUAGE.LanguageList));
return listNode;
}
Propchange:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 14 16:33:07 2010
@@ -0,0 +1 @@
+target
Added:
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/pom.xml?rev=899276&view=auto
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/pom.xml
(added)
+++
incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.ontologies/pom.xml
Thu Jan 14 16:33:07 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.language</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.language.ontologies</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Clerezza - Platform Language Ontologies</name>
+ <description>
+ Language Ontologies
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.maven-ontologies-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+
<resourcePath>${basedir}/src/main/resources</resourcePath>
+ <sources>
+
<source>${basedir}/target/generated-sources/main/java</source>
+ </sources>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added:
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=899276&view=auto
==============================================================================
---
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
(added)
+++
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
Thu Jan 14 16:33:07 2010
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
+ xmlns:owl="http://www.w3.org/2002/07/owl#";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:skos="http://www.w3.org/2008/05/skos#";
+>
+
+<!-- Ontology -->
+
+<owl:Ontology rdf:about="http://clerezza.org/2010/01/language#";>
+ <owl:versionInfo>Revision: 0.1</owl:versionInfo>
+ <dc:title xml:lang="en">
+ Clerezza Language
+ </dc:title>
+</owl:Ontology>
+
+
+<!-- Classes -->
+
+<rdfs:Class rdf:about="http://clerezza.org/2010/01/language#LanguageList";>
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+ <rdfs:label xml:lang="en">Language List</rdfs:label>
+ <skos:definition xml:lang="en">A list containing Lingvoj language
uris</skos:definition>
+ <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://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
+</rdf:Property>
+
+</rdf:RDF>
+
