Author: reto
Date: Tue Aug 24 08:48:29 2010
New Revision: 988436
URL: http://svn.apache.org/viewvc?rev=988436&view=rev
Log:
preparing a maven archetype for a project using java, ScalaServerPages and
turtle
Added:
incubator/clerezza/trunk/maven-archetypes/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ (props changed)
- copied from r986294,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/
- copied from r986294,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
- copied, changed from r986294,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/
- copied from r986294,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/ontologies/src/main/resources/org/apache/clerezza/foafssl/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
Removed:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/foafssl/Utilities.scala
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/OSGI-INF/serviceComponents.xml
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/scala/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/foafssl/
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/atomowl.rdf
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/cert.n3
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/rsa.rdf
Modified:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/pom.xml
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/pom.xml
Propchange: incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 24 08:48:29 2010
@@ -0,0 +1 @@
+target
Modified: incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/pom.xml?rev=988436&r1=986294&r2=988436&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/pom.xml
(original)
+++ incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/pom.xml Tue Aug
24 08:48:29 2010
@@ -1,23 +1,27 @@
<?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.security.foafssl</artifactId>
+ <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>parent</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.security.foafssl.core</artifactId>
+ <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>core</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Platform Security foaf+ssl Core</name>
+ <name>Clerezza - Skeleton Core</name>
<description>
- Foaf + Ssl Core
+ Skeleton Core
</description>
<dependencies>
<dependency>
+
<groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>ontologies</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.security.foafssl.ontologies</artifactId>
+ <artifactId>org.apache.clerezza.jaxrs.utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -37,73 +41,16 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.rdf.scala.utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.users.core</artifactId>
+
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jsslutils</groupId>
- <artifactId>jsslutils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>jetty-osgi-httpservice</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!--
<scalaVersion>${scala.version}</scalaVersion> -->
- <!-- <args>
- <arg>-target:jvm-1.5</arg>
- </args> -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
-
<Export-Package>!org.apache.clerezza.foafssl.ontologies,
-
org.apache.clerezza.foafssl.*</Export-Package>
-
<Bundle-SymbolicName>org.apache.clerezza.foafssl</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Copied:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
(from r986294,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java?p2=incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java&p1=incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala&r1=986294&r2=988436&rev=988436&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
(original)
+++
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/java/org/apache/clerezza/skeleton/GreetingManager.java
Tue Aug 24 08:48:29 2010
@@ -17,64 +17,95 @@
* under the License.
*/
-package org.apache.clerezza.foafssl
+package org.apache.clerezza.skeleton;
-import java.security.cert.X509Certificate
-import org.apache.clerezza.rdf.core.UriRef
+import java.net.URISyntaxException;
+import java.util.concurrent.locks.Lock;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.jaxrs.utils.RedirectUtil;
+import org.apache.clerezza.jaxrs.utils.TrailingSlash;
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
+import org.apache.clerezza.platform.typerendering.RenderletManager;
+import
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
+import org.apache.clerezza.rdf.core.BNode;
+import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.clerezza.rdf.ontologies.RDF;
+import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.skeleton.ontologies.GREETINGS;
+import org.apache.clerezza.web.fileserver.FileServer;
+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;
-/**
- * Utilitie functions to deal with certificates
- *
- * @author Reto Bachmann-Gmür, Henry Story
- */
-object Utilities {
-
- /**
- * same as getClaimedWebIds(chain(0))
- */
- def getClaimedWebIds(chain: Array[X509Certificate]): List[UriRef] = {
- getClaimedWebIds(chain(0))
- }
- /**
- * Extracts the URIs in the subject alternative name extension of an
X.509
- * certificate (perhaps others such as email addresses could also be
- * useful).
- *
- * @param cert
- * X.509 certificate from which to extract the URIs.
- * @return list of java.net.URIs built from the URIs in the
subjectAltName
- * extension.
- */
- def getClaimedWebIds(cert: X509Certificate): List[UriRef] = {
- // throws CertificateParsingException {
- var result : List[UriRef] = Nil
- if (cert == null) {
- return result;
- }
+...@component
+...@service(value=Object.class)
+...@property(name="javax.ws.rs", boolValue=true)
+...@path("/greeting/manager")
+public class GreetingManager extends FileServer {
+
+ @Reference
+ private RenderletManager renderletManager;
+
+ @Reference
+ private ContentGraphProvider cgProvider;
+
+ public void activate(ComponentContext context) throws
URISyntaxException {
+
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
+ new UriRef(getClass().getResource(
+ "greeting-naked.ssp").toURI().toString()),
+ GREETINGS.Greeting, "naked",
+ MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ configure(context.getBundleContext());
+ }
- val names = cert.getSubjectAlternativeNames()
- if (names == null) {
- return result;
- }
+ @GET
+ public Response entry(@Context UriInfo uriInfo) {
+ TrailingSlash.enforceNotPresent(uriInfo);
+ return
RedirectUtil.createSeeOtherResponse("manager/new-greeting.xhtml", uriInfo);
+ }
+
+ @GET
+ @Path("test")
+ public GraphNode testGreeting() {
+ MGraph resultMGraph = new SimpleMGraph();
+ GraphNode result = new GraphNode(new BNode(), resultMGraph);
+ result.addProperty(RDF.type, GREETINGS.Greeting);
+ result.addProperty(GREETINGS.words,
+ new PlainLiteralImpl("Merhaba!"));
+ return result;
+ }
- // val n = names(0)
- import scala.collection.mutable
- val it = names.iterator;
- while (it.hasNext) {
- val altNme = it.next()
- val altTpe = altNme.get(0);
- val altObj = altNme.get(1);
- if ((altTpe.asInstanceOf[Integer] == 6) &&
altObj.isInstanceOf[String]) {
- result = new
UriRef(altObj.asInstanceOf[String]) :: result;
- }
+ @POST
+ @Path("new-greeting")
+ public String createNewGreeting(@FormParam("uri") UriRef uri,
+ @FormParam("words") String words) {
+ LockableMGraph contentGraph = cgProvider.getContentGraph();
+ Lock l = contentGraph.getLock().writeLock();
+ l.lock();
+ try {
+ contentGraph.add(new TripleImpl(uri, RDF.type,
GREETINGS.Greeting));
+ contentGraph.add(new TripleImpl(uri, GREETINGS.words,
+ new PlainLiteralImpl(words)));
+ } finally {
+ l.unlock();
}
- return result
+ return "created";
}
-
- def cretateUsernameForWebId(webId: UriRef) = {
- webId.getUnicodeString.replace(":", "");
- }
}
\ No newline at end of file
Added:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp?rev=988436&view=auto
==============================================================================
---
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
(added)
+++
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/greeting-naked.ssp
Tue Aug 24 08:48:29 2010
@@ -0,0 +1,6 @@
+def greet(s: Any) = new UriRef("http://clerezza.apache.org/skeleton/greeting#";
+ s)
+
+<div class="tx-content">
+ <h3>Today we greet you as follows:</h3>
+ <strong>{res/greet("words")*}</strong>
+</div>
\ No newline at end of file
Added:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml?rev=988436&view=auto
==============================================================================
---
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
(added)
+++
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/core/src/main/resources/org/apache/clerezza/skeleton/staticweb/new-greeting.xhtml
Tue Aug 24 08:48:29 2010
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <title>Create a new Greeting</title>
+ </head>
+ <body>
+ <div class="tx-content">
+ <h1>Create new Greeting</h1>
+ <form method="post" action="new-greeting">
+ Uri: <input type="text" name="uri"/><br/>
+ Words: <input type="text" name="words"/><br/>
+ <input type="submit"/>
+ </form>
+ </div>
+ </body>
+</html>
Modified:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/pom.xml?rev=988436&r1=986294&r2=988436&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
(original)
+++ incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/pom.xml
Tue Aug 24 08:48:29 2010
@@ -1,17 +1,17 @@
<?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.security.foafssl</artifactId>
+ <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>parent</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.security.foafssl.ontologies</artifactId>
+ <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>ontologies</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Platform Security foaf+ssl Ontologies</name>
+ <name>Clerezza - Skeleton Ontologies</name>
<description>
- Foaf + Ssl Ontologies
+ Skeleton Ontologies
</description>
<dependencies>
<dependency>
Added:
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl?rev=988436&view=auto
==============================================================================
---
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
(added)
+++
incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/ontologies/src/main/resources/org/apache/clerezza/skeleton/ontologies/greetings.ttl
Tue Aug 24 08:48:29 2010
@@ -0,0 +1,17 @@
+...@prefix : <http://clerezza.apache.org/skeleton/greeting#>.
+...@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+...@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+...@prefix skos: <http://www.w3.org/2008/05/skos#>.
+...@prefix owl: <http://www.w3.org/2002/07/owl#>.
+...@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+
+: a owl:Ontology.
+
+:Greeting a rdfs:Class;
+ skos:definition "A greeting."@en;
+ rdfs:subClassOf <http://clerezza.org/2009/08/platform#HeadedPage>.
+
+:words a rdf:Property;
+ skos:definition "A sequence of word expressing the subject."@en;
+ rdfs:Domain foaf:Greeting.
Modified: incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/pom.xml?rev=988436&r1=986294&r2=988436&view=diff
==============================================================================
--- incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/pom.xml (original)
+++ incubator/clerezza/trunk/maven-archetypes/java-ssp-ttl/pom.xml Tue Aug 24
08:48:29 2010
@@ -5,13 +5,33 @@
<artifactId>org.apache.clerezza.parent</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.security.foafssl</artifactId>
+ <groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>0.1-incubating-SNAPSHOT</version>
- <name>Clerezza - Platform Security foaf+ssl</name>
+ <name>Clerezza - Skeleton for a project using Java, ScalaServerPages
and Turtle</name>
<modules>
<module>ontologies</module>
<module>core</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+
<groupId>org.apache.clerezza.java-ssp-ttl-skeleton</groupId>
+ <artifactId>ontologies</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <!-- <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.archetype</groupId>
+
<artifactId>archetype-packaging:maven-plugin</artifactId>
+ <version>2.0-alpha-5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build> -->
</project>
