[02/51] [partial] clerezza git commit: CLEREZZA-966: started hierarchical project structure, moved platform bundles to platform, only moved RDF artifacts ported to use commons to the rdf folder.

[re...@apache.org]

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.style.default/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/resources/CLEREZZA-INF/web-resources/style/style.css b/platform.style.default/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
deleted file mode 100644
index a5a7896..0000000
--- a/platform.style.default/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-@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-content {
-	
-}
-
-.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;
-}
-
-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:11em;
-	margin-left:4em;
-	width:192px;
-}
-
-.nav ul {
-	margin-top:0em;
-	padding-left:0em;
-}
-
-.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;
-	margin-right: 1em;
-}
-
-.zz-control .actions {
-	margin-top:11em;
-	color: #666666
-}
-
-.zz-control .actions a {
-	color: #666666
-}
-
-.zz-content {
-	margin-top:11em;
-	margin-left:22.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.15em;
-	padding: 0 0.15em;
-	border: 1px solid #9a9a9a;
-	border-top: none;
-	border-bottom: none;
-	vertical-align: top;
-}
-
-div .module-info div ol li a {
-	color: #a4a49c;
-}
-
-#tx-contextual-buttons ol li {
-	list-style-type: none
-}
-
-#tx-result ol li {
-	list-style-type: none
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.style.default/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/Activator.scala b/platform.style.default/src/main/scala/Activator.scala
deleted file mode 100644
index a6a687b..0000000
--- a/platform.style.default/src/main/scala/Activator.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.clerezza.platform.style.default
-
-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.ActivationHelper
-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 ActivationHelper {
-
-  registerRenderlet(new GlobalMenuRenderlet)
-  registerRenderlet(new HeadedPageRenderlet)
-  registerRenderlet(new CollectionHeader)
-  registerRenderlet(new RdfListRenderlet)
-  
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.style.default/src/main/scala/CollectionHeader.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/CollectionHeader.scala b/platform.style.default/src/main/scala/CollectionHeader.scala
deleted file mode 100644
index 97fd00c..0000000
--- a/platform.style.default/src/main/scala/CollectionHeader.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.clerezza.platform.style.default
-
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.rdf.scala.utils.RichGraphNode
-import org.apache.clerezza.rdf.scala.utils.Preamble._
-
-/**
- * A Renderlet for the menu
- */
-class CollectionHeader extends HeadedPageRenderlet {
-
-  override val getRdfType = HIERARCHY.Collection
-
-  override def defaultTitle(res: RichGraphNode) = (res*) +  " (Collection)"
-
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
deleted file mode 100644
index 26c5272..0000000
--- a/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.clerezza.platform.style.default
-
-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)
-
-<div class="column nav">
-              <ul>
-                
-
-  { ifx ((res/menu("globalMenu")).length > 0) {
-      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/af0d99b2/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/HeadedPageRenderlet.scala b/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
deleted file mode 100644
index f5c0106..0000000
--- a/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.clerezza.platform.style.default
-
-import java.net.URLEncoder
-import javax.ws.rs.core.MediaType
-import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.scala.utils.RichGraphNode
-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).*"
-
-  protected def defaultTitle(res: RichGraphNode) = "An incomplete titled content "+(res/DISCOBITS.contains*)
-
-  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>{defaultTitle(res)}</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")*
-              val displayName = if ((context/platform("user")/FOAF.name).length == 0) {
-                    userName
-                  } else {
-                    context/platform("user")/FOAF.name*
-                  }
-              if((userName).equals("anonymous")) {
-                <span>
-                  <a href= {"/login?referer="+URLEncoder.encode(uriInfo.getAbsolutePath.toString, "utf-8")}
-                        id="tx-login-button">login</a>
-                </span>
-              } else {
-                <span><a href={"/user/" + userName + "/control-panel"}>{displayName}</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/af0d99b2/platform.style.default/src/main/scala/RdfListRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/RdfListRenderlet.scala b/platform.style.default/src/main/scala/RdfListRenderlet.scala
deleted file mode 100644
index 2425d24..0000000
--- a/platform.style.default/src/main/scala/RdfListRenderlet.scala
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.clerezza.platform.style.default
-
-import org.apache.clerezza.platform.typerendering._
-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._
-
-/**
- * A Renderlet for rdf:ListS
- */
-class RdfListRenderlet extends SRenderlet {
-
-  val getRdfType = RDF.List
-
-  
-  override def renderedPage(arguments: XmlResult.Arguments) = {
-    new XmlResult(arguments) {
-      override def content = {
-        <div id="tx-content" class="list">
-          {for (entry <- res!!) yield
-            <div class="entry">
-              {render(entry, mode)}
-            </div>
-          }
-        </div>
-      }
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.jaxrs2/LICENSE
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.jaxrs2/LICENSE b/platform.typehandlerspace.jaxrs2/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform.typehandlerspace.jaxrs2/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.jaxrs2/nbactions.xml
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.jaxrs2/nbactions.xml b/platform.typehandlerspace.jaxrs2/nbactions.xml
deleted file mode 100644
index 9690e1a..0000000
--- a/platform.typehandlerspace.jaxrs2/nbactions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-  <action>
-    <actionName>CUSTOM-deploy to localhost:8080</actionName>
-    <displayName>deploy to localhost:8080</displayName>
-    <goals>
-      <goal>install</goal>
-      <goal>org.apache.sling:maven-sling-plugin:install</goal>
-    </goals>
-  </action>
-</actions>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.jaxrs2/pom.xml
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.jaxrs2/pom.xml b/platform.typehandlerspace.jaxrs2/pom.xml
deleted file mode 100644
index c7aed18..0000000
--- a/platform.typehandlerspace.jaxrs2/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.typehandlerspace.jaxrs</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform Type Handler Space Jaxrs 2.0 Based Implementation</name>
-    <dependencies>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typehandlerspace</artifactId>
-            <version>0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphnodeprovider</artifactId>
-            <version>0.2</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java b/platform.typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
deleted file mode 100644
index 75e91f8..0000000
--- a/platform.typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.typehandlerspace.jaxrs;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
-import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-
-
-/**
- * When handling a request <code>TypeHandlerSpace</code> checks if a resource
- * with the requested URI exists in the content graph. If that is the case, then a
- * TypeHandler according the rdf-type(s) of the requested resource is used to
- * handle the request and resource. If there is no resource, then a fallback
- * TypeHandler will be used to handle the request. A TypeHandler is a jaxrs
- * resource, that is registered with TypeHandlerDiscovery to handle a specific
- * rdf-type.
- * 
- * 
-  */
-@Component
-@Service(Object.class)
-@Property(name="javax.ws.rs", boolValue=true)
-@Path("")
-public class TypeHandlerSpace {
-
-    @Reference
-    GraphNodeProvider gnp;
-
-    @Reference
-    TypeHandlerDiscovery typeHandlerDiscovery;
-    
-    private final String DESCRIPTION_SUFFIX = "-description";
-    private DescriptionHandler descriptionHandler = new DescriptionHandler();
-
-    /**
-     * Returns a TypeHandler according the most important rdf-type of the
-     * requested resource.
-     * 
-     * @param uriInfo
-     * @param request
-     * @return
-     */
-    @Path("{path : .*}")
-    public Object getTypeHandler(@Context UriInfo uriInfo, 
-            @Context Request request) {
-        String absoluteUriPath = uriInfo.getAbsolutePath().toString();
-        if (absoluteUriPath.endsWith(DESCRIPTION_SUFFIX)) {
-            if (request.getMethod().equalsIgnoreCase("GET")) {
-                return descriptionHandler;
-            }
-        }
-        return getTypeHandler(absoluteUriPath);
-                
-    }
-
-    private Object getTypeHandler(String absoluteUriPath) {
-        UriRef uri = new UriRef(absoluteUriPath);
-        if (gnp.existsLocal(uri)) {
-            GraphNode node = gnp.getLocal(uri);
-            Lock lock =node.readLock();
-            lock.lock();
-            try {
-                Set<UriRef> rdfTypes = getRdfTypesOfUriRef(node);
-                return typeHandlerDiscovery.getTypeHandler(rdfTypes);
-            } finally {
-                lock.unlock();
-            }
-        }
-        
-        return null;
-    }
-
-    private Set<UriRef> getRdfTypesOfUriRef(GraphNode node) {
-        Set<UriRef> rdfTypes = new HashSet<UriRef>();
-        Iterator<Resource> types = node.getObjects(RDF.type);
-        while (types.hasNext()) {
-            Resource typeStmtObj = types.next();
-            if (!(typeStmtObj instanceof UriRef)) {
-                throw new RuntimeException(
-                        "RDF type is expected to be a URI but is " + typeStmtObj
-                        + "(of " + node.getNode() + ")");
-            }
-            UriRef rdfType = (UriRef) typeStmtObj;
-            rdfTypes.add(rdfType);
-        }
-        
-        return rdfTypes;
-    }
-
-    public class DescriptionHandler {
-
-        @GET
-        public Object getDescription(@Context UriInfo uriInfo){
-            String absoluteUriPath = uriInfo.getAbsolutePath().toString();
-            //MGraph contentMGraph = cgp.getContentGraph();
-                UriRef uri = new UriRef(absoluteUriPath.substring(0,
-                        absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
-                GraphNode graphNode = gnp.getLocal(uri);
-                return graphNode.getNodeContext();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.wink/LICENSE
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.wink/LICENSE b/platform.typehandlerspace.wink/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform.typehandlerspace.wink/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.wink/pom.xml
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.wink/pom.xml b/platform.typehandlerspace.wink/pom.xml
deleted file mode 100644
index f677767..0000000
--- a/platform.typehandlerspace.wink/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.typehandlerspace.wink</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform Type Handler Space Wink Based Implementation</name>
-    <dependencies>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typehandlerspace</artifactId>
-            <version>0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphnodeprovider</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>jaxrs.extensions</artifactId>
-            <version>0.6</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace.wink/src/main/java/org/apache/clerezza/platform/typehandlerspace/wink/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace.wink/src/main/java/org/apache/clerezza/platform/typehandlerspace/wink/TypeHandlerSpace.java b/platform.typehandlerspace.wink/src/main/java/org/apache/clerezza/platform/typehandlerspace/wink/TypeHandlerSpace.java
deleted file mode 100644
index 7cad851..0000000
--- a/platform.typehandlerspace.wink/src/main/java/org/apache/clerezza/platform/typehandlerspace/wink/TypeHandlerSpace.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.typehandlerspace.wink;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.clerezza.jaxrs.extensions.ResourceMethodException;
-import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
-import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.wink.osgi.WinkRequestProcessor;
-
-
-/**
- * When handling a request <code>TypeHandlerSpace</code> checks if a resource
- * with the requested URI exists in the content graph. If that is the case, then a
- * TypeHandler according the rdf-type(s) of the requested resource is used to
- * handle the request and resource. If there is no resource, then a fallback
- * TypeHandler will be used to handle the request. A TypeHandler is a jaxrs
- * resource, that is registered with TypeHandlerDiscovery to handle a specific
- * rdf-type.
- * 
- * 
-  */
-@Component(immediate = true, metatype = false)
-@Service(value = javax.servlet.Filter.class)
-@Properties({
-    @Property(name ="pattern", value=".*"),
-    @Property(name ="service.ranking", intValue=100)
-    
-})
-public class TypeHandlerSpace implements Filter {
-
-    @Reference
-    GraphNodeProvider gnp;
-
-    @Reference
-    TypeHandlerDiscovery typeHandlerDiscovery;
-
-    
-    @Reference
-    private WinkRequestProcessor winkProvider;
-    
-    private final String DESCRIPTION_SUFFIX = "-description";
-    private DescriptionHandler descriptionHandler = new DescriptionHandler();
-
-    
-    public void init(FilterConfig filterConfig) throws ServletException {
-        //no initialization needed
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response,
-            FilterChain chain) throws IOException, ServletException {
-        if (request instanceof HttpServletRequest) {
-            doFilter((HttpServletRequest)request, (HttpServletResponse)response, chain);
-        } else {
-            chain.doFilter(request, response);
-        }    
-    }
-    
-    public void doFilter(HttpServletRequest request, HttpServletResponse response,
-            FilterChain chain) throws IOException, ServletException {
-        try {
-            Object resource = getTypeHandler(request.getRequestURL().toString());
-            if (resource != null) {
-                winkProvider.handleRequest(request, response, resource);
-            } else {
-                chain.doFilter(request, response);
-            }
-        } catch (ResourceMethodException ex) {
-            throw new ServletException(ex);
-        }
-        
-    }
-
-    public void destroy() {
-        //not
-    }
-
-    /**
-     * Returns a TypeHandler according the most important rdf-type of the
-     * requested resource.
-     * 
-     * @param uriInfo
-     * @param request
-     * @return
-     * @throws ResourceMethodException
-     */
-    /*@Path("{path:.*}")
-    public Object getHandler(@Context UriInfo uriInfo,
-            @Context Request request) throws ResourceMethodException  {
-        String absoluteUriPath = uriInfo.getAbsolutePath().toString();
-        if (absoluteUriPath.endsWith(DESCRIPTION_SUFFIX)) {
-            if (request.getMethod().equalsIgnoreCase("GET")) {
-                return descriptionHandler;
-            }
-        }
-        return getTypeHandler(absoluteUriPath);
-    }*/
-
-    private Object getTypeHandler(String absoluteUriPath) throws ResourceMethodException {
-        UriRef uri = new UriRef(absoluteUriPath);
-        if (gnp.existsLocal(uri)) {
-            GraphNode node = gnp.getLocal(uri);
-            Lock lock =node.readLock();
-            lock.lock();
-            try {
-                Set<UriRef> rdfTypes = getRdfTypesOfUriRef(node);
-                return typeHandlerDiscovery.getTypeHandler(rdfTypes);
-            } finally {
-                lock.unlock();
-            }
-        }
-        
-        return null;
-    }
-
-    private Set<UriRef> getRdfTypesOfUriRef(GraphNode node) {
-        Set<UriRef> rdfTypes = new HashSet<UriRef>();
-        Iterator<Resource> types = node.getObjects(RDF.type);
-        while (types.hasNext()) {
-            Resource typeStmtObj = types.next();
-            if (!(typeStmtObj instanceof UriRef)) {
-                throw new RuntimeException(
-                        "RDF type is expected to be a URI but is " + typeStmtObj
-                        + "(of " + node.getNode() + ")");
-            }
-            UriRef rdfType = (UriRef) typeStmtObj;
-            rdfTypes.add(rdfType);
-        }
-        
-        return rdfTypes;
-    }
-
-    public class DescriptionHandler {
-
-        @GET
-        public Object getDescription(@Context UriInfo uriInfo){
-            String absoluteUriPath = uriInfo.getAbsolutePath().toString();
-            //MGraph contentMGraph = cgp.getContentGraph();
-                UriRef uri = new UriRef(absoluteUriPath.substring(0,
-                        absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
-                GraphNode graphNode = gnp.getLocal(uri);
-                return graphNode.getNodeContext();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace/LICENSE
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace/LICENSE b/platform.typehandlerspace/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform.typehandlerspace/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace/pom.xml
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace/pom.xml b/platform.typehandlerspace/pom.xml
deleted file mode 100644
index 43756c3..0000000
--- a/platform.typehandlerspace/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.5</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.typehandlerspace</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform Type Handler Space</name>
-    <dependencies>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>0.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>0.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>0.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typepriority</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <!--  
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphnodeprovider</artifactId>
-            <version>0.2-SNAPSHOT</version>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.xsite</groupId>
-                <artifactId>xsite-maven-plugin</artifactId>
-                <configuration>
-                    <sourceDirectoryPath>${basedir}/src/site/xsite</sourceDirectoryPath>
-                    <sitemapPath>content/sitemap.xml</sitemapPath>
-                    <skinPath>templates/skin.html</skinPath>
-                    <outputDirectoryPath>${basedir}/target/site/documentation</outputDirectoryPath>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/OPTIONS.java
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/OPTIONS.java b/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/OPTIONS.java
deleted file mode 100644
index 670693b..0000000
--- a/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/OPTIONS.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.typehandlerspace;
-
-import javax.ws.rs.HttpMethod;
-
-/**
- * @author mir
- * @deprecated As the is {@link javax.ws.rs.OPTIONS)
- */
-@java.lang.annotation.Target(value={java.lang.annotation.ElementType.METHOD})
-@java.lang.annotation.Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@HttpMethod(value="OPTIONS")
-@Deprecated
-public abstract @interface OPTIONS {
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/SupportedTypes.java
----------------------------------------------------------------------
diff --git a/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/SupportedTypes.java b/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/SupportedTypes.java
deleted file mode 100644
index 012387a..0000000
--- a/platform.typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/SupportedTypes.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.typehandlerspace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author rbn
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SupportedTypes {
-
-    /**
-     *
-     * @return the URIs of the types supported by this TypeHandler
-     */
-    public String[] types();
-
-    /**
-     * Indicates if this TypeHandler has to be prepended or appended to the
-     * list of TypeHandlers. Normally a typehandler is to be prepended, this
-     * option is only set to false in the rare case when one is installing a
-     * fallback-handler.
-     *
-     * @return true is the typehandler has to be prepended to the list of TypeHandlers
-     */
-    public boolean prioritize() default true;
-}