You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2014/08/01 19:18:21 UTC
[06/42] CLEREZZA-926: removed modules not in release
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/pom.xml
----------------------------------------------------------------------
diff --git a/site/pom.xml b/site/pom.xml
deleted file mode 100644
index a0c9a7c..0000000
--- a/site/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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>clerezza</artifactId>
- <version>0.5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <artifactId>website</artifactId>
- <version>0.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Clerezza - Website</name>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.core</artifactId>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.scala</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <version>0.12-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.scala.utils</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>osgi.services</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-activator>org.apache.clerezza.site.Activator</Bundle-activator>
- <Export-Package>org.apache.clerezza.site</Export-Package>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <buildcommands>
- <buildcommand>ch.epfl.lamp.sdt.core.scalabuilder</buildcommand>
- </buildcommands>
- <additionalProjectnatures>
- <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
- </additionalProjectnatures>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
- </classpathContainer>
- <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
- </classpathContainer>
- </classpathContainers>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
-
-
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/readme.txt
----------------------------------------------------------------------
diff --git a/site/readme.txt b/site/readme.txt
deleted file mode 100644
index 7ce9384..0000000
--- a/site/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Editing and deploying the clerezza website
-
-- start clerezza on localhost:8080
-
-- install the directory with the site project (the directory containing this readme) with: Dev load LocationSpec("/path/to/apache/clerezza/trunk/site", noFastUpdate)
-
-- you'll now see the contents of the clerezza site on your local instance, the content-graph is regularly written to the graph.nt file
-
-- change the site as needed, do not create pages ending with /, create a page ending with /index instead, the entry page is http://localhost:8080/index (you may open http://localhost:8080/tools/editor with firefox to edit it)
-
-- commit the changed graph.nt to version control
-
-- execute the deploy.sh script (this requires a unix style system and will typically take several minutes)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image001.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image001.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image001.png
deleted file mode 100644
index c597e9f..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image001.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image003.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image003.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image003.png
deleted file mode 100644
index 2f6de74..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image003.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image005.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image005.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image005.png
deleted file mode 100644
index d6f22a5..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image005.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image007.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image007.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image007.png
deleted file mode 100644
index 49a9cee..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image007.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image009.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image009.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image009.png
deleted file mode 100644
index 1521b13..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image009.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image011.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image011.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image011.png
deleted file mode 100644
index 4b915d6..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image011.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image013.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image013.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image013.png
deleted file mode 100644
index 0591ffd..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image013.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image015.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image015.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image015.png
deleted file mode 100644
index 1883a62..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image015.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image017.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image017.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image017.png
deleted file mode 100644
index edca8e8..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image017.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image019.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image019.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image019.png
deleted file mode 100644
index 30daab5..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image019.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image021.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image021.png b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image021.png
deleted file mode 100644
index f47d708..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/images/image021.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/index.html
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/index.html b/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/index.html
deleted file mode 100644
index 5d75aaf..0000000
--- a/site/src/main/resources/CLEREZZA-INF/web-resources/architecture/index.html
+++ /dev/null
@@ -1,448 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Apache Clerezza Stack</title>
- <link rel="stylesheet" href="../style/style.css" type="text/css"/>
- </head>
-
- <body>
- <div class="zz-header">
- <div class="bar"></div>
- <div class="logo">
- <a href="../" style=""><img src="../images/logo.png" alt="logo" /></a>
- </div>
- </div>
- <div class="column nav">
- <ul>
- <li class="top-nav-entry"><div class="title">Documentation</div>
- <ul class="nav-entries">
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="#" class="active">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Project Infos</div>
- <ul class="nav-entries">
- <li><a href="../downloads/">Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="../mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Sponsorship</div>
- <ul class="nav-entries">
- <li><a href="../thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </li>
- </ul>
- </div>
- <div class="zz-content">
- <div class="column one-column">
- <h1>The Apache Clerezza Stack</h1>
- <p>The OSGi (Open Services Gateway initiative) architecture is chosen as the underlying software architecture for the Apache Clerezza to achieve a service oriented and modular design of software components. The OSGi architecture is preferred compared to Service Component Architecture (SCA) · due to its maturity in implementation and support.
-
-Figure 1 presents the architectural components of Apache Clerezza. Interactions of those components are described in detail in subsequent sections. To perform a certain function, a component may use OSGi services provided by other components. OSGi services provided by a component can also be exposed as Web services, to be made accessible through the Web service framework.
- </p>
- <h3>Table of Content</h3>
- <ol class="toc">
- <li><a href="#scb">Smart Content Binding</a></li>
- <li><a href="#rest">RESTful Web Service Framework</a></li>
- <li><a href="#security">Security</a></li>
- <li><a href="#user">User Management</a></li>
- </ol>
- <br/>
- <img style="height: 600px;" src="images/image001.png"/>
- <div class="figure-desc">Figure 1: Architectural components of Clerezza.</div>
- <br/>
- <br/>
- <a name="scb"></a>
- <h2>1. Smart Content Binding (SCB)</h2>
- <p>SCB defines a technology-agnostic layer to access and modify triple stores. It provides a java implementation of the graph data model specified by W3C RDF and functionalities to operate on that data model. SCB offers a service interface to access multiple named graphs and it can use various weighted providers to manage RDF graphs in a technology specific manner, e.g., using Jena · or Sesame. It also provides for adaptors that allow an application to use Jena or Sesame APIs to process RDF graphs. Furthermore, SCB offers a serialization and a parsing service to convert a graph into a certain representation (format) and vice versa. The architecture of SCB is depicted in Figure 2 and described in details in the following subsections.
- </p>
- <img src="images/image003.png"/>
- <div class="figure-desc">Figure 2: Smart Content Binding</div>
- <h3>1.1 Triple Collections</h3>
- <p>A Triple Collection is a set of triples, and thus, does not contain duplicates. A Triple Collection can be seen as a database in Relational Database Management Systems. Each triple comprises a subject, an object, and a predicate which relates the subject to the object. Note that, this relation is a directed relation. Possible data types (classes) that a subject, a predicate, or an object can have, is defined in Table 1. Figure 3 depicts the class diagram of those data types, which are described in detail in ·.
- </p>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 40%;"></th>
- <th class="center" style="width: 20%">Subject</th>
- <th class="center" style="width: 20%">Predicate</th>
- <th class="center" style="width: 20%">Object</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="first-col">Plain Literal</td>
- <td class="center">-</td>
- <td class="center">-</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">Typed Literal</td>
- <td class="center">-</td>
- <td class="center">-</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">Blank Node</td>
- <td class="center">x</td>
- <td class="center">-</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">URI Reference</td>
- <td class="center">x</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- </tbody>
- </table>
- <div class="figure-desc">Table 1: Data types for subject, predicate, and object of a triple.</div>
- <br/>
- <br/>
- <img src="images/image005.png"/>
- <div class="figure-desc">Figure 3: Class diagram of resources</div>
- <p>The triples in a Triple Collection constitute a directed graph. Principally all triples can be placed within a single graph. However, it is practical to group triples and give them a name, resulting in a named graph. This name allows a graph to be referred to when accessing it. In many cases, it is useful to have graphs which are not modifiable, i.e., triples cannot be added to neither removed from the graph. Graphs which are not modifiable, are called Immutable Graphs (or just Graphs), whereas modifiable graphs are called Mutable Graph (or in short MGraph). Table 2 lists functions to be supported by MGraphs and Graphs. </p>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 40%;">Function</th>
- <th style="width: 30%">Description</th>
- <th style="width: 30%">Triple Collection</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="first-col">Filter</td>
- <td >Given a triple pattern, this operation must return all triples that match the pattern. </td>
- <td>MGraphs and Graphs</td>
- </tr>
- <tr>
- <td class="first-col">Add Listener</td>
- <td >Register a listener which will be notified if there is a change in the MGraph which match the specified pattern.</td>
- <td >MGraphs</td>
- </tr>
- <tr>
- <td class="first-col">Remove Listener</td>
- <td >Deregister a listener.</td>
- <td >MGraphs</td>
- </tr>
- <tr>
- <td class="first-col">Equals</td>
- <td >Test on isomorphism of two graphs.</td>
- <td >Graphs</td>
- </tr>
- </tbody>
- </table>
- <div class="figure-desc">Table 2: Main functions supported by MGraphs and Graphs.</div>
- <p>In order to prevent concurrent modifications on an MGraph by different threads, a graph locking mechanism is required. Setting a read-lock on an MGraph prevents other threads from writing the MGraph, whereas setting a write-lock prevcnts other threads from reading and writing it.</p>
- <h3>1.2 GraphNode</h3>
- <p>A GraphNode is an object which represents a node (RDF resource) in a Triple Collection. It provides useful methods to obtain information about the node. Table 3 lists these methods and their descriptions.
- </p>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 40%;">Function</th>
- <th style="width: 60%">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="first-col">Get Node Context</td>
- <td class="">The context of a node are the triples containing the node
-
- as subject or object and recursively the context of the blank nodes in any of these statements (triples). This method returns a Graph containing these triples. Blank nodes in this Graph are the same instances as in the original Triple Collection.</td>
- </tr>
- <tr>
- <td class="first-col">Delete Node Context</td>
- <td class="">Delete the context of the node.</td>
- <tr>
- <td class="first-col">Get Objects</td>
- <td class="">Get the objects of statements with this node as subject and a specified property as predicate.</td>
- </tr>
- <tr>
- <td class="first-col">Get Subjects</td>
- <td class="">Get the subjects of statements with this node as object and a specified property as predicate.</td>
- </tr>
- <tr>
- <td class="first-col">Get Properties</td>
- <td class="">Get all available properties of this node as subject.</td>
- </tr>
- <tr>
- <td class="first-col">Get Inverse Properties</td>
- <td class="">Get all available properties of this node as object.</td>
- </tr>
- <tr>
- <td class="first-col">Add Property</td>
- <td class="">Add a property to the node with the specified predicate and object.</td>
- </tr>
- <tr>
- <td class="first-col">Delete Properties</td>
- <td class="">Delete all statement with the node as subject and the specified predicate.</td>
- </tr>
- <tr>
- <td class="first-col">Delete Property</td>
- <td class="">Delete a statement with the node as subject, the specified property as predicate, and the specified resource as object.</td>
- </tr>
- </tbody>
- </table>
- <div class="figure-desc">Table 3: Main functions supported by MGraphs and Graphs.</div>
- <h3>1.3 Triple Collection Providers</h3>
- <p>A Triple Collection (TC) Provider provides a service to access and manipulate Triple Collections implemented in a specific technology. Table 4 lists the main functions that a TC Provider must support.
- </p>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 40%;">Function</th>
- <th style="width: 60%">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="first-col">Create Graph</td>
- <td class="">Create a Graph for the specified name with triples of the specified Triple Collection.</td>
- </tr>
- <tr>
- <td class="first-col">Create MGraph</td>
- <td class="">Create an MGraph for the specified name.</td>
- </tr>
- <tr>
- <td class="first-col">Delete Triple Collection</td>
- <td class="">Delete a Triple Collection, i.e. a Graph or MGraph of the specified name.</td>
- </tr>
- <tr>
- <td class="first-col">Get Graph</td>
- <td class="">Return a Graph of the specified name.</td>
- </tr>
- <tr>
- <td class="first-col">Get MGraph</td>
- <td class="">Return an MGraph of the specified name.</td>
- </tr>
- </tbody>
- </table>
- <div class="figure-desc">Table 4: Main functions supported by a TC Provider.</div>
- <h3>1.4 Parser and Serializer</h3>
- <p>A Parsing Provider provides the functionality to parse a Triple Collection from its serialized form into a Graph. Each Parsing Provider is characterized by its supported format. A Parser is a singleton that offers the parsing function by delegating it to registered Parsing Providers.
- </p>
- <p>A Serializing Provider provides the functionality to serialize a Triple Collection into the specified format. Each Serializing Provider is characterized by its supported format. A Serializer is a singleton that offers the serialization function by delegating it to registered Serializing Providers.
- </p>
- <h3>1.5 SPARQL Support</h3>
- <p>SPARQL is a protocol and query language for RDF. The SCB architecture defines 4 components to support SPARQL: SPARQL Query, SPARQL Parser, SPARQL Serializer, and SPARQL Engine. In SPARQL Query, Java classes are defined to model the 4 forms of queries defined in SPARQL: Select, Construct, Ask, and Describe. The SPARQL Parser provides the functionality to parse a String into a Query object, whereas the SPARQL Serializer does the opposite. The SPARQL Engine provides a function to execute the specified SPARQL Query on the specified Triple Collection.
- </p>
- <h3>1.6 Triple Collection Manager</h3>
- <p>The Triple Collection (TC) Manager is a singleton that provides access to Triple Collections through registered TC Providers. It also provides methods to execute SPARQL queries through a registered SPARQL Query Engine.
- </p>
- <br/>
- <br/>
- <a name="rest"></a>
- <h2>2. RESTful Web Service Framework</h2>
- <p>The main component of the framework is an implementation of the JSR-311 (JAX-RS) specification ·, a Java API for RESTful Web services. The specification enables easy implementation of RESTful Web services using JAX-RS annotations, based on Java annotation mechanism. There are several implementations of this specification available, but trialox implementation called Triaxrs provided extended functionality, especially Type Handling and Type Rendering, which are described in detail in this section. Type Handling is a mechanism to select a Web service to process the Web request based on the RDF type of the requested resource, and Type Rendering is a mechanism to select a rendering definition to process the Web response based on the RDF type of the returned GraphNode.
- </p>
- <h3>2.1 JAX-RS Resources</h3>
- <p>A Web request is handled by a certain method of an intance of a certain Java class. This Java class is called a JAX-RS resource (in JAX-RS terminology, it is called a resource class), and the method is called a resource method. JAX-RS resources and their resource methods are annotated with JAX-RS annotations in order to allow Triaxrs to find and instantiate the right JAX-RS resource and invoke the right resource method to process an incoming Web request. JAX-RS annotations are used to specify URL paths, HTTP methods, consumed and produced media types, and Web request parameters.
- </p>
- <h3>2.2 JAX-RS Providers</h3>
- <p>The functionality of a JAX-RS runtime is extended using application-supplied provider classes. JAX-RS specifies 3 types of providers: Entity Providers, Context Providers, and Exception Mapping Providers, as depicted in Figure 4. Entity providers supply mapping services between representations and their associated Java classes. There are 2 types of Entity Providers: Message Body Reader (MBR) and Message Body Writer (MBW). Context Providers supply context to resource classes and other providers, while Exception Mapping Providers map a checked or runtime exception to an instance of JAX-RS Response. Interested readers are recommended to study · for detail descriptions of JAX-RS providers and applicable JAX-RS annotations.
- </p>
- <img src="images/image007.png"/>
- <div class="figure-desc">Figure 4: JAX-RS providers.</div>
-
- <p>A number of MBRs and MBWs are to be implemented within the framework in order to support Java classes which are often used. They are listed in Table 5.</p>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 60%;">Java Class</th>
- <th class="center" style="width: 20%">MBR</th>
- <th class="center" style="width: 20%">MBW</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="first-col">String</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">byte[]</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">java.io.File</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">javax.ws.rs.core.MultivaluedMap<String, String>
-(defined by JAX-RS for HTML form's content type
-application/x-www-form-urlencoded)</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">java.io.InputStream</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">java.io.Reader</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">javax.xml.transform.stream.StreamSource</td>
- <td class="center">x</td>
- <td class="center">-</td>
- </tr>
- <tr>
- <td class="first-col">javax.xml.transform.sax.SAXSource</td>
- <td class="center">x</td>
- <td class="center">-</td>
- </tr>
- <tr>
- <td class="first-col">javax.xml.transform.dom.DOMSource</td>
- <td class="center">x</td>
- <td class="center">-</td>
- </tr>
- <tr>
- <td class="first-col">javax.xml.transform.Source</td>
- <td class="center">-</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">javax.ws.rs.core.StreamingOutput</td>
- <td class="center">-</td>
- <td class="center">x</td>
- </tr>
- <tr>
- <td class="first-col">org.apache.clerezza.jaxrs.utils.form.MultiPartBody
-(defined by apache clerezza for HTML form's content type multipart/form-data </td>
- <td class="center">x</td>
- <td class="center">-</td>
- </tr>
- <tr>
- <td class="first-col">org.apache.clerezza.rdf.core.Graph
-(implemented within SCB)</td>
- <td class="center">x</td>
- <td class="center">x</td>
- </tr>
- </tbody>
- </table>
-
- <h3>2.3 Web Request Processing</h3>
- <img src="images/image009.png"/>
- <div class="figure-desc">Figure 5: Web request processing.</div>
- <p>Figure 5 shows the typical sequence of interactions between various components involved in the processing of a Web request after delivered to the Triaxrs Core. The Triaxrs Core selects a resource method by matching annotated resource methods to the Web request. Before invoking the matched method, all parameters of the method are constructed by using relevant Context Providers and Message Body Readers. The result of the method invocation is a Java object (an instance of a certain Java class). The Triaxrs Core looks for a matching MBW to render the resulting Java object. Finally, a Web response is generated and sent to the requesting client through the Web server.
- </p>
-
- <h3>2.4 Type Handling</h3>
- <p>In JAX-RS specification, the URL of a Web request determines candidate JAX-RS resources and methods, whereas RDF uses a URI Reference (which can also be used as URL) to identify a resource. Note that an RDF resource can also be a blank node, in which case it is not processable through Type Handling. Therefore, a Type Handler Space can be annotated to match any URL, and it can use the URL as the URI Reference of the RDF resource to be processed. However, this requires:
- </p>
- <ol>
- <li><div>The URI Reference of an RDF resource must use the same scheme and authority part as the URL of the Web service.</div></li>
- <li><div>A minor change in the resource matching algorithm in the JAX-RS Maintenance Release Specification 1.1, in order to ease the implementation of the Type Handling mechanism. This minor change was proposed to JSR 311 Project by trialox and received a positive feedback.</div></li>
- </ol>
- <img src="images/image011.png"/>
- <div class="figure-desc">Figure 6: Web request processing involving a Type Handler.</div>
- <p>The sequence of a Web request processing involving a Type Handler is depicted in Figure 6. The Type Handler Space matches any URL and returns a Type Handler supporting an RDF type of the RDF resource requested. In order to find the right Type Handler, the Type Handler Space needs to access the Triple Store which has the triple stating the RDF type of the requested RDF resource. Furthermore, Type Handlers are annotated with information on supported RDF types and a property denoting that the Java class is a Type Handler. The Type Handler acts as a JAX-RS sub-resource to be matched with the HTTP method of the Web request. The matching sub-resource method is then invoked with the required parameters by the Triaxrs Core. The remaining steps are the same as in the previous Section.
- </p>
- <h3>2.5 Type Rendering</h3>
- <p>Similar to Type Handling a mechanism to map the RDF type of an RDF resource to a rendering definition will be useful. This mechanism is termed Type Rendering. A rendering definition stores the following information:
- </p>
- <ul>
- <li><div>Rendering Specification: a template for rendering a GraphNode.</div></li>
- <li><div>Renderlet: an object that provides the functionality to render a GraphNode based on the Rendering Specification</div></li>
- <li><div>Media Type: the media type of the resulting document.</div></li>
- <li><div>Rendering Mode: a parameter to configure the rendering behavior.</div></li>
- <li><div>Rendered Type: the applicable RDF type.</div></li>
- </ul>
- <br/>
- <p>In order to support Type Rendering in Triaxrs, a generic Message Body Writer for GraphNodes is required, which is annotated as being capable to produce any media type. Based on the accept header of the Web request, the optional query parameter “mode” in the Web request, and the RDF type of the GraphNode to be rendered, a matching rendering definition is selected. The renderlet is extracted from the rendering definition and its render method is invoked to render the GraphNode according to the rendering specification.
- </p>
- <img src="images/image013.png"/>
- <div class="figure-desc">Figure 7: Web request processing involving a Type Handler.</div>
- <br/>
- <br/>
- <a name="security"></a>
- <h2>3. Security</h2>
- <p>Some services provided by Apache Clerezza are restricted to specific users only. Therefore, Apache Clerezza must support user authentication and authorization. </p>
- <h3>3.1 Authentication</h3>
- <img src="images/image015.png"/>
- <div class="figure-desc">Figure 8: Authentication.</div>
- <p>Figure 8 shows the authentication process. Before a Web request is delivered to Triaxrs Core for processing, the user who submitted the Web request must first be authenticated. The Web Request Handler forwards the Web request received from the Web server to the Authentication component. This component invokes registered Authentication Methods in a sequence according to their priority (weight). Each Authentication Method extracts user credentials from the Web request and returns the user name if the user can be authenticated successfully. Otherwise, it generates a Web response to inform the client about the failed authentication. The platform should support HTTP basic authentication and cookie-based authentication. In case of HTTP basic authentication, if the Web request does not contain the user credentials, the UNAUTHORIZED response status code is sent to the client. In case of cookie-based authentication, a failed authentication leads to a redirection to a login page.</p>
- <p>After the user (a.k.a subject in JAAS) is successfully authenticated, the Web request is delivered to the Triaxrs Core to be processed. This Web request processing is carried out within the method Subject.doAsPrivileged, a JAAS authorization mechanism. This method receives three parameters: a subject, an action, and an access control context. The specified action is carried out as the specified subject within the specified access control context. This means, Triaxrs Core processes the Web request on behalf of the authenticated user (subject). Doing this is necessary to enable checking the rights of a subject to perform a particular action, as described in the next section.
- </p>
-
- <h3>3.2 Authorization</h3>
- <img src="images/image017.png"/>
- <div class="figure-desc">Figure 9: A typical interaction of components involved in authorization.</div>
- <p>Authorization in Apache Clerezza is based on JAAS. The following steps are performed to use JAAS for authorization:
- </p>
- <ul>
- <li><div>A Security Manager must be activated. Apache Clerezza activates a default Security Manager provided by the Java Virtual Machine when Apache Clerezza starts.</div></li>
- <li><div>A security policy must be set. The User-Based Authorization component of Apache Clerezza sets a security policy which implements the Java Policy API function getPermissions to deliver permissions (access rights) for a given subject. These permissions are stored in a specific Triple Collection in Apache Clerezza.</div></li>
- <li><div>Before executing a code segment that requires an authorization, e.g., when a user wants to modify an MGraph, an access control is triggered by invoking the method AccessController.checkPermission and passing the respective Java Permission object as the parameter (in this case, a Java Permission object for modifying an MGraph). Since the code segment is performed on behalf of the authenticated subject, JAAS consults (retrieve permissions of a subject from) currently installed security policy, in order to check, whether the subject has the requested permission</div></li>
- </ul>
- <br/>
- <br/>
- <a name="user"></a>
- <h2>4. User Management</h2>
- <p>The User Manager provides a service to create users and roles, and assign permissions to them. A role represents a set of rights which are needed by a user having a certain function to perform her tasks. To describe users and roles, a set of ontologies is used as depicted in Figure 10. A user is defined as a FOAF Agent, and she can be assigned a set of roles. A user inherits the permissions of her roles. This means, assigning a user a certain role has the effect of assigning the permissions of this role to the user. Furthermore, a user can be assigned role-independent permissions. The property has_function of SIOC is used to assign roles to users. By applying this property also to roles, all permissions of a role can be passed on to other roles. Since properties of the class Role are also properties of the class Agent, the class Role is defined as a superclass of the class Agent.</p>
- <p>Two own ontology namespaces are defined, as can be seen in Figure 10: PLATFORM and PERMISSION. This is due to the fact, that existing ontologies do not provide required properties and classes. Instead of FOAF name, the property userName, defined in own ontology termed PLATFORM, is used to identify a user, because unlike FOAF name, the value of userName must be unique. To allow usage of permission definitions besides Java-based permissions, the class Permission in the namespace PERMISSION is specified. Therefore, the property hasPermission points to an object of the class Permission.
- </p>
- <img src="images/image019.png"/>
- <div class="figure-desc">Figure 10: Onotlogies for user and roles.</div>
- <p>Apache Clerezza pre-defines two roles: base-role and default-role. The base-role has a set of permissions which allow a user having this role to use services made public by Apache Clerezza. This requires read access to various graphs and the following Java permission specification: (java.util.PropertyPermission "*" "read") and (org.osgi.framework.AdminPermission "*" "resource"). Any user implicitly has the base-role. A user with a default-role has additionally the permissions to change her password and access her account control panel to view or modify her account data. Besides roles, Apache Clerezza also pre-defines two users: anonymous and admin. The user anonymous has only the base-role, whereas the user admin has all permissions.</p>
- </div>
- </div>
- <div class="footer">
- <div class="logos"><img src="../images/feather.png" /><img src="../images/sw-vert-w3c.png" /><img src="../images/footer-logo.png" /></div>
- <div class="divider"></div>
- <div class="dark">
- <div class="sitemap">
- <div class="sitemap-title">Sitemap</div>
- <div class="sitemap-content">
- <div class="sitemap-column">
- <div class="title" >Documentation</div>
- <ul>
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="../architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
-
- </div>
- <div class="sitemap-column">
- <div class="title" >Project Infos</div>
- <ul >
- <li><a href="../downloads/">Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="../mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </div>
- <div class="sitemap-column">
- <div class="title" >Sponsorship</div>
- <ul>
- <li><a href="../thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </div>
- </div>
-
- </div>
- <div class="copyright">Apache Clerezza, Clerezza, Apache, the Apache feather logo, and the Apache Clerezza project logo are trademarks of The Apache Software Foundation. <br></br>© 2011 The Apache Software Foundation.</div>
- </div>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/images/feather.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/images/feather.png b/site/src/main/resources/CLEREZZA-INF/web-resources/images/feather.png
deleted file mode 100644
index e139692..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/images/feather.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/images/footer-logo.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/images/footer-logo.png b/site/src/main/resources/CLEREZZA-INF/web-resources/images/footer-logo.png
deleted file mode 100644
index 2e88658..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/images/footer-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/images/logo.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/images/logo.png b/site/src/main/resources/CLEREZZA-INF/web-resources/images/logo.png
deleted file mode 100644
index e641b7d..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/images/logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/images/sw-vert-w3c.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/images/sw-vert-w3c.png b/site/src/main/resources/CLEREZZA-INF/web-resources/images/sw-vert-w3c.png
deleted file mode 100644
index ad3770d..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/images/sw-vert-w3c.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/mailinglists/index.html
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/mailinglists/index.html b/site/src/main/resources/CLEREZZA-INF/web-resources/mailinglists/index.html
deleted file mode 100644
index 597142f..0000000
--- a/site/src/main/resources/CLEREZZA-INF/web-resources/mailinglists/index.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Apache Clerezza</title>
- <link rel="stylesheet" href="../style/style.css" type="text/css"/>
- </head>
-
- <body>
- <div class="zz-header">
- <div class="bar"></div>
- <div class="logo">
- <a href="../" style=""><img src="../images/logo.png" alt="logo" /></a>
- </div>
- </div>
- <div class="column nav">
- <ul>
- <li class="top-nav-entry"><div class="title">Documentation</div>
- <ul class="nav-entries">
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="../architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Project Infos</div>
- <ul class="nav-entries">
- <li><a href="../downloads/">Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="#" class="active">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Sponsorship</div>
- <ul class="nav-entries">
- <li><a href="../thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </li>
- </ul>
- </div>
- <div class="zz-content">
- <div class="column one-column">
- <h1>Mailing lists</h1>
- The following mailing lists have been established for Apache Clerezza. For each list, there is a subscribe, unsubscribe, and archive link.
- <br/>
- <br/>
- <br/>
- <table class="">
- <thead>
- <tr>
- <th class="first-col" style="width: 40%;">Name</th>
- <th class="center" style="width: 20%">Subscribe</th>
- <th class="center" style="width: 20%">Unsubscribe</th>
- <th class="center" style="width: 20%">Archive</th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td class="first-col"><strong>Clerezza Developers</strong> - For people using and developing Clerezza:<br/>clerezza-dev at incubator.apache.org</td>
- <td class="center"><a href="mailto:clerezza-dev-subscribe@incubator.apache.org" class="" >Subscribe</a></td>
- <td class="center"><a href="mailto:clerezza-dev-unsubscribe@incubator.apache.org" class="" >Unsubscribe</a></td>
- <td class="center"><a href="http://mail-archives.apache.org/mod_mbox/incubator-clerezza-dev/" class="" >Mail Archive</a></td>
- </tr>
- <tr>
- <td class="first-col"><strong>Clerezza Commits</strong> - For people interested in code changes:<br/>clerezza-commits at incubator.apache.org</td>
- <td class="center"><a href="mailto:clerezza-commits-subscribe@incubator.apache.org" class="" >Subscribe</a></td>
- <td class="center"><a href="mailto:commits-unsubscribe@felix.apache.org" class="" >Unsubscribe</a></td>
- <td class="center"><a href="http://mail-archives.apache.org/mod_mbox/incubator-clerezza-commits/" class="" >Mail Archive</a></td>
- </tr>
- </tbody>
- </table>
- <br/>
- <br/>
- <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists. Patches are best handled via the Issue Tracking system. Otherwise, please upload the file to a public server and include the URL in the mail.
- </div>
- </div>
- <div class="footer">
- <div class="logos"><img src="../images/feather.png" /><img src="../images/sw-vert-w3c.png" /><img src="../images/footer-logo.png" /></div>
- <div class="divider"></div>
- <div class="dark">
- <div class="sitemap">
- <div class="sitemap-title">Sitemap</div>
- <div class="sitemap-content">
- <div class="sitemap-column">
- <div class="title" >Documentation</div>
- <ul>
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="../architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
-
- </div>
- <div class="sitemap-column">
- <div class="title" >Project Infos</div>
- <ul >
- <li><a href="../downloads/">Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="../mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </div>
- <div class="sitemap-column">
- <div class="title" >Sponsorship</div>
- <ul>
- <li><a href="../thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </div>
- </div>
-
- </div>
- <div class="copyright">Apache Clerezza, Clerezza, Apache, the Apache feather logo, and the Apache Clerezza project logo are trademarks of The Apache Software Foundation. <br></br>© 2011 The Apache Software Foundation.</div>
- </div>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L001.otf
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L001.otf b/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L001.otf
deleted file mode 100644
index a99ce84..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L001.otf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L003.otf
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L003.otf b/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L003.otf
deleted file mode 100644
index dd4a6e5..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumText25L003.otf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumTitle20.otf
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumTitle20.otf b/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumTitle20.otf
deleted file mode 100644
index 4ca3960..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/fonts/TitilliumTitle20.otf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-bar.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-bar.png b/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-bar.png
deleted file mode 100644
index ba97558..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-bar.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-divider.gif
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-divider.gif b/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-divider.gif
deleted file mode 100644
index 171e35e..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/bg-divider.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/icn-note.jpg
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/icn-note.jpg b/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/icn-note.jpg
deleted file mode 100644
index fb0f02f..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/icn-note.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/logo-big.png
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/logo-big.png b/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/logo-big.png
deleted file mode 100644
index e641b7d..0000000
Binary files a/site/src/main/resources/CLEREZZA-INF/web-resources/style/images/logo-big.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/style/style.css b/site/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
deleted file mode 100644
index af490cc..0000000
--- a/site/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
+++ /dev/null
@@ -1,431 +0,0 @@
-@charset "UTF-8";
-
-@font-face {
- font-family: Titillium Text;
- src: url('fonts/TitilliumText25L003.otf') format("opentype");
-}
-
-@font-face {
- font-family: Titillium Title;
- src: url('fonts/TitilliumTitle20.otf') format("opentype");
-
-}
-
-@font-face {
- font-family: Titillium Bold;
- src: url('fonts/TitilliumText25L001.otf') format("opentype");
-
-}
-
-
-.tx-blockcode {
- background-color: #e9f4cd;
- display: block;
- margin: 1em;
- padding: 0.5em;
- white-space: pre;
- font-family: monospace;
- font-size: 1.2em;
- -moz-border-radius: 5px;
- border-radius: 5px;
- overflow: auto;
-}
-
-.toc {
- padding: 0em 2em;
- background-color: white;
-}
-
-.toc li {
- margin-bottom: 0;
-}
-
-body {
- font-family: Arial, Helvetica;
- margin-left: 0em;
- margin-top:0em;
- margin-right:0em;
- color:#666666;
- font-size: 0.85em;
-}
-
-table {
- border-collapse: collapse;
- border: none;
-}
-
-table th, table td {
- padding: 0.25em;
- border: 1px solid #9a9a9a;
- border-right: none;
- border-top: none;
-}
-
-th {
- text-align: left;
- font-family: Titillium Bold, Arial, Helvetica;
-}
-
-td {
- font-size: 0.85em;
-}
-
-.first-col {
- border-left: none;
-}
-
-.center {
- text-align: center;
-}
-
-h1 {
- font-family: Titillium Title, Arial, Helvetica;
- margin-top: 0em;
- padding-bottom: 0.5em;
- border-bottom: 1px solid #A5A5A5;
- color:#000000;
-}
-
-h2 {
- font-family: Titillium Title, Arial, Helvetica;
- padding-bottom: 0.5em;
- border-bottom: 1px solid #A5A5A5;
- color:#000000;
-}
-
-h3 {
- font-family: Titillium Title, Arial, Helvetica;
- margin-bottom: 0.25em;
- color: #000000;
-}
-
-h4 {
- font-family: Titillium Title, Arial, Helvetica;
- margin-bottom: 0.05em;
-}
-
-h1 strong {
- font-family: Titillium Bold, Arial, Helvetica;
- color:#000000;
-}
-
-h2 strong {
- font-family: Titillium Bold, Arial, Helvetica;
- color:#000000;
-}
-
-h3 strong {
- font-family: Titillium Bold, Arial, Helvetica;
- color:#000000;
-}
-
-h4 strong {
- font-family: Titillium Bold, Arial, Helvetica;
- color:#000000;
-}
-
-span.note {
- background-image: url('images/icn-note.jpg');
- background-repeat: no-repeat;
- background-position: 0 0.5em;
- padding-left: 40px;
- display: block;
- margin: 1em;
-}
-
-.green {
- color:#98bf0e;
-}
-
-a {
- color: #98bf0e;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-ol li {
- list-style-type:decimal;
- color:#98bf0e;
- margin-bottom: 0.738em;
-}
-
-ul li {
- list-style-type:disc;
- color:#98bf0e;
- margin-bottom: 0.738em;
-}
-
-li div,span {
- color:#666666;
-}
-
-.bar {
- height: 38px;
- background-color:#98bf0e;
- background-image: url('images/bg-bar.png');
- background-repeat: repeat-x;
- width: 100%;
-}
-
-.logo {
- position: absolute;
- top: 0em;
- left: 4em;
-}
-
-.logo img{
- border: 0em;
-}
-
-.nav {
- margin-top:14em;
- margin-left:5em;
- width:192px;
-}
-
-.nav ul {
- margin-top:0em;
- padding-left:0em;
- font-size: 110%;
-}
-
-.nav > ul > li.top-nav-entry {
- list-style-type: none;
- margin-bottom: 2em;
- padding-bottom: 0.4em;
- /*border-bottom: 1px solid #666666;*/
-}
-
-.nav > ul > li .title {
- font-family: Titillium Text, Arial, Helvetica;
- font-size:1.4em;
- color: #98bf0e;
- padding-bottom: 0.6em;
- border-bottom: 2px solid #98bf0e;
-}
-
-.top-nav-entry ul > li {
- margin-top: 0.525em;
- margin-bottom: 0em;
- list-style-type: none;
-}
-
-.top-nav-entry ul > li a {
- font-size: 0.85em;
- color:#666666;
-}
-
-.top-nav-entry ul > li a.active {
- color: #98bf0e;
- text-decoration:underline;
-}
-
-.top-nav-entry ul > li a:hover {
- color: #98bf0e;
- text-decoration:underline;
-}
-
-.nav-entries {
- border-bottom: 1px solid #a5a5a5;
- padding-bottom: 0.8em;
-}
-
-.zz-control {
- float: right;
- margin-top:50px;
-}
-
-.zz-control .actions {
- margin-top:14em;
- color: #666666
-}
-
-.zz-control .actions a {
- color: #666666
-}
-
-.zz-content {
- margin-top:14em;
- margin-left:25em;
- /*width:70%;*/
- max-width:600px;
- line-height: 1.5em;
-
-}
-
-.zz-content img {
- max-width: 600px;
- /** border: 1px solid #666666; */
- margin: 0.5em;
- padding: 0.25em;
-}
-
-.zz-content ul {
- padding-left: 1.3em;
-}
-
-.zz-content .figure-desc {
- margin-left: 0.5em;
- font-size: 0.85em;
- font-style: italic;
-}
-
-.column {
- float:left;
- padding-bottom: 3.125em;
-}
-
-.zz-content .column {
-/* font-size: 0.85em;*/
-}
-
-.one-column {
- width:100%;
- min-width: 200px;
-}
-
-.first-column {
- width:48%;
- min-width: 200px;
- padding-right: 4%;
-}
-
-.second-column {
- min-width: 200px;
- width:48%;
-}
-
-.dark {
- background-color:#53534b;
- float:left;
- width:100%;
-}
-
-.footer {
- float:left;
- width:100%;
-}
-
-.footer .logos {
- margin-left: 22.25em;
- margin-bottom: 1.875em;
-}
-
-.footer img {
- float:none;
- border: none;
- padding-right: 2em;
-}
-
-.footer .copyright {
- color:#a4a49c;
- float: left;
- font-size:0.65em;
- text-align: center;
- width: 100%;
- margin: 32px 0px;
- line-height: 1.5em;
-}
-
-.footer .sitemap {
- background-image: url('images/bg-divider.gif');
- background-repeat: repeat-x;
- width: 100%;
-}
-
-.footer .sitemap-title {
- font-family: Titillium Text, Arial, Helvetica;
- float:left;
- margin-left: 4em;
- padding-top: 1.875em;
- padding-bottom: 0.9em;
- text-transform: uppercase;
- color: #ffffff;
- width: 19em;
- border-bottom: 1px solid #706f6b;
-}
-
-.footer .sitemap-content {
- margin-left: 22.25em;
- padding-top: 1.875em;
- color: #a4a49c;
-}
-
-.footer .sitemap-column {
- float:left;
- width: 12.6em;
-}
-
-/*.footer .title-line {
- border-bottom: 1px solid #a4a49c;
- height: 3em;
- margin-left: 3.125em;
- margin-top: 1.125em;
- position: absolute;
- width: 100%;
- max-width: 960px;
-}*/
-
-.footer .sitemap-column .title {
- font-family: Titillium Text, Arial, Helvetica;
- margin-bottom: 1.325em;
- border-bottom: 1px solid #706f6b;
- padding-bottom: 0.9em;
- text-transform: uppercase;
-}
-
-.footer .sitemap-column ul {
- margin-top:0em;
- padding-left:0em;
-}
-
-.footer .sitemap-column ul li {
- list-style-type:none;
- padding-left:0em;
- font-size: 0.75em;
-
-}
-
-.footer .sitemap-column a {
- color: #a4a49c;
-}
-
-.footer .sitemap-column a:hover {
- color: #98bf0e;
- text-decoration:underline;
-}
-
-.footer .divider {
- height: 0.375em;
- background-color:#98bf0e;
- width:22.25em;
-}
-
-div .module-info {
- /*margin-left:22.25em;*/
- position: absolute;
- left: 22.25em;
-}
-div .module-info div ol {
- height: 2em;
-}
-
-div .module-info div ol li {
- list-style: none outside none;
- float: left;
- margin: 0 0.14em;
- padding: 0 0.14em;
- border: 1px solid #9a9a9a;
- border-top: none;
- border-bottom: none;
- vertical-align: top;
-}
-
-div .module-info div ol li a {
- color: #a4a49c;
-}
-
-/* Localized */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/resources/CLEREZZA-INF/web-resources/thanks/index.html
----------------------------------------------------------------------
diff --git a/site/src/main/resources/CLEREZZA-INF/web-resources/thanks/index.html b/site/src/main/resources/CLEREZZA-INF/web-resources/thanks/index.html
deleted file mode 100644
index b9856d0..0000000
--- a/site/src/main/resources/CLEREZZA-INF/web-resources/thanks/index.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Apache Clerezza Special Thanks</title>
- <link rel="stylesheet" href="../style/style.css" type="text/css"/>
- </head>
-
- <body>
- <div class="zz-header">
- <div class="bar"></div>
- <div class="logo">
- <a href="../" style=""><img src="../images/logo.png" alt="logo" /></a>
- </div>
- </div>
- <div class="column nav">
- <ul>
- <li class="top-nav-entry"><div class="title">Documentation</div>
- <ul class="nav-entries">
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="../architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Project Infos</div>
- <ul class="nav-entries">
- <li><a href="../downloads/" >Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="../mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Sponsorship</div>
- <ul class="nav-entries">
- <li><a href="#" class="active">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </li>
- </ul>
- </div>
- <div class="zz-content">
- <div class="column one-column">
- <h1>Thanks</h1>
- <p>To all who have helped to make Apache Clerezza a reality. Specially we want to thank to:</p>
- <ul>
- <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Apache Software Foundation Sponsors</li>
- <li><div><a href="http://www.kti.admin.ch/" target="_blank">Confederation’s innovation promotion agency</a> for financing research </div></li>
- <li><div><a href="http://www.getunik.com/" target="_blank">getunik AG</a> for sponsoring the Clerezza T-Shirts and initial financial donations</div></li>
- <li><div><a href="http://www.unknown.de/" target="_blank">unknown?</a> for sponsoring the Clerezza Website Theme and Logo</div></li>
- </ul>
- </p>
-
- </div>
- </div>
- <div class="footer">
- <div class="logos"><img src="../images/feather.png" /><img src="../images/sw-vert-w3c.png" /><img src="../images/footer-logo.png" /></div>
- <div class="divider"></div>
- <div class="dark">
- <div class="sitemap">
- <div class="sitemap-title">Sitemap</div>
- <div class="sitemap-content">
- <div class="sitemap-column">
- <div class="title" >Documentation</div>
- <ul>
- <li><a href="../getting-started/">Getting Started</a></li>
- <li><a href="../architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://incubator.apache.org/clerezza/mvn-site" target="_blank">API docs</a></li>
- <li><a href="../faq/">FAQ</a></li>
- </ul>
-
- </div>
- <div class="sitemap-column">
- <div class="title" >Project Infos</div>
- <ul >
- <li><a href="../downloads/">Downloads</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="../mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
- <li><a href="http://svn.apache.org/viewvc/incubator/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </div>
- <div class="sitemap-column">
- <div class="title" >Sponsorship</div>
- <ul>
- <li><a href="#">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </div>
- </div>
-
- </div>
- <div class="copyright">Apache Clerezza, Clerezza, Apache, the Apache feather logo, and the Apache Clerezza project logo are trademarks of The Apache Software Foundation. <br></br>© 2011 The Apache Software Foundation.</div>
- </div>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/site/src/main/scala/Activator.scala b/site/src/main/scala/Activator.scala
deleted file mode 100644
index 7b9224b..0000000
--- a/site/src/main/scala/Activator.scala
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.apache.clerezza.site
-
-import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
-import scala.collection.JavaConversions.asJavaDictionary
-import org.apache.clerezza.platform.typerendering.{TypeRenderlet, RenderletManager}
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
-import org.apache.clerezza.rdf.core.access.TcManager
-import org.apache.clerezza.osgi.services.ServicesDsl
-import org.apache.clerezza.platform.Constants
-import org.apache.clerezza.rdf.core.event.{GraphEvent, FilterTriple, GraphListener}
-import org.apache.clerezza.rdf.core.serializedform.{Serializer, SupportedFormat, Parser}
-import java.io.{FileOutputStream, FileInputStream, File}
-
-/**
- * Activator for a bundle using Apache Clerezza.
- */
-class Activator extends BundleActivator {
-
- var renderletRegistration,
- titledContentRenderletRegistration,
- globalMenuRenderletRegistration: ServiceRegistration[TypeRenderlet] = null
- var graphListenerOption: Option[GraphListener] = null
-
- /**
- * called when the bundle is started, this method initializes the provided service
- */
- def start(context: BundleContext) {
- val servicesDsl = new ServicesDsl(context)
- import servicesDsl._
-
- val renderlet = new HeadedPageRenderlet
- renderletRegistration = context.registerService(classOf[TypeRenderlet],
- renderlet, null)
- titledContentRenderletRegistration = context.registerService(classOf[TypeRenderlet],
- new TitledContentRenderlet, null)
- globalMenuRenderletRegistration = context.registerService(classOf[TypeRenderlet],
- new GlobalMenuRenderlet, null)
- context.installBundle("mvn:org.apache.clerezza/rdf.stable.serializer").start();
- context.installBundle("mvn:org.apache.clerezza/tools.offline").start();
- val path = {
- val bl = context.getBundle.getLocation
- bl.substring(bl.indexOf(':')+1)
- }
- val graphFile = new File(new File(path), "graph.nt");
- doWith {
- (tcManager: TcManager, parser: Parser) => {
- val contentGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI)
- val fileGraph = parser.parse(new FileInputStream(graphFile), SupportedFormat.N_TRIPLE)
- if (contentGraph.size > fileGraph.size) {
- println("content graph if bigger than the graph from file, not replacing with the content from file and not " +
- "writing any data to the file, you should manually either write the content graph to the file or clear " +
- "the content graph. Restart this bundle after resolving the issue.")
- graphListenerOption = None
- } else {
- contentGraph.clear
- contentGraph.addAll(fileGraph)
- println("the content graph has been replaced with "+graphFile)
- object graphListener extends GraphListener {
- val serializer = $[Serializer]
- override def graphChanged(events: java.util.List[GraphEvent]) {
- serializer.serialize(new FileOutputStream(graphFile), contentGraph,SupportedFormat.N_TRIPLE)
- }
- }
- contentGraph.addGraphListener(graphListener, new FilterTriple(null, null, null), 2000)
- graphListenerOption = Some(graphListener)
- println("A GraphListener has been added that writes changes to the content graph to graph.nt")
- }
- }
- }
- }
-
-
- /**
- * called when the bundle is stopped, this method unregisters the provided service
- */
- def stop(context: BundleContext) {
- renderletRegistration.unregister()
- titledContentRenderletRegistration.unregister()
- globalMenuRenderletRegistration.unregister()
- val servicesDsl = new ServicesDsl(context)
- import servicesDsl._
- val tcManager = $[TcManager]
- val contentGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI)
- graphListenerOption match {
- case Some(l) => contentGraph.removeGraphListener(l)
- case None => ;
- }
- println("bye")
- }
-
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/site/src/main/scala/GlobalMenuRenderlet.scala b/site/src/main/scala/GlobalMenuRenderlet.scala
deleted file mode 100644
index 7f6e26b..0000000
--- a/site/src/main/scala/GlobalMenuRenderlet.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.clerezza.site
-
-import javax.ws.rs.core.MediaType
-import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.rdf.utils._
-import org.apache.clerezza.rdf.scala.utils.Preamble._
-import org.apache.clerezza.platform.typerendering.scala._
-import org.apache.clerezza.rdf.ontologies.DC
-
-/**
- * A Renderlet for the menu
- */
-class GlobalMenuRenderlet extends SRenderlet {
-
- val getRdfType = RDFS.Resource
-
- override def getModePattern = "menu"
-
- override def renderedPage(arguments: XmlResult.Arguments) = {
- new XmlResult(arguments) {
- def menuLink(href: String, label: String) =
- if ((res*).endsWith(href) || (res*).endsWith(href+"index")) {
- <a href={href} class="active">{label}</a>
- } else {
- <a href={href}>{label}</a>
- }
- override def content = {
- def menu(s: Any) = new UriRef("http://clerezza.org/2009/11/global-menu#"+s)
-def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
-def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
-def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
-
-resultDocModifier.addScriptReference("/style/scripts/login.js");
-
-
-<div class="column nav">
- <ul>
-
-
- {for (menuItem <- res/menu("globalMenu")!!) yield
- <li class="top-nav-entry"><div class="title">
- {
- if ((menuItem/menu("path")).length > 0) {
- <a href={menuItem/menu("path")*}>{(menuItem/rdfs("label")*)}</a>
- } else {
- <a href="#" onclick="return false">{(menuItem/rdfs("label")*)}</a>
- }
- }
- </div>
- {
- ifx ((menuItem/menu("children")).length > 0) {
- <div>
- <ul class="nav-entries">
- {
- for (childMenuItem <- menuItem/menu("children")!!) yield {
- <li><a href={childMenuItem/menu("path")*}>{childMenuItem/rdfs("label")*}</a><span>{childMenuItem/dct("description")*}</span></li>
- }
- }
- </ul>
- </div>
- }
- }
- </li>
- }
- </ul>
-</div>
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/site/src/main/scala/HeadedPageRenderlet.scala b/site/src/main/scala/HeadedPageRenderlet.scala
deleted file mode 100644
index 70f8275..0000000
--- a/site/src/main/scala/HeadedPageRenderlet.scala
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.apache.clerezza.site
-
-import javax.ws.rs.core.MediaType
-import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.rdf.utils._
-import org.apache.clerezza.rdf.scala.utils.Preamble._
-import org.apache.clerezza.platform.typerendering.scala._
-import org.apache.clerezza.rdf.ontologies.DC
-
-/**
- * A Renderlet for the menu
- */
-class HeadedPageRenderlet extends SRenderlet {
-
- val getRdfType = PLATFORM.HeadedPage
-
- override def getModePattern = "(?!.*naked).*"
-
- override def renderedPage(arguments: XmlResult.Arguments) = {
- new XmlResult(arguments) {
- def menuLink(href: String, label: String) =
- if ((res*).endsWith(href) || (res*).endsWith(href+"index")) {
- <a href={href} class="active">{label}</a>
- } else {
- <a href={href}>{label}</a>
- }
- override def content = {
- resultDocModifier.addStyleSheet("/style/style.css");
-resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
-/*resultDocModifier.addScriptReference("/jquery/jquery.menu.js");
-resultDocModifier.addScriptReference("/jquery/jquery.panel.js");
-resultDocModifier.addScriptReference("/style/scripts/panel.js");*/
-resultDocModifier.addScriptReference("/scripts/modification-status.js");
-resultDocModifier.addScriptReference("/scripts/status-message.js");
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- {(res/DISCOBITS.contains).find(e => ((e/DISCOBITS.pos*) == "0")) match {
- case Some(e) => <title>{render(e/DISCOBITS.holds, "naked")}</title>
- case None => <title>An incomplete titled content {res/DISCOBITS.contains*}</title>
- }
- }
- </head>
- <body>
- <div class="zz-header">
- <div class="bar"></div>
- <div class="logo">
- <a href="http://clerezza.apache.org/" style=""><img src="/images/logo.png" alt="logo" /></a>
- </div>
- <div class="module-info">
- <span id="tx-module">
- <div id="tx-page-actions">
- <ol id="tx-page-actions-ol">
- </ol>
- </div>
- </span>
- <div id="tx-module-tabs">
- <ol id="tx-module-tabs-ol">
- </ol>
-
- </div>
- </div>
-
- <div class="zz-control">
- <div class="login">
- {
- def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
- val username = (context/platform("user")/platform("userName")*)
- if((username).equals("anonymous")) {
- <span>
- <a href="#" id="tx-login-button">login</a>
- </span>
- } else {
- <span><a href={"/user/" + username + "/control-panel"}>{username}</a>|<a href="/logout">logout</a></span>
- }
- }
- </div>
- <div class="actions" id="tx-contextual-buttons">
- <ol id="tx-contextual-buttons-ol">
- </ol>
- </div>
- <div id="tx-module-options">
- <ol id="tx-module-options-ol">
- </ol>
- </div>
-
-
- <div class="tx-panel" id="tx-panel">
- <div id="tx-panel-title"><h3></h3></div>
- <div class="tx-panel-window">
- <div class="tx-panel-tab-buttons" id="tx-panel-tab-buttons">
- <ol id="tx-panel-tab-buttons-ol">
- </ol>
- </div>
- <div class="tx-panel-tabs" id="tx-panel-tabs"></div>
- </div>
- </div>
-
- </div>
- </div>
- {render(context,"menu")}
- <div class="zz-content">
- {
- if (mode == null) {
- render(res, "naked")
- } else {
- render(res, mode + "-naked")
- }
- }
- </div>
- <div class="footer">
- <div class="logos"><img src="/images/feather.png" /><img src="/images/sw-vert-w3c.png" /><img src="/images/footer-logo.png" /></div>
-
- <div class="divider"></div>
- <div class="dark">
- <div class="copyright">Apache Clerezza, Clerezza, Apache, the Apache feather logo, and the Apache Clerezza project logo are trademarks of The Apache Software Foundation. <br></br>© 2011 The Apache Software Foundation.</div>
- </div>
- </div>
- </body>
-</html>
-
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/site/src/main/scala/Ontology.scala b/site/src/main/scala/Ontology.scala
deleted file mode 100644
index 9fba93e..0000000
--- a/site/src/main/scala/Ontology.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package skeleton
-
-import org.apache.clerezza.rdf.core.UriRef
-
-object Ontology {
-
- /**
- * The uri for the RDF type of HelloWordMessage
- */
- val HelloWordMessageType = new UriRef("http://example.org/skeleton#HelloWordMessage")
-
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/src/main/scala/TitledContentRenderlet.scala
----------------------------------------------------------------------
diff --git a/site/src/main/scala/TitledContentRenderlet.scala b/site/src/main/scala/TitledContentRenderlet.scala
deleted file mode 100644
index 366d7d9..0000000
--- a/site/src/main/scala/TitledContentRenderlet.scala
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.apache.clerezza.site
-
-import javax.ws.rs.core.MediaType
-import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.rdf.utils._
-import org.apache.clerezza.rdf.scala.utils.Preamble._
-import org.apache.clerezza.platform.typerendering.scala._
-import org.apache.clerezza.rdf.ontologies.DC
-
-/**
- * A Renderlet for the menu
- */
-class TitledContentRenderlet extends SRenderlet {
-
- val getRdfType = DISCOBITS.TitledContent
-
- override def getModePattern = null
-
- override def renderedPage(arguments: XmlResult.Arguments) = {
- new XmlResult(arguments) {
- def menuLink(href: String, label: String) =
- if ((res*).endsWith(href) || (res*).endsWith(href+"index")) {
- <a href={href} class="active">{label}</a>
- } else {
- <a href={href}>{label}</a>
- }
- override def content = {
- <html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <link type="text/css" href="/style/style.css" rel="stylesheet" />
- {(res/DISCOBITS.contains).find(e => ((e/DISCOBITS.pos*) == "0")) match {
- case Some(e) => <title>{render(e/DISCOBITS.holds, "naked")}</title>
- case None => <title>An incomplete titled content {res/DISCOBITS.contains*}</title>
- }
- }
- </head>
- <body>
- <div class="zz-header">
-
- <div class="bar"></div>
- <div class="logo">
- <a href="http://clerezza.apache.org/" style=""><img src="/images/logo.png" alt="logo" /></a>
- </div>
- </div>
- <div class="column nav">
- <ul>
- <li class="top-nav-entry"><div class="title">Documentation</div>
-
- <ul class="nav-entries">
- <li>{menuLink("/getting-started/","Getting Started")}</li>
- <li>{menuLink("/architecture/","The Apache Clerezza Stack")}</li>
- <li><a href="http://clerezza.apache.org/apidocs/" target="_blank">API docs</a></li>
- <li>{menuLink("/faq/","FAQ")}</li>
- </ul>
- </li>
-
- <li class="top-nav-entry"><div class="title">Project Infos</div>
- <ul class="nav-entries">
- <li>{menuLink("/downloads/","Downloads")}</li>
- <li>{menuLink("/contributing/", "Contributing")}</li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li>{menuLink("/mailinglists/","Mailing lists")}</li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
-
- <li><a href="http://svn.apache.org/viewvc/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </li>
- <li class="top-nav-entry"><div class="title">Sponsorship</div>
- <ul class="nav-entries">
- <li><a href="/thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </li>
- </ul>
- </div>
-
- <div class="zz-content">
- {render(res, "naked")}
- </div>
- <div class="footer">
- <div class="logos"><img src="/images/feather.png" /><img src="/images/sw-vert-w3c.png" /><img src="/images/footer-logo.png" /></div>
-
- <div class="divider"></div>
- <div class="dark">
- <div class="sitemap">
- <div class="sitemap-title">Sitemap</div>
- <div class="sitemap-content">
- <div class="sitemap-column">
- <div class="title" >Documentation</div>
- <ul>
-
- <li><a href="/getting-started/">Getting Started</a></li>
- <li><a href="/architecture/">The Apache Clerezza Stack</a></li>
- <li><a href="http://clerezza,apache.org/apidocs/" target="_blank">API docs</a></li>
- <li><a href="/faq/">FAQ</a></li>
- </ul>
-
- </div>
- <div class="sitemap-column">
-
- <div class="title" >Project Infos</div>
- <ul >
- <li><a href="/downloads/">Downloads</a></li>
- <li><a href="/contributing/">Contributing</a></li>
- <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
- <li><a href="mailinglists/">Mailing lists</a></li>
- <li><a href="http://issues.apache.org/jira/browse/CLEREZZA" target="_blank">Issue Tracker</a></li>
-
- <li><a href="http://svn.apache.org/viewvc/clerezza/trunk/" target="_blank">Source Repository</a></li>
- </ul>
- </div>
- <div class="sitemap-column">
- <div class="title" >Sponsorship</div>
- <ul>
- <li><a href="/thanks/">Thanks</a></li>
- <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Become a Sponsor</a></li>
- <li><a href="http://www.apache.org/foundation/buy_stuff.html" target="_blank">Buy Stuff</a></li>
- </ul>
- </div>
- </div>
-
- </div>
- <div class="copyright">Apache Clerezza, Clerezza, Apache, the Apache feather logo, and the Apache Clerezza project logo are trademarks of The Apache Software Foundation. <br></br>© 2011 The Apache Software Foundation.</div>
- </div>
- </div>
-
-
- </body>
- </html>
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95328ac1/site/troubleshooting.txt
----------------------------------------------------------------------
diff --git a/site/troubleshooting.txt b/site/troubleshooting.txt
deleted file mode 100644
index 3f59304..0000000
--- a/site/troubleshooting.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Troubleshooting
-
-If things don't just work as described in the readme.
-
-Getting the content graph manually:
-- curl -u admin:admin -H "Accept: text/rdf+nt" http://localhost:8080/graph?name=urn:x-localinstance:/content.graph > graph.nt
-
-Manually deploying:
-- retrieve a zipped offline version from http://localhost:8080/admin/offline/download?baseUri=http://localhost:8080/&targetUri=http://incubator.apache.org/clerezza/&formatExtension=xhtml&formatExtension=rdf&formatExtension=png&formatExtension=html&formatExtension=js&formatExtension=jpeg&rootLinkPrefix=/clerezza
-- scp site<id>.zip people.apache.org:/www/incubator.apache.org/clerezza
-- on people.apache.org: unzip -o site<id>.zip
-
-
-NOTES:
-- as the documentation at /documentation is not a resource in rdf it wasn't
-contained in the oflline site, so I added a resource with that URI
-- to have the content of index-resources displayed on localhost you need to create the respective collection, otherwise the resource can only be accessed with the URI ending with "/index". This can be done on the clerzza shell as follows:
-
-
-import rdf.core._
-import rdf.core.impl._
-import rdf.ontologies._
-import platform.graphprovider.content.ContentGraphProvider
-val cgp = $[ContentGraphProvider]
-val cg = cgp.getContentGraph
-cg.add(new TripleImpl(new UriRef("http://localhost:8080/downloads/"), RDF.`type`, HIERARCHY.Collection))
-