You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ha...@apache.org on 2019/02/14 21:32:56 UTC

[clerezza] branch reunited updated: CLEREZZA-1033: Delete rdf module

This is an automated email from the ASF dual-hosted git repository.

hasan pushed a commit to branch reunited
in repository https://gitbox.apache.org/repos/asf/clerezza.git


The following commit(s) were added to refs/heads/reunited by this push:
     new 30d4d8c  CLEREZZA-1033: Delete rdf module
30d4d8c is described below

commit 30d4d8c85d1936ce5d56070f825786685df7c77a
Author: Hasan <ha...@apache.org>
AuthorDate: Thu Feb 14 22:32:43 2019 +0100

    CLEREZZA-1033: Delete rdf module
---
 rdf/core.test/LICENSE                              |  201 ---
 rdf/core.test/pom.xml                              |   51 -
 .../apache/clerezza/rdf/core/test/GraphTest.java   |  573 ---------
 .../clerezza/rdf/core/test/GraphWrapper.java       |  126 --
 .../apache/clerezza/rdf/core/test/LockChecker.java |   39 -
 .../core/test/LockableMGraphWrapperForTesting.java |   75 --
 .../rdf/core/test/LockingIteratorForTesting.java   |   79 --
 .../apache/clerezza/rdf/core/test/RandomGraph.java |  237 ----
 .../clerezza/rdf/core/test/TcProviderTest.java     |  484 --------
 rdf/core/LICENSE                                   |  201 ---
 rdf/core/nbactions.xml                             |   11 -
 rdf/core/pom.xml                                   |  136 --
 .../src/main/appended-resources/META-INF/NOTICE    |    7 -
 .../core/access/EntityAlreadyExistsException.java  |   50 -
 .../core/access/EntityUndeletableException.java    |   50 -
 .../core/access/ImmutableGraphServiceFactory.java  |   58 -
 .../rdf/core/access/MGraphServiceFactory.java      |   54 -
 .../rdf/core/access/NoSuchEntityException.java     |   51 -
 .../rdf/core/access/QueryableTcProvider.java       |   43 -
 .../rdf/core/access/ReadOnlyException.java         |   50 -
 .../clerezza/rdf/core/access/SecuredGraph.java     |  198 ---
 .../apache/clerezza/rdf/core/access/TcManager.java |  626 ----------
 .../clerezza/rdf/core/access/TcProvider.java       |  151 ---
 .../rdf/core/access/TcProviderMultiplexer.java     |  457 -------
 .../core/access/WeightedProviderComparator.java    |   41 -
 .../rdf/core/access/WeightedTcProvider.java        |   36 -
 .../apache/clerezza/rdf/core/access/package.html   |   56 -
 .../core/access/security/TcAccessController.java   |  354 ------
 .../rdf/core/access/security/TcPermission.java     |  149 ---
 .../clerezza/rdf/core/serializedform/Parser.java   |  328 -----
 .../rdf/core/serializedform/ParsingProvider.java   |   49 -
 .../rdf/core/serializedform/Serializer.java        |  270 ----
 .../core/serializedform/SerializingProvider.java   |   49 -
 .../rdf/core/serializedform/SupportedFormat.java   |   61 -
 .../serializedform/UnsupportedFormatException.java |   37 -
 .../UnsupportedParsingFormatException.java         |   35 -
 .../UnsupportedSerializationFormatException.java   |   35 -
 .../src/main/resources/META-INF/documentation.nt   |  286 -----
 .../documentation/images/scb_architecture.png      |  Bin 1791422 -> 0 bytes
 .../documentation/scb-triaxrs-tutorial/LICENSE     |  201 ---
 .../documentation/scb-triaxrs-tutorial/pom.xml     |   59 -
 .../clerezza/combined/tutorial/TutorialApp.java    |  131 --
 .../apache/clerezza/combined/tutorial/data.turtle  |   32 -
 .../clerezza/combined/tutorial/tutorial.xhtml      |   47 -
 .../documentation/style/documentation.css          |   34 -
 .../site/resources/documentation/style/style.css   |  421 -------
 .../site/resources/documentation/tutorial1/LICENSE |  201 ---
 .../site/resources/documentation/tutorial1/pom.xml |  106 --
 .../clerezza/scb/tutorial1/Tutorial1App.java       |  305 -----
 rdf/core/src/site/resources/images/clerezza.png    |  Bin 7113 -> 0 bytes
 rdf/core/src/site/site.xml                         |   32 -
 rdf/core/src/site/xsite/content/overview.xhtml     |  216 ----
 .../site/xsite/content/scb-triaxrs-tutorial.xhtml  |  384 ------
 rdf/core/src/site/xsite/content/sitemap.xml        |   31 -
 rdf/core/src/site/xsite/content/tutorial_1.xhtml   |  491 --------
 rdf/core/src/site/xsite/templates/skin.html        |   71 --
 .../clerezza/rdf/core/access/SecurityTest.java     |  180 ---
 .../clerezza/rdf/core/access/TcManagerTest.java    |  302 -----
 .../rdf/core/access/providers/WeightedA.java       |  103 --
 .../rdf/core/access/providers/WeightedA1.java      |  104 --
 .../rdf/core/access/providers/WeightedAHeavy.java  |  103 --
 .../rdf/core/access/providers/WeightedBlight.java  |  107 --
 .../rdf/core/access/providers/WeightedDummy.java   |  156 ---
 .../core/impl/util/SimpleLiteralFactoryTest.java   |   63 -
 .../rdf/core/impl/util/W3CDateFormatTest.java      |   71 --
 .../rdf/core/serializedform/ParserTest.java        |   89 --
 .../rdf/core/serializedform/SerializerTest.java    |   89 --
 .../serializedform/TestServiceManagedProvider.java |   49 -
 ...che.clerezza.rdf.core.access.WeightedTcProvider |   18 -
 ...lerezza.rdf.core.serializedform.ParsingProvider |   18 -
 rdf/ontologies/LICENSE                             |  201 ---
 rdf/ontologies/pom.xml                             |   78 --
 .../org/apache/clerezza/rdf/ontologies/SKOS.java   |   27 -
 .../clerezza/rdf/ontologies/contentprototype.rdf   |   51 -
 .../org/apache/clerezza/rdf/ontologies/dap.rdf     |   61 -
 .../org/apache/clerezza/rdf/ontologies/dc.rdf      |  204 ---
 .../org/apache/clerezza/rdf/ontologies/dcterms.rdf | 1086 ----------------
 .../apache/clerezza/rdf/ontologies/discobits.rdf   |  144 ---
 .../clerezza/rdf/ontologies/documentation.rdf      |  154 ---
 .../org/apache/clerezza/rdf/ontologies/exif.rdf    | 1311 --------------------
 .../org/apache/clerezza/rdf/ontologies/foaf.rdf    |  604 ---------
 .../apache/clerezza/rdf/ontologies/hierarchy.rdf   |   68 -
 .../org/apache/clerezza/rdf/ontologies/lingvoj.rdf |  273 ----
 .../org/apache/clerezza/rdf/ontologies/list.rdf    |  126 --
 .../org/apache/clerezza/rdf/ontologies/menu.rdf    |   42 -
 .../org/apache/clerezza/rdf/ontologies/osgi.rdf    |   99 --
 .../org/apache/clerezza/rdf/ontologies/owl.rdf     |  288 -----
 .../apache/clerezza/rdf/ontologies/permission.rdf  |  157 ---
 .../apache/clerezza/rdf/ontologies/platform.rdf    |  145 ---
 .../org/apache/clerezza/rdf/ontologies/rdf.rdf     |  131 --
 .../org/apache/clerezza/rdf/ontologies/rdfs.rdf    |  130 --
 .../org/apache/clerezza/rdf/ontologies/script.rdf  |  106 --
 .../org/apache/clerezza/rdf/ontologies/sioc.rdf    |  806 ------------
 .../org/apache/clerezza/rdf/ontologies/skos04.rdf  |  468 -------
 .../org/apache/clerezza/rdf/ontologies/skos08.rdf  |  565 ---------
 .../apache/clerezza/rdf/ontologies/tcprovider.rdf  |   71 --
 .../org/apache/clerezza/rdf/ontologies/vcard.rdf   | 1059 ----------------
 .../org/apache/clerezza/rdf/ontologies/xsd.n3      |  117 --
 rdf/pom.xml                                        |   56 -
 rdf/scala.utils/LICENSE                            |  201 ---
 rdf/scala.utils/pom.xml                            |  131 --
 .../clerezza/rdf/scala/utils/CollectedIter.scala   |  133 --
 .../clerezza/rdf/scala/utils/EzLiteral.scala       |   81 --
 .../apache/clerezza/rdf/scala/utils/EzMGraph.scala |   88 --
 .../clerezza/rdf/scala/utils/NameSpace.scala       |   37 -
 .../apache/clerezza/rdf/scala/utils/Preamble.scala |  123 --
 .../clerezza/rdf/scala/utils/RichGraphNode.scala   |  244 ----
 .../clerezza/rdf/scala/utils/EzMGraphTest.scala    |  161 ---
 .../rdf/scala/utils/RichGraphNodeTest.scala        |  174 ---
 .../rdf/scala/utils/TypeConversionTest.scala       |   74 --
 rdf/schemagen/main/LICENSE                         |  201 ---
 rdf/schemagen/main/pom.xml                         |   99 --
 rdf/schemagen/main/src/assembly/dist.xml           |   48 -
 .../apache/clerezza/rdf/schemagen/SchemaGen.java   |  486 --------
 .../clerezza/rdf/schemagen/SchemaGenArguments.java |   49 -
 rdf/schemagen/maven-plugin/LICENSE                 |  201 ---
 rdf/schemagen/maven-plugin/pom.xml                 |   60 -
 .../OntologyJavaClassCreatorMojo.java              |  203 ---
 rdf/simple.storage/LICENSE                         |  201 ---
 rdf/simple.storage/pom.xml                         |   75 --
 .../rdf/simple/storage/SimpleTcProvider.java       |  172 ---
 ...che.clerezza.rdf.core.access.WeightedTcProvider |    1 -
 .../rdf/simple/storage/AccessViaTcManager.java     |   37 -
 .../rdf/simple/storage/GenericTcProviderTest.java  |   43 -
 .../rdf/simple/storage/SimpleGraphGenericTest.java |   37 -
 rdf/utils/LICENSE                                  |  201 ---
 rdf/utils/pom.xml                                  |   69 --
 .../org/apache/clerezza/rdf/utils/GraphNode.java   |  720 -----------
 .../org/apache/clerezza/rdf/utils/GraphUtils.java  |  163 ---
 .../org/apache/clerezza/rdf/utils/IRIUtil.java     |   63 -
 .../org/apache/clerezza/rdf/utils/RdfList.java     |  358 ------
 .../apache/clerezza/rdf/utils/SeeAlsoExpander.java |  113 --
 .../org/apache/clerezza/rdf/utils/Smusher.java     |   61 -
 .../org/apache/clerezza/rdf/utils/UnionGraph.java  |  286 -----
 .../clerezza/rdf/utils/UnionWatchableGraph.java    |   54 -
 .../clerezza/rdf/utils/UriMutatingGraph.java       |  223 ----
 .../utils/graphnodeprovider/GraphNodeProvider.java |   51 -
 .../clerezza/rdf/utils/smushing/BaseSmusher.java   |  135 --
 .../clerezza/rdf/utils/smushing/IfpSmusher.java    |  174 ---
 .../clerezza/rdf/utils/smushing/SameAsSmusher.java |  113 --
 .../apache/clerezza/rdf/utils/GraphUtilsTest.java  |  104 --
 .../apache/clerezza/rdf/utils/IfpSmushTest.java    |  115 --
 .../org/apache/clerezza/rdf/utils/RdfListTest.java |  183 ---
 .../apache/clerezza/rdf/utils/SameAsSmushTest.java |   78 --
 .../apache/clerezza/rdf/utils/TestGraphNode.java   |  271 ----
 .../apache/clerezza/rdf/utils/UnionGraphTest.java  |   78 --
 .../rdf/utils/smushing/SameAsSmushTest.java        |   92 --
 147 files changed, 25701 deletions(-)

diff --git a/rdf/core.test/LICENSE b/rdf/core.test/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/rdf/core.test/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.
diff --git a/rdf/core.test/pom.xml b/rdf/core.test/pom.xml
deleted file mode 100644
index 125c01d..0000000
--- a/rdf/core.test/pom.xml
+++ /dev/null
@@ -1,51 +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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<!--
-
- 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.
-
--->
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>clerezza</artifactId>
-        <groupId>org.apache.clerezza</groupId>
-        <version>8-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>rdf.core.test</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0.1-SNAPSHOT</version>
-    <name>Clerezza - RDF - Core Testsuite</name>
-    <description>Utilities to test Clerezza rdf.core implementations</description>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
deleted file mode 100644
index f110041..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
+++ /dev/null
@@ -1,573 +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.rdf.core.test;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import org.junit.Test;
-import org.apache.clerezza.commons.rdf.Language;
-import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
-import org.junit.Assert;
-
-
-
-/**
- * A generic abstract test class, implementations overwrite this class,
- * providing an implementation of the getEmptyGraph method.
- *
- * @author reto, szalay, mir, hhn
- */
-public abstract class GraphTest {
-
-    private final IRI uriRef1 =
-            new IRI("http://example.org/ontology#res1");
-    private final IRI uriRef2 =
-            new IRI("http://example.org/ontology#res2");
-    private final IRI uriRef3 =
-            new IRI("http://example.org/ontology#res3");
-    private final IRI uriRef4 =
-            new IRI("http://example.org/ontology#res4");
-    private final IRI xmlLiteralType =
-            new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
-    private Literal literal1 = new PlainLiteralImpl("literal1");
-    private Literal literal2 = new PlainLiteralImpl("literal2");
-    private BlankNode bnode1 = new BlankNode();
-    private BlankNode bnode2 = new BlankNode();
-    private Triple trpl1 = new TripleImpl(uriRef2, uriRef2, literal1);
-    private Triple trpl2 = new TripleImpl(uriRef1, uriRef2, uriRef1);
-    private Triple trpl3 = new TripleImpl(bnode2, uriRef3, literal2);
-    private Triple trpl4 = new TripleImpl(uriRef3, uriRef4, literal2);
-    
-    /**
-     * Subclasses implement this method to provide implementation instances of
-     * Graph. This method may be called an arbitrary amount of time,
-     * independently whether previously returned Graph are still in use or not.
-     *
-     * @return an empty Graph of the implementation to be tested
-     */
-    protected abstract Graph getEmptyGraph();
-    
-    @Test
-    public void testAddCountAndGetTriples() {
-        Graph graph = getEmptyGraph();
-        Assert.assertEquals(0, graph.size());
-        final TripleImpl triple1 = new TripleImpl(uriRef1, uriRef2, uriRef1);
-        graph.add(triple1);
-        Assert.assertEquals(1, graph.size());
-        Iterator<Triple> tripleIter = graph.filter(uriRef1, uriRef2, uriRef1);
-        Assert.assertTrue(tripleIter.hasNext());
-        Triple tripleGot = tripleIter.next();
-        Assert.assertEquals(triple1, tripleGot);
-        Assert.assertFalse(tripleIter.hasNext());
-        BlankNode bnode = new BlankNode() {};
-        graph.add(new TripleImpl(bnode, uriRef1, uriRef3));
-        graph.add(new TripleImpl(bnode, uriRef1, uriRef4));
-        tripleIter = graph.filter(null, uriRef1, null);
-        Set<BlankNodeOrIRI> subjectInMatchingTriples = new HashSet<BlankNodeOrIRI>();
-        Set<RDFTerm> objectsInMatchingTriples = new HashSet<RDFTerm>();
-        while (tripleIter.hasNext()) {
-            Triple triple = tripleIter.next();
-            subjectInMatchingTriples.add(triple.getSubject());
-            objectsInMatchingTriples.add(triple.getObject());
-        }
-        Assert.assertEquals(1, subjectInMatchingTriples.size());
-        Assert.assertEquals(2, objectsInMatchingTriples.size());
-        Set<RDFTerm> expectedObjects = new HashSet<RDFTerm>();
-        expectedObjects.add(uriRef3);
-        expectedObjects.add(uriRef4);
-        Assert.assertEquals(expectedObjects, objectsInMatchingTriples);
-        graph.add(new TripleImpl(bnode, uriRef4, bnode));
-        tripleIter = graph.filter(null, uriRef4, null);
-        Assert.assertTrue(tripleIter.hasNext());
-        Triple retrievedTriple = tripleIter.next();
-        Assert.assertFalse(tripleIter.hasNext());
-        Assert.assertEquals(retrievedTriple.getSubject(), retrievedTriple.getObject());
-        tripleIter = graph.filter(uriRef1, uriRef2, null);
-        Assert.assertTrue(tripleIter.hasNext());
-        retrievedTriple = tripleIter.next();
-        Assert.assertFalse(tripleIter.hasNext());
-        Assert.assertEquals(retrievedTriple.getSubject(), retrievedTriple.getObject());
-    }
-    
-    @Test
-    public void testRemoveAllTriples() {
-        Graph graph = getEmptyGraph();
-        Assert.assertEquals(0, graph.size());
-        graph.add(new TripleImpl(uriRef1, uriRef2, uriRef3));
-        graph.add(new TripleImpl(uriRef2, uriRef3, uriRef4));
-        Assert.assertEquals(2, graph.size());
-        graph.clear();
-        Assert.assertEquals(0, graph.size());
-    }
-
-    @Test
-    public void testUseTypedLiterals() {
-        Graph graph = getEmptyGraph();
-        Assert.assertEquals(0, graph.size());
-        Literal value = new TypedLiteralImpl("<elem>value</elem>",xmlLiteralType);
-        final TripleImpl triple1 = new TripleImpl(uriRef1, uriRef2, value);
-        graph.add(triple1);
-        Iterator<Triple> tripleIter = graph.filter(uriRef1, uriRef2, null);
-        Assert.assertTrue(tripleIter.hasNext());
-        RDFTerm gotValue = tripleIter.next().getObject();
-        Assert.assertEquals(value, gotValue);
-    }
-
-    @Test
-    public void testUseLanguageLiterals() {
-        Graph graph = getEmptyGraph();
-        Assert.assertEquals(0, graph.size());
-        Language language = new Language("it");
-        Literal value = new PlainLiteralImpl("<elem>value</elem>",language);
-        final TripleImpl triple1 = new TripleImpl(uriRef1, uriRef2, value);
-        graph.add(triple1);
-        Iterator<Triple> tripleIter = graph.filter(uriRef1, uriRef2, null);
-        Assert.assertTrue(tripleIter.hasNext());
-        RDFTerm gotValue = tripleIter.next().getObject();
-        Assert.assertEquals(value, gotValue);
-        Assert.assertEquals(language, ((Literal)gotValue).getLanguage());
-    }
-
-    @Test
-    public void testRemoveViaIterator() {
-        Graph graph = getEmptyGraph();
-        Assert.assertEquals(0, graph.size());
-        final TripleImpl triple1 = new TripleImpl(uriRef1, uriRef2, uriRef1);
-        graph.add(triple1);
-        final TripleImpl triple2 = new TripleImpl(uriRef1, uriRef2, uriRef4);
-        graph.add(triple2);
-        Assert.assertEquals(2, graph.size());
-        Iterator<Triple> iterator = graph.iterator();
-        while (iterator.hasNext()) {
-            iterator.next();
-            iterator.remove();
-        }
-        Assert.assertEquals(0, graph.size());
-    }
-
-    @Test
-    public void testGetSize() throws Exception {
-        Graph graph = getEmptyGraph();
-        // The test graph must always be empty after test fixture setup
-        Assert.assertEquals(0, graph.size());
-    }
-
-
-    @Test
-    public void testAddSingleTriple() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertEquals(0, graph.size());
-        Assert.assertTrue(graph.add(triple));
-        Assert.assertEquals(1, graph.size());
-    }
-
-
-    @Test
-    public void testAddSameTripleTwice() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertEquals(0, graph.size());
-        Assert.assertTrue(graph.add(triple));
-        Assert.assertFalse(graph.add(triple)); // ImmutableGraph does not change
-        Assert.assertEquals(1, graph.size());
-    }
-
-
-    @Test
-    public void testRemoveSingleTriple() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertTrue(graph.add(triple));
-        Assert.assertTrue(graph.remove(triple));
-        Assert.assertEquals(0, graph.size());
-    }
-
-    @Test
-    public void testRemoveSameTripleTwice() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple tripleAlice= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        final Triple tripleBob= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/bob");
-        Assert.assertTrue(graph.add(tripleAlice));
-        Assert.assertTrue(graph.add(tripleBob));
-        Assert.assertTrue(graph.remove(tripleAlice));
-        Assert.assertFalse(graph.remove(tripleAlice));
-        Assert.assertEquals(1, graph.size());
-    }
-
-    @Test
-    public void testGetSameBlankNode() throws Exception {
-        Graph graph = getEmptyGraph();
-        BlankNode bNode = new BlankNode();
-        final IRI HAS_NAME = new IRI("http://example.org/ontology/hasName");
-        final PlainLiteralImpl name = new PlainLiteralImpl("http://example.org/people/alice");
-        final PlainLiteralImpl name2 = new PlainLiteralImpl("http://example.org/people/bob");
-        final Triple tripleAlice = new TripleImpl(bNode, HAS_NAME, name);
-        final Triple tripleBob = new TripleImpl(bNode, HAS_NAME, name2);
-        Assert.assertTrue(graph.add(tripleAlice));
-        Assert.assertTrue(graph.add(tripleBob));
-        Iterator<Triple> result = graph.filter(null, HAS_NAME, name);
-        Assert.assertEquals(bNode, result.next().getSubject());
-    }
-
-    @Test
-    public void testContainsIfContained() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertTrue(graph.add(triple));
-        Assert.assertTrue(graph.contains(triple));
-    }
-
-
-    @Test
-    public void testContainsIfEmpty() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertFalse(graph.contains(triple));
-    }
-
-
-    @Test
-    public void testContainsIfNotContained() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple tripleAdd= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        final Triple tripleTest= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/bob");
-        Assert.assertTrue(graph.add(tripleAdd));
-        Assert.assertFalse(graph.contains(tripleTest));
-    }
-
-
-    @Test
-    public void testFilterEmptyGraph() throws Exception {
-        Graph graph = getEmptyGraph();
-        Iterator<Triple> i = graph.filter(null, null, null);
-        Assert.assertFalse(i.hasNext());
-    }
-
-
-    @Test
-    public void testFilterSingleEntry() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple triple= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        Assert.assertTrue(graph.add(triple));
-
-        Iterator<Triple> i = graph.filter(null, null, null);
-        Collection<Triple> resultSet= toCollection(i);
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.contains(triple));
-    }
-
-
-    @Test
-    public void testFilterByObject() throws Exception {
-        Graph graph = getEmptyGraph();
-        final Triple tripleAlice= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/alice");
-        final Triple tripleBob= createTriple(
-                "http://example.org/ontology/Person",
-                "http://example.org/ontology/hasName",
-                "http://example.org/people/bob");
-        Assert.assertTrue(graph.add(tripleAlice));
-        Assert.assertTrue(graph.add(tripleBob));
-
-        Iterator<Triple> iterator;
-        Collection<Triple> resultSet;
-
-        // Find bob
-        iterator = graph.filter(null, null,
-                new IRI("http://example.org/people/bob"));
-        resultSet= toCollection(iterator);
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.contains(tripleBob));
-
-        // Find alice
-        iterator = graph.filter(null, null,
-                new IRI("http://example.org/people/alice"));
-        resultSet= toCollection(iterator);
-        Assert.assertEquals(1, resultSet.size());
-        Assert.assertTrue(resultSet.contains(tripleAlice));
-
-        // Find both
-        iterator = graph.filter(null, null, null);
-        resultSet= toCollection(iterator);
-        Assert.assertEquals(2, resultSet.size());
-        Assert.assertTrue(resultSet.contains(tripleAlice));
-        Assert.assertTrue(resultSet.contains(tripleBob));
-    }
-/*
-    @Test
-    public void graphEventTestAddRemove() {
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null));
-        mGraph.addGraphListener(listener, new FilterTriple(bnode2, null, literal2));
-        mGraph.addGraphListener(listener, new FilterTriple(null, uriRef4, literal2));        
-        mGraph.add(trpl1);
-        Assert.assertNull(listener.getEvents());        
-        mGraph.add(trpl2);
-        Assert.assertEquals(1, listener.getEvents().size());
-        Assert.assertEquals(trpl2, listener.getEvents().get(0).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof  AddEvent);
-        listener.resetEvents();
-        mGraph.remove(trpl2);
-        Assert.assertEquals(1, listener.getEvents().size());
-        Assert.assertEquals(trpl2, listener.getEvents().get(0).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof RemoveEvent);
-        listener.resetEvents();        
-        mGraph.add(trpl3);
-        Assert.assertEquals(1, listener.getEvents().size());
-        Assert.assertEquals(trpl3, listener.getEvents().get(0).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof AddEvent);
-        listener.resetEvents();        
-        mGraph.remove(trpl4);
-        Assert.assertNull(listener.getEvents());
-    }
-    
-    @Test
-    public void graphEventTestAddAllRemoveAll() {
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null));
-        mGraph.addGraphListener(listener, new FilterTriple(bnode2, null, literal2));
-        mGraph.addGraphListener(listener, new FilterTriple(null, uriRef4, literal2));
-        Graph triples = new SimpleGraph();
-        triples.add(trpl1);
-        triples.add(trpl2);
-        triples.add(trpl3);
-        triples.add(trpl4);
-        mGraph.addAll(triples);
-        List<GraphEvent> cumulatedEvents = listener.getCumulatedEvents();
-        Set<Triple> cumulatedTriples = getCumulatedTriples(cumulatedEvents);
-        Assert.assertEquals(3, cumulatedEvents.size());
-        Assert.assertTrue(cumulatedEvents.get(0) instanceof AddEvent);
-        Assert.assertTrue(cumulatedTriples.contains(trpl2));
-        Assert.assertTrue(cumulatedTriples.contains(trpl3));
-        Assert.assertTrue(cumulatedTriples.contains(trpl4));
-        listener.resetCumulatedEvents();
-        mGraph.removeAll(triples);
-        cumulatedEvents = listener.getCumulatedEvents();
-        cumulatedTriples = getCumulatedTriples(cumulatedEvents);
-        Assert.assertEquals(3, cumulatedEvents.size());
-        Assert.assertTrue(cumulatedEvents.get(0) instanceof RemoveEvent);
-        Assert.assertTrue(cumulatedTriples.contains(trpl2));
-        Assert.assertTrue(cumulatedTriples.contains(trpl3));
-        Assert.assertTrue(cumulatedTriples.contains(trpl4));
-    }
-
-    @Test
-    public void graphEventTestFilterRemove() {
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null));
-        mGraph.addGraphListener(listener, new FilterTriple(bnode2, null, literal2));
-        mGraph.addGraphListener(listener, new FilterTriple(null, uriRef4, literal2));
-        mGraph.add(trpl1);
-        mGraph.add(trpl2);
-        mGraph.add(trpl3);
-        mGraph.add(trpl4);
-        listener.resetCumulatedEvents();
-        Iterator<Triple> result = mGraph.filter(null, uriRef2, null);
-        while (result.hasNext()) {
-            result.next();
-            result.remove();
-        }
-        List<GraphEvent> cumulatedEvents = listener.getCumulatedEvents();
-        Assert.assertEquals(1, cumulatedEvents.size());
-        Assert.assertTrue(cumulatedEvents.get(0) instanceof RemoveEvent);
-        Assert.assertEquals(trpl2, listener.getEvents().get(0).getTriple());
-    }
-
-    @Test
-    public void graphEventTestIteratorRemove() {
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null));
-        mGraph.addGraphListener(listener, new FilterTriple(bnode2, null, literal2));
-        mGraph.addGraphListener(listener, new FilterTriple(null, uriRef4, literal2));
-        mGraph.add(trpl1);
-        mGraph.add(trpl2);
-        mGraph.add(trpl3);
-        mGraph.add(trpl4);
-        listener.resetCumulatedEvents();
-        Iterator<Triple> result = mGraph.iterator();
-        while (result.hasNext()) {
-            result.next();
-            result.remove();
-        }
-        List<GraphEvent> cumulatedEvents = listener.getCumulatedEvents();
-        Set<Triple> cumulatedTriples = getCumulatedTriples(cumulatedEvents);
-        Assert.assertEquals(3, cumulatedEvents.size());
-        Assert.assertTrue(cumulatedEvents.get(0) instanceof RemoveEvent);
-        Assert.assertTrue(cumulatedTriples.contains(trpl2));
-        Assert.assertTrue(cumulatedTriples.contains(trpl3));
-        Assert.assertTrue(cumulatedTriples.contains(trpl4));
-    }
-
-    @Test
-    public void graphEventTestClear() {
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null));
-        mGraph.addGraphListener(listener, new FilterTriple(bnode2, null, literal2));
-        mGraph.addGraphListener(listener, new FilterTriple(null, uriRef4, literal2));
-        mGraph.add(trpl1);
-        mGraph.add(trpl2);
-        mGraph.add(trpl3);
-        mGraph.add(trpl4);
-        listener.resetCumulatedEvents();
-        mGraph.clear();
-        List<GraphEvent> cumulatedEvents = listener.getCumulatedEvents();
-        Set<Triple> cumulatedTriples = getCumulatedTriples(cumulatedEvents);
-        Assert.assertEquals(3, cumulatedEvents.size());
-        Assert.assertTrue(cumulatedEvents.get(0) instanceof RemoveEvent);
-        Assert.assertTrue(cumulatedTriples.contains(trpl2));
-        Assert.assertTrue(cumulatedTriples.contains(trpl3));
-        Assert.assertTrue(cumulatedTriples.contains(trpl4));
-    }
-
-    private Set<Triple> getCumulatedTriples(List<GraphEvent> cumulatedEvents) {
-        Set<Triple> triples = new HashSet<Triple>();
-        for(GraphEvent event: cumulatedEvents) {
-            triples.add(event.getTriple());
-        }
-        return triples;
-    }
-
-    @Test
-    public void graphEventTestWithDelay() throws Exception{
-        Graph mGraph = getEmptyGraph();
-        TestGraphListener listener = new TestGraphListener();
-        mGraph.addGraphListener(listener, new FilterTriple(uriRef1, uriRef2, null),
-                1000);
-
-        Triple triple0 = new TripleImpl(uriRef2, uriRef2, literal1);
-        Triple triple1 = new TripleImpl(uriRef1, uriRef2, uriRef1);
-        Triple triple2 = new TripleImpl(uriRef1, uriRef2, literal1);
-        Triple triple3 = new TripleImpl(uriRef1, uriRef2, bnode1);
-        mGraph.add(triple0);
-        mGraph.add(triple1);
-        mGraph.add(triple2);
-        mGraph.add(triple3);
-        Thread.sleep(1500);
-        Assert.assertEquals(3, listener.getEvents().size());
-        Assert.assertEquals(triple1, listener.getEvents().get(0).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof AddEvent);
-        Assert.assertEquals(triple2, listener.getEvents().get(1).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof AddEvent);
-        Assert.assertEquals(triple3, listener.getEvents().get(2).getTriple());
-        Assert.assertTrue(listener.getEvents().get(0) instanceof AddEvent);
-    }
-
-    private static class TestGraphListener implements GraphListener {
-        private List<GraphEvent> events = null;
-        private List<GraphEvent> cumulatedEvents = new ArrayList<GraphEvent>();
-
-        @Override
-        public void graphChanged(List<GraphEvent> events) {
-            this.events = events;
-            Iterator<GraphEvent> eventIter = events.iterator();
-            while (eventIter.hasNext()) {
-                GraphEvent graphEvent = eventIter.next();
-                this.cumulatedEvents.add(graphEvent);
-            }            
-        }
-
-        public List<GraphEvent> getEvents() {
-            return events;
-        }
-
-        public List<GraphEvent> getCumulatedEvents() {
-            return cumulatedEvents;
-        }
-
-        public void resetEvents() {
-            events = null;
-        }
-
-        public void resetCumulatedEvents() {
-            cumulatedEvents = new ArrayList<GraphEvent>();
-        }
-    }
-*/
-    private Collection<Triple> toCollection(Iterator<Triple> iterator) {
-        Collection<Triple> result = new ArrayList<Triple>();
-        while (iterator.hasNext()) {
-            result.add(iterator.next());
-        }
-        return result;
-    }
-
-    /**
-     * Creates a new <code>Triple</code>.
-     * @param subject  the subject.
-     * @param predicate  the predicate.
-     * @param object  the object.
-     * @throws IllegalArgumentException  If an attribute is <code>null</code>.
-     */
-    private Triple createTriple(String subject, String predicate,
-            String object) {
-        return new TripleImpl(new IRI(subject), new IRI(predicate),
-                new IRI(object));
-    }
-    
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
deleted file mode 100644
index 5b84df0..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
+++ /dev/null
@@ -1,126 +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.rdf.core.test;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-
-
-/**
- *
- * @author mir
- */
-class GraphWrapper implements Graph {
-
-    protected Graph wrapped;
-
-    public GraphWrapper(Graph tc) {
-        this.wrapped = tc;
-    }
-
-    @Override
-    public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
-        return wrapped.filter(subject, predicate, object);
-    }
-
-    
-    @Override
-    public int size() {
-        return wrapped.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return wrapped.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return wrapped.contains(o);
-    }
-
-    @Override
-    public Iterator<Triple> iterator() {
-        return wrapped.iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return wrapped.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return wrapped.toArray(a);
-    }
-
-    @Override
-    public boolean add(Triple e) {
-        return wrapped.add(e);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return wrapped.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return wrapped.containsAll(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends Triple> c) {
-        return wrapped.addAll(c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return wrapped.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return wrapped.retainAll(c);
-    }
-
-    @Override
-    public void clear() {
-        wrapped.clear();
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph() {
-        return wrapped.getImmutableGraph();
-    }
-
-    @Override
-    public ReadWriteLock getLock() {
-        return wrapped.getLock();
-    }
-
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockChecker.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockChecker.java
deleted file mode 100644
index d1784b4..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockChecker.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright 2010 mir.
- * 
- *  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.
- *  under the License.
- */
-
-package org.apache.clerezza.rdf.core.test;
-
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-/**
- *
- * @author mir
- */
-class LockChecker {
-
-    public static void checkIfReadLocked(ReentrantReadWriteLock lock) {
-        if (lock.getReadLockCount() == 0 && !lock.isWriteLockedByCurrentThread()) {
-            throw new RuntimeException("Neither read- nor write-locked");
-        }
-    }
-
-    public static void checkIfWriteLocked(ReentrantReadWriteLock lock) {
-        if (!lock.isWriteLockedByCurrentThread()) {
-            throw new RuntimeException("Not write-locked");
-        }
-    }
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
deleted file mode 100644
index 980f6d2..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
+++ /dev/null
@@ -1,75 +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.rdf.core.test;
-
-import java.util.Iterator;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * Wrappes an Graph as a LockableGraph. If a method is called that reads
- * or modifies the wrapped graph and the appropriate lock is not set, then a
- * RuntimeException is thrown.
- *
- * @author rbn, mir
- */
-public class LockableMGraphWrapperForTesting extends GraphWrapper {
-
-    private final ReentrantReadWriteLock lock = (ReentrantReadWriteLock) getLock();
-    private final Lock readLock = lock.readLock();
-    private final Graph wrapped;
-
-    /**
-     * Constructs a LocalbleGraph for an Graph.
-     *
-     * @param providedGraph a non-lockable mgraph
-     */
-    public LockableMGraphWrapperForTesting(final Graph providedGraph) {
-        super(providedGraph);
-        this.wrapped = providedGraph;
-    }
-
-    @Override
-    public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
-        LockChecker.checkIfReadLocked(lock);
-        readLock.lock();
-        try {
-            return new LockingIteratorForTesting(wrapped.filter(subject, predicate, object), lock);
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    @Override
-    public Iterator<Triple> iterator() {
-        LockChecker.checkIfReadLocked(lock);
-        readLock.lock();
-        try {
-            return new LockingIteratorForTesting(wrapped.iterator(), lock);
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
deleted file mode 100644
index 4c434ec..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
+++ /dev/null
@@ -1,79 +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.rdf.core.test;
-
-import java.util.Iterator;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.clerezza.commons.rdf.Triple;
-
-/**
- * Wrapps an iterator<Triple> reading all elements to a cache on construction
- * and returning them from that cache.
- * @author reto
- */
-class LockingIteratorForTesting implements Iterator<Triple> {
-
-    private Iterator<Triple> base;
-    private Lock readLock;
-    private Lock writeLock;
-    private ReentrantReadWriteLock lock;
-
-    public LockingIteratorForTesting(Iterator<Triple> iterator, ReentrantReadWriteLock lock) {
-        base = iterator;
-        readLock = lock.readLock();
-        writeLock = lock.writeLock();
-        this.lock = lock;
-    }
-
-    @Override
-    public boolean hasNext() {
-        LockChecker.checkIfReadLocked(lock);
-        readLock.lock();
-        try {
-            return base.hasNext();
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    @Override
-    public Triple next() {
-        LockChecker.checkIfReadLocked(lock);
-        readLock.lock();
-        try {
-            return base.next();
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    @Override
-    public void remove() {
-        LockChecker.checkIfWriteLocked(lock);
-        writeLock.lock();
-        try {
-            base.remove();
-        } finally {
-            writeLock.unlock();
-        }
-    }
-
-
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
deleted file mode 100644
index 996ef6f..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
+++ /dev/null
@@ -1,237 +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.rdf.core.test;
-
-import java.util.Iterator;
-import java.util.UUID;
-import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import org.apache.commons.lang.RandomStringUtils;
-
-/**
- * A <code>Graph</code> wrapper that allows growing and shrinking of
- * the wrapped mgraph.
- *
- * @author mir
- */
-public class RandomGraph extends GraphWrapper {
-    
-    private int interconnectivity = 2;
-
-    public RandomGraph(Graph mGraph, int interconnectivity) {
-        super(mGraph);
-        this.interconnectivity = interconnectivity;
-    }
-
-    /**
-     * Creates a new random mutual graph.
-     *
-     * @param initialSize Determines the initial size of the content graph
-     * @param interconnectivity Determines the probability of using already existing
-     *        resource when creating a new triple. The probability of using an existing
-     *        resource over creating a new resouce is 1-(1/interconnectivity).
-     * @param mGraph
-     */
-    public RandomGraph(int initialSize, int interconnectivity, Graph mGraph) {
-        super(mGraph);
-        if (interconnectivity <= 0) {
-            throw new IllegalArgumentException("growth speed and the interconnectivity "
-                    + "value have to be equals or highter one");
-        }
-        this.interconnectivity = interconnectivity;
-
-        setupInitialSize(initialSize);
-    }
-
-    /**
-     * Add or removes randomly a triple.
-     *
-     * @return the triple that was added or removed.
-     */
-    public Triple evolve() {
-        Triple triple;
-        int random = rollDice(2);
-        if (random == 0 && size() != 0) {
-            triple = getRandomTriple();
-            remove(triple);
-        } else {
-            triple = createRandomTriple();
-            add(triple);
-        }
-        return triple;
-    }
-
-    /**
-     * Removes a random triple.
-     *
-     * @return the triple that was removed.
-     */
-    public Triple removeRandomTriple() {
-        Triple randomTriple = getRandomTriple();
-        remove(randomTriple);
-        return randomTriple;
-    }
-
-    /**
-     * Adds a random triple.
-     *
-     * @return the triple that was added.
-     */
-    public Triple addRandomTriple() {
-        Triple randomTriple;
-        do {
-         randomTriple = createRandomTriple();
-        } while(contains(randomTriple));
-        
-        add(randomTriple);
-        return randomTriple;
-    }
-    
-    private Triple createRandomTriple() {
-        return new TripleImpl(getSubject(), getPredicate(), getObject());
-    }
-
-    private BlankNodeOrIRI getSubject() {
-        int random = rollDice(interconnectivity);
-        if (size() == 0) {
-            random = 0;
-        }
-        switch (random) {
-            case 0: // create new BlankNodeOrIRI
-                RDFTerm newRDFTerm;
-                do {
-                    newRDFTerm = createRandomRDFTerm();
-                } while (!(newRDFTerm instanceof BlankNodeOrIRI));
-                return (BlankNodeOrIRI) newRDFTerm;
-            default: // get existing BlankNodeOrIRI
-                RDFTerm existingRDFTerm;
-                do {
-                    existingRDFTerm = getExistingRDFTerm();
-                    if (existingRDFTerm == null) {
-                        random = 0;
-                    }
-                } while (!(existingRDFTerm instanceof BlankNodeOrIRI));
-
-                return (BlankNodeOrIRI) existingRDFTerm;
-        }
-    }
-
-    private IRI getPredicate() {
-        int random = rollDice(interconnectivity);
-        if (size() == 0) {
-            random = 0;
-        }
-        switch (random) {
-            case 0: // create new IRI
-                return createRandomIRI();
-            default: // get existing IRI
-                RDFTerm existingRDFTerm;
-                do {
-                    existingRDFTerm = getExistingRDFTerm();
-                    if (existingRDFTerm == null) {
-                        random = 0;
-                    }
-                } while (!(existingRDFTerm instanceof IRI));
-                return (IRI) existingRDFTerm;
-        }
-    }
-
-    private RDFTerm getObject() {
-        int random = rollDice(interconnectivity);
-        if (size() == 0) {
-            random = 0;
-        }        
-        switch (random) {
-            case 0: // create new resource
-                return createRandomRDFTerm();
-            default: // get existing resource
-                RDFTerm existingRDFTerm = getExistingRDFTerm();
-                if (existingRDFTerm == null) {
-                    random = 0;
-                }
-                return existingRDFTerm;
-        }
-    }
-
-    private static int rollDice(int faces) {
-        return Double.valueOf(Math.random() * faces).intValue();
-    }
-
-    private RDFTerm createRandomRDFTerm() {
-        switch (rollDice(3)) {
-            case 0:
-                return new BlankNode();
-            case 1:
-                return createRandomIRI();
-            case 2:
-                return new PlainLiteralImpl(RandomStringUtils.random(rollDice(100) + 1));
-        }
-        throw new RuntimeException("in createRandomRDFTerm()");
-    }
-
-    private RDFTerm getExistingRDFTerm() {
-        Triple triple = getRandomTriple();
-        if (triple == null) {
-            return null;
-        }
-        switch (rollDice(3)) {
-            case 0:
-                return triple.getSubject();
-            case 1:
-                return triple.getPredicate();
-            case 2:
-                return triple.getObject();
-        }
-        return null;
-    }
-
-    private IRI createRandomIRI() {
-        return new IRI("http://" + UUID.randomUUID().toString());
-    }
-
-    /**
-     * Returns a random triple contained in the Graph.
-     */
-    public Triple getRandomTriple() {
-        int size = this.size();
-        if (size == 0) {
-            return null;
-        }
-        Iterator<Triple> triples = iterator();
-        while (triples.hasNext()) {
-            Triple triple = triples.next();
-            if (rollDice(this.size()) == 0) {
-                return triple;
-            }
-        }
-        return getRandomTriple();
-    }
-
-    private void setupInitialSize(int initialSize) {
-        for (int i = 0; i < initialSize; i++) {
-            addRandomTriple();
-        }
-    }
-}
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
deleted file mode 100644
index bea479d..0000000
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
+++ /dev/null
@@ -1,484 +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.rdf.core.test;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import java.util.Set;
-import org.junit.Test;
-import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-
-import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import static org.junit.Assert.*;
-
-/**
- * 
- * @author mir,rbn
- */
-public abstract class TcProviderTest {
-
-    protected final IRI uriRefA = generateUri("a");
-    protected final IRI uriRefA1 = generateUri("a1");
-    protected final IRI uriRefB = generateUri("b");
-    protected final IRI uriRefB1 = generateUri("b1");
-    protected final IRI uriRefC = generateUri("c");
-
-    protected final IRI graphIRI = generateUri("myGraph");
-    protected final IRI otherGraphIRI = new IRI(graphIRI.getUnicodeString());
-
-    @Test
-    public void testCreateImmutableGraph() {
-        TcProvider simpleTcmProvider = getInstance();
-        Graph mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-
-        ImmutableGraph createdGraph = simpleTcmProvider.createImmutableGraph(uriRefA, mGraph);
-
-        Iterator<Triple> iteratorInput = mGraph.iterator();
-        Iterator<Triple> iteratorCreated = createdGraph.iterator();
-        assertEquals(iteratorInput.next(), iteratorCreated.next());
-        assertFalse(iteratorCreated.hasNext());
-
-        try {
-            simpleTcmProvider.createImmutableGraph(uriRefA, mGraph);
-            assertTrue(false);
-        } catch (EntityAlreadyExistsException e) {
-            assertTrue(true);
-        }
-        simpleTcmProvider.deleteGraph(uriRefA);
-    }
-
-    @Test
-    public void testCreateGraph() {
-        TcProvider simpleTcmProvider = getInstance();
-        Graph mGraph = simpleTcmProvider.createGraph(uriRefA);
-        assertTrue(mGraph.isEmpty());
-
-        try {
-            simpleTcmProvider.createGraph(uriRefA);
-            assertTrue(false);
-        } catch (EntityAlreadyExistsException e) {
-            assertTrue(true);
-        }
-        simpleTcmProvider.deleteGraph(uriRefA);
-    }
-
-    @Test
-    public void testGetImmutableGraph() {
-        TcProvider simpleTcmProvider = getInstance();
-        // add Graphs
-        Graph mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-        simpleTcmProvider.createImmutableGraph(uriRefA, mGraph);
-        mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefA1, uriRefA1, uriRefA1));
-        simpleTcmProvider.createImmutableGraph(uriRefA1, mGraph);
-        mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefB));
-        simpleTcmProvider.createImmutableGraph(uriRefB, mGraph);
-        mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
-        simpleTcmProvider.createImmutableGraph(uriRefB1, mGraph);
-
-        ImmutableGraph bGraph = simpleTcmProvider.getImmutableGraph(uriRefB);
-        Iterator<Triple> iterator = bGraph.iterator();
-        assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
-        assertFalse(iterator.hasNext());
-        simpleTcmProvider.deleteGraph(uriRefA);
-        simpleTcmProvider.deleteGraph(uriRefA1);
-        simpleTcmProvider.deleteGraph(uriRefB);
-        simpleTcmProvider.deleteGraph(uriRefB1);
-    }
-
-    @Test
-    public void testGetGraph() {
-        TcProvider simpleTcmProvider = getInstance();
-        // add Graphs
-        Graph mGraph = simpleTcmProvider.createGraph(uriRefA);
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-        mGraph = simpleTcmProvider.createGraph(uriRefA1);
-        mGraph.add(new TripleImpl(uriRefA1, uriRefA1, uriRefA1));
-        mGraph = simpleTcmProvider.createGraph(uriRefB);
-        mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefA));
-        mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefB));
-        mGraph.remove(new TripleImpl(uriRefB, uriRefB, uriRefA));
-        assertEquals(1, mGraph.size());
-        mGraph = simpleTcmProvider.createGraph(uriRefB1);
-        mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
-
-        Graph bGraph = simpleTcmProvider.getGraph(uriRefB);
-        Iterator<Triple> iterator = bGraph.iterator();
-        assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
-        assertFalse(iterator.hasNext());
-        simpleTcmProvider.deleteGraph(uriRefA);
-        simpleTcmProvider.deleteGraph(uriRefA1);
-        simpleTcmProvider.deleteGraph(uriRefB);
-        simpleTcmProvider.deleteGraph(uriRefB1);
-        
-    }
-
-    @Test
-    public void testGetTriples() {
-        TcProvider simpleTcmProvider = getInstance();
-        // add Graphs
-        Graph mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-        simpleTcmProvider.createImmutableGraph(uriRefA, mGraph);
-        mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefB));
-        simpleTcmProvider.createImmutableGraph(uriRefB, mGraph);
-        // add Graphs
-        mGraph = simpleTcmProvider.createGraph(uriRefA1);
-        mGraph.add(new TripleImpl(uriRefA1, uriRefA1, uriRefA1));
-        mGraph = simpleTcmProvider.createGraph(uriRefB1);
-        mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
-
-        // get a ImmutableGraph
-        Graph tripleCollection = simpleTcmProvider.getGraph(uriRefA);
-        // get a Graph
-        Graph tripleCollection2 = simpleTcmProvider.getGraph(uriRefB1);
-
-        Iterator<Triple> iterator = tripleCollection.iterator();
-        assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA), iterator.next());
-        assertFalse(iterator.hasNext());
-
-        iterator = tripleCollection2.iterator();
-        assertEquals(new TripleImpl(uriRefB1, uriRefB1, uriRefB1), iterator.next());
-        assertFalse(iterator.hasNext());
-        simpleTcmProvider.deleteGraph(uriRefA);
-        simpleTcmProvider.deleteGraph(uriRefA1);
-        simpleTcmProvider.deleteGraph(uriRefB);
-        simpleTcmProvider.deleteGraph(uriRefB1);
-    }
-
-    @Test
-    public void testDeleteEntity() {
-        TcProvider simpleTcmProvider = getInstance();
-        Graph mGraph = new SimpleGraph();
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-        ImmutableGraph graph = mGraph.getImmutableGraph();
-        simpleTcmProvider.createImmutableGraph(uriRefA, graph);
-        simpleTcmProvider.createImmutableGraph(uriRefC, graph);
-
-        simpleTcmProvider.deleteGraph(uriRefA);
-        try {
-            simpleTcmProvider.getGraph(uriRefA);
-            assertTrue(false);
-        } catch (NoSuchEntityException e) {
-            assertTrue(true);
-        }
-
-        // Check that graph is still available under uriRefC
-        ImmutableGraph cGraph = simpleTcmProvider.getImmutableGraph(uriRefC);
-        assertNotNull(cGraph);
-        simpleTcmProvider.deleteGraph(uriRefC);
-    }
-
-    /**
-     * Subclasses implement this method to provide implementation instances of
-     * <code>TcProvider</code>. The first call within a test method has to
-     * return a empty TcProvider. Subsequent calls within the test method
-     * should instantiate a new provider, but load the previously added data from
-     * its "persistent" store.
-     *
-     * @return a TcProvider of the implementation to be tested.
-     */
-    protected abstract TcProvider getInstance();
-
-//    @Test
-//    public void testGetNames() {
-//        Graph mGraph = new SimpleGraph();
-//        mGraph.add(new TripleImpl(uriRefB, uriRefB, uriRefB));
-//        simpleTcmProvider.createGraph(uriRefB, mGraph.getGraph());
-//        
-//        mGraph = new SimpleGraph();
-//        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-//        ImmutableGraph graph = mGraph.getGraph();
-//        simpleTcmProvider.createGraph(uriRefA, graph);
-//        simpleTcmProvider.createGraph(uriRefC, graph);
-//
-//        Set<IRI> names = simpleTcmProvider.getNames(graph);
-//
-//        assertTrue(names.contains(uriRefA));
-//        assertTrue(names.contains(uriRefC));
-//        assertEquals(2, names.size());
-//
-//        assertFalse(names.contains(uriRefB));
-//    }
-
-    @Test
-    public void testCreateGraphExtended() throws Exception {
-
-        TcProvider provider = getInstance();
-        Graph graph = provider.createGraph(graphIRI);
-        assertNotNull(graph);
-        //get a new provider and check that graph is there
-        provider = getInstance();
-        graph = provider.getGraph(graphIRI);
-        assertNotNull(graph);
-        //check that there is no such graph, but only the mgraph
-        boolean expThrown = false;
-        try {
-            ImmutableGraph g = provider.getImmutableGraph(graphIRI);
-        } catch(NoSuchEntityException e) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        provider.deleteGraph(graphIRI);
-    }
-
-    @Test
-    public void testCreateImmutableGraphExtended() throws Exception {
-
-        TcProvider provider = getInstance();
-        ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
-
-        assertNotNull(graph);
-
-        //get a new provider and check that graph is there
-        provider = getInstance();
-        graph = provider.getImmutableGraph(graphIRI);
-        assertNotNull(graph);
-
-        //check that there is no such mgraph, but only the graph
-        boolean expThrown = false;
-
-        try {
-            Graph g = provider.getMGraph(graphIRI);
-        } catch(NoSuchEntityException e) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        provider.deleteGraph(graphIRI);
-    }
-
-    @Test
-    public void testCreateGraphNoDuplicateNames() throws Exception {
-
-        TcProvider provider = getInstance();
-        ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
-        assertNotNull(graph);
-        boolean expThrown = false;
-        try {
-            ImmutableGraph other = provider.createImmutableGraph(otherGraphIRI, null);
-        } catch(EntityAlreadyExistsException eaee) {
-            expThrown = true;
-        }
-        assertTrue(expThrown);
-        provider.deleteGraph(graphIRI);
-    }
-
-    @Test
-    public void testCreateGraphNoDuplicateNames2() throws Exception {
-
-        TcProvider provider = getInstance();
-        Graph graph = provider.createGraph(graphIRI);
-        assertNotNull(graph);
-        boolean expThrown = false;
-        try {
-            Graph other = provider.createGraph(otherGraphIRI);
-        } catch(EntityAlreadyExistsException eaee) {
-            expThrown = true;
-        }
-        assertTrue(expThrown);
-        provider.deleteGraph(graphIRI);
-    }
-
-    @Test
-    public void testCreateGraphWithInitialCollection() throws Exception {
-
-        Triple t1 = createTestTriple();
-
-        TcProvider provider = getInstance();
-
-        ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
-
-        assertEquals(1, graph.size());
-        assertTrue(graph.contains(t1));
-        provider.deleteGraph(graphIRI);
-    }
-
-    @Test
-    public void testGraphIsNotMutable() throws Exception {
-
-        Triple t1 = createTestTriple();
-        Set<Triple> t = new HashSet<Triple>();
-        t.add(t1);
-
-        TcProvider provider = getInstance();
-
-        ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
-
-        boolean expThrown = false;
-
-        try {
-            graph.add(t1);
-        } catch(UnsupportedOperationException uoe) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        expThrown = false;
-
-        try {
-            graph.remove(t1);
-        } catch(UnsupportedOperationException uoe) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        expThrown = false;
-
-        try {
-            graph.addAll(t);
-        } catch(UnsupportedOperationException uoe) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-
-        expThrown = false;
-
-        try {
-            graph.clear();
-        } catch(UnsupportedOperationException uoe) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-
-        expThrown = false;
-
-        try {
-            graph.removeAll(t);
-        } catch(UnsupportedOperationException uoe) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        provider.deleteGraph(graphIRI);
-    }
-
-//    This tests can not pass, because equals in AbstractGraph is not implemented
-//    yet.
-//    @Test
-//    public void testGraphHasName() throws Exception {
-//
-//        TcProvider provider = getInstance();
-//
-//        Graph triples = createTestTripleCollection(createTestTriple());
-//        ImmutableGraph graph = provider.createGraph(graphIRI, triples);
-//
-//        provider = getInstance();
-//        Set<IRI> names = provider.getNames(graph);
-//        assertTrue(names.contains(graphIRI));
-//    }
-//
-//    @Test
-//    public void testCreateSameGraphWithDifferentNames() throws Exception {
-//
-//        Graph triples = createTestTripleCollection(createTestTriple());
-//
-//        TcProvider provider = getInstance();
-//        IRI name1 = new IRI("http://myGraph1");
-//        ImmutableGraph graph = provider.createGraph(name1, triples);
-//
-//        IRI name2 = new IRI("http://myGraph2");
-//        ImmutableGraph secondGraph = provider.createGraph(name2, triples);
-//
-//        Set<IRI> names = provider.getNames(graph);
-//        assertNotNull(names);
-//        assertEquals(2, names.size());
-//    }
-
-    @Test
-    public void testGraphDeletion() throws Exception {
-
-        Graph triples = createTestTripleCollection(createTestTriple());
-
-        TcProvider provider = getInstance();
-        IRI name1 = new IRI("http://myGraph1");
-        ImmutableGraph graph = provider.createImmutableGraph(name1, triples);
-
-        IRI name2 = new IRI("http://myGraph2");
-        ImmutableGraph secondGraph = provider.createImmutableGraph(name2, triples);
-
-        //if we delete graph with name1, the second graph should still be there
-        provider.deleteGraph(name1);
-
-        provider = getInstance();
-        ImmutableGraph firstGraph = provider.getImmutableGraph(name2);
-        assertNotNull(firstGraph);
-
-        //check second name is not there
-        boolean expThrown = false;
-
-        try {
-            ImmutableGraph g = provider.getImmutableGraph(name1);
-        } catch(NoSuchEntityException nses) {
-            expThrown = true;
-        }
-
-        assertTrue(expThrown);
-        provider.deleteGraph(name2);
-    }
-
-
-
-    @Test
-    public void testGetTriplesGraph() throws Exception {
-        TcProvider provider = getInstance();
-
-        Graph graph = provider.createGraph(graphIRI);
-
-        Graph tc = provider.getGraph(graphIRI);
-        assertNotNull(tc);
-        provider.deleteGraph(graphIRI);
-    }
-
-    private Triple createTestTriple() {
-        BlankNodeOrIRI subject = new BlankNode() {};
-        IRI predicate = new IRI("http://test.com/");
-        BlankNodeOrIRI object = new IRI("http://test.com/myObject");
-        return new TripleImpl(subject, predicate, object);
-    }
-
-    private Graph createTestTripleCollection(Triple t) {
-        Set<Triple> ts = new HashSet<Triple>();
-        ts.add(t);
-        return new SimpleGraph(ts);
-    }
-
-    protected IRI generateUri(String name) {
-        return new IRI("http://example.org/" + name);
-    }
-    
-}
diff --git a/rdf/core/LICENSE b/rdf/core/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/rdf/core/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.
diff --git a/rdf/core/nbactions.xml b/rdf/core/nbactions.xml
deleted file mode 100644
index 49e8307..0000000
--- a/rdf/core/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>
diff --git a/rdf/core/pom.xml b/rdf/core/pom.xml
deleted file mode 100644
index e41cb2c..0000000
--- a/rdf/core/pom.xml
+++ /dev/null
@@ -1,136 +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>
-        <artifactId>clerezza</artifactId>
-        <groupId>org.apache.clerezza</groupId>
-        <version>8-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>rdf.core</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.0.2-SNAPSHOT</version>
-    <name>Clerezza - RDF - Core</name>
-    <description>Interfaces and utilities to access RDF Graphs</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza.commons-rdf</groupId>
-            <artifactId>commons-rdf-api</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza.commons-rdf</groupId>
-            <artifactId>commons-rdf-impl-utils</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
-            <version>1.2.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>utils</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-		    <dependency>
-			      <groupId>org.mockito</groupId>
-			      <artifactId>mockito-core</artifactId>
-			      <version>1.9.5</version>
-			      <scope>test</scope>
-		    </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.5</version>
-                <executions>
-                    <execution>
-                        <id>javacc</id>
-                        <goals>
-                            <goal>javacc</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <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>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.apache.clerezza.rdf.core.*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-scrdescriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/rdf/core/src/main/appended-resources/META-INF/NOTICE b/rdf/core/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 8963829..0000000
--- a/rdf/core/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-Contains code from the following book:
-Jonathan Knudsen, "Java Cryptography", O'Reilly Media, Inc., 1998
-
-Contains code from mulgara project for sparql query parsing
-
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
deleted file mode 100644
index 3057789..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
+++ /dev/null
@@ -1,50 +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.rdf.core.access;
-
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * is thrown on an attempt to create an entity with a name which already exists
- *
- * @author hasan
- */
-public class EntityAlreadyExistsException extends RuntimeException {
-
-    private IRI entityName;
-
-    /**
-     * creates an exception indicating that an entity with the specified name
-     * already exists.
-     * 
-     * @param entityName the name of the entity which already exists
-     */
-    public EntityAlreadyExistsException(IRI entityName) {
-        super("An entity with this name already exists: "+entityName);
-        this.entityName = entityName;
-    }
-
-    /**
-     * 
-     * @return the name of the entity which already exists
-     */
-    public IRI getEntityName() {
-        return entityName;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
deleted file mode 100644
index f11742b..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
+++ /dev/null
@@ -1,50 +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.rdf.core.access;
-
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * is thrown on an attempt to delete an entity with a provider that
- * supports the delete operation when the specified entity cannot be deleted
- *
- * @author reto
- */
-public class EntityUndeletableException extends RuntimeException {
-    private IRI entityName;
-
-    /**
-     * creates an exception indicating that the entity with the specified name
-     * cannot be deleted
-     * 
-     * @param entityName the name of the entity which is undeletable
-     */
-    public EntityUndeletableException(IRI entityName) {
-        super("This entity is undeletable: "+entityName);
-        this.entityName = entityName;
-    }
-
-    /**
-     * 
-     * @return the name of the entity which is undeletable
-     */
-    public IRI getEntityName() {
-        return entityName;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
deleted file mode 100644
index 35ef2f9..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
+++ /dev/null
@@ -1,58 +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.rdf.core.access;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.security.TcAccessController;
-
-/**
- * @see <a href="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/ServiceFactory.html">
- * Interface ServiceFactory</a>
- *
- * @author mir
- */
-public class ImmutableGraphServiceFactory implements ServiceFactory {
-    
-    private final TcManager tcManager;
-    private final IRI name;
-    private final TcAccessController tcAccessController;
-
-    ImmutableGraphServiceFactory(TcManager tcManager, IRI name,
-            TcAccessController tcAccessController) {
-        this.tcManager = tcManager;
-        this.name = name;
-        this.tcAccessController = tcAccessController;
-    }
-
-    @Override
-    public Object getService(Bundle arg0, ServiceRegistration arg1) {
-        Graph tc = 
-                new SecuredGraph(tcManager.getImmutableGraph(name), name,
-                tcAccessController);
-        return tc.getImmutableGraph();
-    }
-
-    @Override
-    public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) {
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
deleted file mode 100644
index 5253201..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
+++ /dev/null
@@ -1,54 +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.rdf.core.access;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceFactory;
-import org.osgi.framework.ServiceRegistration;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.security.TcAccessController;
-
-/**
- * @see <a href="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/ServiceFactory.html">
- * Interface ServiceFactory</a>
- *
- * @author mir
- */
-public class MGraphServiceFactory implements ServiceFactory {
-    
-    private TcManager tcManager;
-    private IRI name;
-    private final TcAccessController tcAccessController;
-
-    MGraphServiceFactory(TcManager tcManager, IRI name,
-            TcAccessController tcAccessController) {
-        this.tcManager = tcManager;
-        this.name = name;
-        this.tcAccessController = tcAccessController;
-    }
-
-    @Override
-    public Object getService(Bundle arg0, ServiceRegistration arg1) {
-        return new SecuredGraph(tcManager.getMGraph(name), name, tcAccessController);
-    }
-
-    @Override
-    public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) {
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
deleted file mode 100644
index a39c63f..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
+++ /dev/null
@@ -1,51 +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.rdf.core.access;
-
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * is thrown on an attempt to perform an operation on an entity (i.e. a
- * <code>ImmutableGraph</code> or <code>Graph</code> that does not exist.
- *
- * @author reto
- */
-public class NoSuchEntityException extends RuntimeException {
-    private IRI entityName;
-
-    /**
-     * creates an exception indicating that the entity with the specified name
-     * does not exist.
-     * 
-     * @param entityName the name for which no entity exists
-     */
-    public NoSuchEntityException(IRI entityName) {
-        super("No such entity: "+entityName);
-        this.entityName = entityName;
-    }
-
-    /**
-     * the name for which no entity exists.
-     * 
-     * @return the name of the entity that doesn't exist
-     */
-    public IRI getEntityName() {
-        return entityName;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
deleted file mode 100644
index 0f38bee..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
+++ /dev/null
@@ -1,43 +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.rdf.core.access;
-
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.sparql.query.Query;
-
-/**
- * Extends the TcProvider interface for providers that support sparql queries.
- */
-public interface QueryableTcProvider extends TcProvider {
-
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query.
-     * 
-     * @param query
-     *            the sparql query to execute
-     * @param defaultGraph
-     *            the default ImmutableGraph against which to execute the query if not
-     *            FROM clause is present
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     */
-    public Object executeSparqlQuery(String query, IRI defaultGraphUri);
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ReadOnlyException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ReadOnlyException.java
deleted file mode 100644
index 4991dc4..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ReadOnlyException.java
+++ /dev/null
@@ -1,50 +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.rdf.core.access;
-
-import java.security.AccessControlException;
-
-/**
- * is thrown on an attempt to add or remove triples to a 
- * read-only mutable ImmutableGraph 
- *
- * @author tsuy
- */
-public class ReadOnlyException extends AccessControlException {
-
-    private String action;
-
-    /**
-     * creates an exception indicating that the mutable ImmutableGraph is read-only
-     * 
-     * @param action
-     */
-    public ReadOnlyException(String action) {
-        super("read only mutable ImmutableGraph, not allowed to "+action);
-        this.action = action;
-    }
-
-    /**
-     * 
-     * @return the name of the action
-     */
-    public String getAction() {
-        return action;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
deleted file mode 100644
index 9cf5be7..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
+++ /dev/null
@@ -1,198 +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.rdf.core.access;
-
-import java.security.AccessControlException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.security.TcAccessController;
-import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.WatchableGraph;
-import org.apache.clerezza.commons.rdf.event.FilterTriple;
-import org.apache.clerezza.commons.rdf.event.GraphListener;
-
-/**
- * A Secured triple collection wraps a triple collection checking each access
- * for the rights on a the ImmutableGraph for which the uri is passed to the 
- * constructor.
- *
- * @author mir, hasan
- */
-public class SecuredGraph implements Graph {
-
-    private final Graph wrapped;
-    private final IRI name;
-    private final TcAccessController tcAccessController;
-
-    public SecuredGraph(Graph wrapped, IRI name,
-            TcAccessController tcAccessController) {
-        this.wrapped = wrapped;
-        this.name = name;
-        this.tcAccessController = tcAccessController;
-    }
-
-    @Override
-    public Iterator<Triple> filter(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
-        final Iterator<Triple> baseIter = wrapped.filter(subject, predicate, object);
-        return new Iterator<Triple>() {
-
-            @Override
-            public boolean hasNext() {
-                checkRead();
-                return baseIter.hasNext();
-            }
-
-            @Override
-            public Triple next() {
-                checkRead();
-                return baseIter.next();
-            }
-
-            @Override
-            public void remove() {
-                checkWrite();
-                baseIter.remove();
-            }
-        };
-    }
-
-    @Override
-    public int size() {
-        checkRead();
-        return wrapped.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        checkRead();
-        return wrapped.isEmpty();
-    }
-
-    @Override
-    public Object[] toArray() {
-        checkRead();
-        return wrapped.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        checkRead();
-        return wrapped.toArray(a);
-    }
-
-    @Override
-    public boolean add(Triple e) {
-        checkWrite();
-        return wrapped.add(e);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        checkWrite();
-        return wrapped.remove(o);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends Triple> c) {
-        checkWrite();
-        return wrapped.addAll(c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        checkWrite();
-        return wrapped.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        checkWrite();
-        return wrapped.retainAll(c);
-    }
-
-    @Override
-    public void clear() {
-        checkWrite();
-        wrapped.clear();
-    }
-
-    void checkRead() {
-        tcAccessController.checkReadPermission(name);
-    }
-
-    void checkWrite() {
-        tcAccessController.checkReadWritePermission(name);
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        checkRead();
-        return wrapped.contains((Triple) o);
-    }
-
-
-    @Override
-    public Iterator<Triple> iterator() {
-        return filter(null, null, null);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        checkRead();
-        return wrapped.containsAll(c);
-    }
-    
-    @Override
-    public ImmutableGraph getImmutableGraph() {
-        return new SimpleImmutableGraph(this);
-    }
-
-    @Override
-    public ReadWriteLock getLock() {
-        return wrapped.getLock();
-    }
-    
-    /**
-     * Returns the wrapped Graph if the caller has all access rights.
-     * If the caller has only the read access right, then a write-blocked
-     * Graph is returned. If the caller has neither the read nor the write
-     * access right then an AccessControlException is thrown.
-     *
-     * @return the wrapped Graph or a write-block Graph depending
-     *        on the access rights of the caller.
-     */
-    public Graph getUnsecuredGraph() {
-        try {
-            checkWrite();
-            return wrapped;
-        } catch (AccessControlException ex) {
-            checkRead();
-            return new WriteBlockedGraph(wrapped);
-        }
-        
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
deleted file mode 100644
index cc398dd..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
+++ /dev/null
@@ -1,626 +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.rdf.core.access;
-
-import java.security.AccessControlException;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.security.TcAccessController;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
-import org.apache.clerezza.rdf.core.sparql.NoQueryEngineException;
-import org.apache.clerezza.rdf.core.sparql.ParseException;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-import org.apache.clerezza.rdf.core.sparql.ResultSet;
-import org.apache.clerezza.rdf.core.sparql.SparqlPreParser;
-import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
-import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
-import org.apache.clerezza.rdf.core.sparql.query.DescribeQuery;
-import org.apache.clerezza.rdf.core.sparql.query.Query;
-import org.apache.clerezza.rdf.core.sparql.query.SelectQuery;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-
-/**
- * This class implements
- * <code>TcManager</code>, delegating the actual provision and creation of
- * Graphs or MGraphs to registered
- * <code>TcProvider</code>s. The class attempts to satisfy the request using the
- * register
- * <code>WeightedTcProvider</code> in decreasing order of weight. If multiple
- * providers have the same weight the lexicographical order of the fully
- * qualified class name determines which one is used, namely the one that occurs
- * earlier. If a call to a registered provider causes an
- * <code>IllegalArgumentException</code>,
- * <code>NoSuchEntityException</code> or
- * <code>UnsupportedOperationException</code> then the call is delegated to the
- * next provider.
- *
- * Only one instance of this class should exist in a system, the public no
- * argument constructor is meant for initialization by dependency injection
- * systems such as OSGi-DS. Applications should use the static
- * <code>getInstance()</code> method if they aren't using a framework that
- * injects them the instance.
- *
- * This class returns
- * <code>Graph</code>s a subtype of
- * <code>Graph</code> that allows read/write locks.
- *
- * This class also registers all Graphs as services with the property
- * 'name' indicating there name.
- *
- * Security checks are done when a Graph is retrieved. The returned
- * Graph will do no further security checks. Because of this it
- * should not be passed to a context where different access control applies. If
- * an Graph is retrieved without having write permission the returned graph
- * will be read-only.
- *
- * If a Graphs needs to passed around across different security
- * contexts the one retrieved from the OSGi service whiteboard should be used as
- * this performs access control on every access.
- *
- * @author reto, mir, hasan
- *
- */
-//immedia is set to true as this should register the ImmutableGraph services (even if manager service is not required)
-@Component(service = TcManager.class, immediate = true,
-        property={
-            "graph.cache.enabled=true",
-            "Graph.services.enabled=true"})
-public class TcManager extends TcProviderMultiplexer {
-
-    public final static String GENERAL_PURPOSE_TC = "general.purpose.tc";
-    public final static String Graph_SERVICES_ENABLED = "Graph.services.enabled";
-    public final static String MGRAPH_CACHE_ENABLED = "graph.cache.enabled";
-
-    private static volatile TcManager instance;
-    private TcAccessController tcAccessController = new TcAccessController() {
-
-        @Override
-        protected TcManager getTcManager() {
-            return TcManager.this;
-        }
-            
-    };
-    private Map<IRI, ServiceRegistration> serviceRegistrations = Collections
-            .synchronizedMap(new HashMap<IRI, ServiceRegistration>());
-    
-    protected QueryEngine queryEngine;
-    private boolean isActivated = false;
-    private boolean isTcServicesEnabled = true;
-
-    private ComponentContext componentContext;
-    protected SortedSet<WeightedTcProvider> tempProviderList = new TreeSet<WeightedTcProvider>(
-            new WeightedProviderComparator());
-
-    /**
-     * the constructor sets the singleton instance to allow instantiation by
-     * OSGi-DS. This constructor should not be called except by OSGi-DS,
-     * otherwise the static
-     * <code>getInstance</code> method should be used.
-     */
-    public TcManager() {
-        TcManager.instance = this;
-    }
-
-    /**
-     * This returns the singleton instance. If an instance has been previously
-     * created (e.g. by OSGi declarative services) this instance is returned,
-     * otherwise a new instance is created and providers are injected using the
-     * service provider interface (META-INF/services/)
-     *
-     * @return the singleton instance
-     */
-    public static TcManager getInstance() {
-        if (instance == null) {
-            synchronized (TcManager.class) {
-                if (instance == null) {
-                    instance = new TcManager();
-                    instance.isActivated = true;
-                    Iterator<WeightedTcProvider> weightedProviders = ServiceLoader
-                            .load(WeightedTcProvider.class).iterator();
-                    while (weightedProviders.hasNext()) {
-                        WeightedTcProvider weightedProvider = weightedProviders
-                                .next();
-                        instance
-                                .bindWeightedTcProvider(weightedProvider);
-                    }
-                    Iterator<QueryEngine> queryEngines = ServiceLoader.load(
-                            QueryEngine.class).iterator();
-                    System.out.println("looking for QE");
-                    if (queryEngines.hasNext()) {
-                        instance.queryEngine = queryEngines.next();
-                        System.out.println("QE: "
-                                + instance.queryEngine.getClass());
-                    }
-                }
-            }
-        }
-        return instance;
-    }
-    
-    protected void activate(final ComponentContext componentContext) {
-        this.componentContext = componentContext;
-        
-        // Read configuration
-		isTcServicesEnabled = true;
-		Object configTcServicesEnabled = componentContext.getProperties().get(Graph_SERVICES_ENABLED);
-		if ( configTcServicesEnabled != null && configTcServicesEnabled instanceof String ) {
-			isTcServicesEnabled = Boolean.valueOf((String)configTcServicesEnabled);				
-		}
-		Object configCacheEnabled = componentContext.getProperties().get(MGRAPH_CACHE_ENABLED);
-		if ( configCacheEnabled != null && configCacheEnabled instanceof String ) {
-			setCachingEnabled(Boolean.valueOf((String)configCacheEnabled));				
-		}
-		isActivated = true;
-		
-        for (WeightedTcProvider provider : tempProviderList) {
-        	addWeightedTcProvider(provider);
-        }
-        tempProviderList.clear();
-    }
-
-    protected void deactivate(final ComponentContext componentContext) {
-        for (ServiceRegistration registration : serviceRegistrations.values()) {
-            registration.unregister();
-        }
-        serviceRegistrations.clear();
-        this.componentContext = null;
-		isActivated = false;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        tcAccessController.checkReadPermission(name);
-        return super.getImmutableGraph(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name) {
-        try {
-            tcAccessController.checkReadWritePermission(name);
-        } catch (AccessControlException e) {
-            tcAccessController.checkReadPermission(name);
-            return new WriteBlockedGraph(super.getMGraph(name));
-        }
-        return super.getMGraph(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name) {
-        try {
-            tcAccessController.checkReadWritePermission(name);
-        } catch (AccessControlException e) {
-            tcAccessController.checkReadPermission(name);
-            return new WriteBlockedGraph(
-                    super.getGraph(name));
-        }
-        return super.getGraph(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name)
-            throws UnsupportedOperationException {
-        tcAccessController.checkReadWritePermission(name);
-        return super.createGraph(name);
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        tcAccessController.checkReadWritePermission(name);
-        return super.createImmutableGraph(name, triples);
-    }
-
-    @Override
-    public void deleteGraph(IRI name) {
-        tcAccessController.checkReadWritePermission(name);
-        super.deleteGraph(name);
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        return super.getNames(ImmutableGraph);
-    }
-
-    @Override
-    public Set<IRI> listGraphs() {
-        Set<IRI> result = super.listGraphs();
-        return excludeNonReadable(result);
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        Set<IRI> result = super.listMGraphs();
-        return excludeNonReadable(result);
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        Set<IRI> result = super.listImmutableGraphs();
-        return excludeNonReadable(result);
-    }
-
-    private Set<IRI> excludeNonReadable(Set<IRI> tcNames) {
-        SecurityManager security = System.getSecurityManager();
-        if (security == null) {
-            return tcNames;
-        }
-        Set<IRI> result = new HashSet<IRI>();
-        for (IRI name : tcNames) {
-            try {
-                tcAccessController.checkReadPermission(name);
-            } catch (AccessControlException e) {
-                continue;
-            }
-            result.add(name);
-        }
-        return result;
-    }
-
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query. If the defaultGraph is available
-     * in this TcManages executeSparqlQuery(String, UriRef) should be used instead.
-     *
-     * @param query the sparql query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if no FROM clause is present
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     */
-    public Object executeSparqlQuery(String query, Graph defaultGraph) throws ParseException {
-        TcProvider singleTargetTcProvider = null;
-
-        final IRI defaultGraphName = new IRI("urn:x-temp:/kjsfadfhfasdffds");
-        final SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
-        final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
-        if ((referencedGraphs != null) && (!referencedGraphs.contains(defaultGraphName))) {
-            singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
-        }
-        if ((singleTargetTcProvider != null) && (singleTargetTcProvider instanceof QueryableTcProvider)) {
-            return ((QueryableTcProvider) singleTargetTcProvider).executeSparqlQuery(query, null);
-        }
-        final QueryEngine queryEngine = this.queryEngine;
-        if (queryEngine != null) {
-            return queryEngine.execute(this, defaultGraph, query);
-        } else {
-            throw new NoQueryEngineException();
-        }
-    }
-
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query. Note that this method only works for
-     * queries that do not need a default ImmutableGraph.
-     *
-     * @param query the sparql query to execute
-     * @param forceFastlane indicate whether to force fastlane usage.
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     */
-    public Object executeSparqlQuery(String query, boolean forceFastlane) throws ParseException {
-        TcProvider singleTargetTcProvider = null;
-    	if (forceFastlane) {
-            singleTargetTcProvider = getSingleTargetTcProvider(Collections.EMPTY_SET);
-    	} else {    	
-	        final IRI defaultGraphName = new IRI("urn:x-temp:/kjsfadfhfasdffds");
-	        SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
-	        final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
-	        if ((referencedGraphs != null) && (!referencedGraphs.contains(defaultGraphName))) {
-	            singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
-	        }
-    	}
-    	
-        if ((singleTargetTcProvider != null) && (singleTargetTcProvider instanceof QueryableTcProvider)) {
-            return ((QueryableTcProvider)singleTargetTcProvider).executeSparqlQuery(query, null);
-        }
-        final QueryEngine queryEngine = this.queryEngine;
-        if (queryEngine != null) {
-            return queryEngine.execute(this, new SimpleGraph(), query);
-        } else {
-            throw new NoQueryEngineException();
-        }
-    }
-    
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query. If the defaultGraph is available
-     * in this TcManages executeSparqlQuery(String, UriRef) should be used instead.
-     *
-     * @param query the sparql query to execute
-     * @param defaultGraphName the ImmutableGraph to be used as default ImmutableGraph in the Sparql ImmutableGraph Store
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     */
-    public Object executeSparqlQuery(String query, IRI defaultGraphName) throws ParseException {
-      return executeSparqlQuery(query, defaultGraphName, false);
-    }
-
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query. If the defaultGraph is available
-     * in this TcManages executeSparqlQuery(String, UriRef) should be used instead.
-     *
-     * @param query the sparql query to execute
-     * @param defaultGraph the ImmutableGraph to be used as default ImmutableGraph in the Sparql ImmutableGraph Store
-     * @param forceFastlane indicate whether to force fastlane usage.
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     */
-    public Object executeSparqlQuery(String query, IRI defaultGraphName, boolean forceFastlane) throws ParseException {
-        TcProvider singleTargetTcProvider = null;
-    	if (forceFastlane) {
-            singleTargetTcProvider = getSingleTargetTcProvider(Collections.singleton(defaultGraphName));
-    	} else {    	
-	        SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
-	        final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
-	        if ((referencedGraphs != null)) {
-	            singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
-	        }
-    	}
-        if ((singleTargetTcProvider != null) && (singleTargetTcProvider instanceof QueryableTcProvider)) {
-            return ((QueryableTcProvider)singleTargetTcProvider).executeSparqlQuery(query, defaultGraphName);
-        }
-        final QueryEngine queryEngine = this.queryEngine;
-        if (queryEngine != null) {
-            return queryEngine.execute(this, this.getGraph(defaultGraphName), query);
-        } else {
-            throw new NoQueryEngineException();
-        }
-    }
-
-    /**
-     * Executes any sparql query. The type of the result object will vary
-     * depending on the type of the query.
-     *
-     * @param query the sparql query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if no FROM clause is present
-     * @return the resulting ResultSet, ImmutableGraph or Boolean value
-     *
-     * @deprecated Query is discontinued
-     */
-    @Deprecated
-    public Object executeSparqlQuery(Query query, Graph defaultGraph) {
-        final QueryEngine queryEngine = this.queryEngine;
-        if (queryEngine != null) {
-            return queryEngine.execute(this, defaultGraph, query);
-        } else {
-            throw new NoQueryEngineException();
-        }
-    }
-
-    /**
-     * Executes a sparql SELECT query.
-     *
-     * @param query the sparql SELECT query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if not FROM clause is present
-     * @return the resulting ResultSet
-     * @deprecated Query is discontinued
-     */
-    @Deprecated
-    public ResultSet executeSparqlQuery(SelectQuery query,
-            Graph defaultGraph) {
-        return (ResultSet) executeSparqlQuery((Query) query, defaultGraph);
-    }
-
-    /**
-     * Executes a sparql ASK query.
-     *
-     * @param query the sparql ASK query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if not FROM clause is present
-     * @return the boolean value this query evaluates to
-     * @deprecated Query is discontinued
-     */
-    @Deprecated
-    public boolean executeSparqlQuery(AskQuery query,
-            Graph defaultGraph) {
-        return (Boolean) executeSparqlQuery((Query) query, defaultGraph);
-    }
-
-    /**
-     * Executes a sparql DESCRIBE query.
-     *
-     * @param query the sparql DESCRIBE query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if not FROM clause is present
-     * @return the resulting ImmutableGraph
-     * @deprecated Query is discontinued
-     */
-    @Deprecated
-    public ImmutableGraph executeSparqlQuery(DescribeQuery query,
-            Graph defaultGraph) {
-        return (ImmutableGraph) executeSparqlQuery((Query) query, defaultGraph);
-    }
-
-    /**
-     * Executes a sparql CONSTRUCT query.
-     *
-     * @param query the sparql CONSTRUCT query to execute
-     * @param defaultGraph the default ImmutableGraph against which to execute the query
-     * if not FROM clause is present
-     * @return the resulting ImmutableGraph
-     * @deprecated Query is discontinued
-     */
-    @Deprecated
-    public ImmutableGraph executeSparqlQuery(ConstructQuery query,
-            Graph defaultGraph) {
-        return (ImmutableGraph) executeSparqlQuery((Query) query, defaultGraph);
-    }
-
-    /**
-     * @return the TcAccessController that can be used to set the permissions
-     * needed to access a Triple Collection
-     */
-    public TcAccessController getTcAccessController() {
-        return tcAccessController;
-    }
-
-    /**
-     * Registers a provider
-     *
-     * @param provider the provider to be registered
-     */
-    @Reference(policy = ReferencePolicy.DYNAMIC, 
-            cardinality = ReferenceCardinality.MULTIPLE)
-    protected void bindWeightedTcProvider(WeightedTcProvider provider) {
-    	if (isActivated) {
-    		addWeightedTcProvider(provider);
-    	} else {
-    		tempProviderList.add(provider);  		
-    	}
-    }
-
-    /**
-     * Unregister a provider
-     *
-     * @param provider the provider to be deregistered
-     */
-    protected void unbindWeightedTcProvider(
-            WeightedTcProvider provider) {
-        removeWeightedTcProvider(provider);
-    }
-    
-    /**
-     * Registers a provider
-     *
-     * @param provider the provider to be registered
-     */
-    @Reference(policy = ReferencePolicy.DYNAMIC, 
-            cardinality = ReferenceCardinality.AT_LEAST_ONE,
-            target = "("+TcManager.GENERAL_PURPOSE_TC+"=true)")
-    protected void bindGpWeightedTcProvider(WeightedTcProvider provider) {
-    	if (isActivated) {
-    		addWeightedTcProvider(provider);
-    	} else {
-    		tempProviderList.add(provider);  		
-    	}
-    }
-
-    /**
-     * Unregister a provider
-     *
-     * @param provider the provider to be deregistered
-     */
-    protected void unbindGpWeightedTcProvider(
-            WeightedTcProvider provider) {
-        removeWeightedTcProvider(provider);
-    }
-    
-    @Reference(policy = ReferencePolicy.DYNAMIC,
-            cardinality = ReferenceCardinality.OPTIONAL)
-    protected void bindQueryEngine(QueryEngine queryEngine) {
-        this.queryEngine = queryEngine;
-    }
-    
-    protected void unbindQueryEngine(QueryEngine queryEngine) {
-        this.queryEngine = null;
-    }
-
-    @Override
-    protected void mGraphAppears(IRI name) {
-    	if (isTcServicesEnabled()) {
-    		// Only create the service when activated. When not activated
-    		// creating will be delayed till after activation.
-	        if (componentContext != null) {
-	            registerGraphAsService(name, true);
-	        }
-    	}
-    }
-
-    @Override
-    protected void graphAppears(IRI name) {
-    	if (isTcServicesEnabled()) {
-    		// Only create the service when activated. When not activated
-    		// creating will be delayed till after activation.
-	        if (componentContext != null) {
-	            registerGraphAsService(name, false);
-	        }
-    	}
-    }
-
-    private void registerGraphAsService(IRI name, boolean isMGraph) {
-        Dictionary<String,Object> props = new Hashtable<String, Object>();
-        props.put("name", name.getUnicodeString());
-        String[] interfaceNames;
-        Object service;
-        if (isMGraph) {
-            interfaceNames = new String[]{
-                Graph.class.getName(),
-                Graph.class.getName()
-            };
-            service = new MGraphServiceFactory(this, name, tcAccessController);
-        } else {
-            interfaceNames = new String[]{ImmutableGraph.class.getName()};
-            service = new ImmutableGraphServiceFactory(this, name, tcAccessController);
-        }
-        final int bundleState = componentContext.getBundleContext().getBundle().getState();
-        if ((bundleState == Bundle.ACTIVE) || (bundleState == Bundle.STARTING)) {
-            ServiceRegistration serviceReg = componentContext.getBundleContext()
-                    .registerService(interfaceNames, service, props);
-            serviceRegistrations.put(name, serviceReg);
-        }
-    }
-
-    @Override
-    protected void tcDisappears(IRI name) {
-        ServiceRegistration reg = serviceRegistrations.get(name);
-        if (reg != null) {
-            reg.unregister();
-            serviceRegistrations.remove(name);
-        }
-    }
-
-    private TcProvider getSingleTargetTcProvider(final Set<IRI> referencedGraphs) {
-        TcProvider singleTargetTcProvider = null;
-        for (WeightedTcProvider provider : providerList) {
-            final Set<IRI> providerGraphs = provider.listGraphs();
-            if (providerGraphs.containsAll(referencedGraphs)) {
-               singleTargetTcProvider = provider;
-               break; //success
-            }
-            for (IRI graphName : referencedGraphs) {
-                if (providerGraphs.contains(graphName)) {
-                    break; //failure
-                }
-            }      
-        }
-        return singleTargetTcProvider;
-    }
-
-    public boolean isTcServicesEnabled() {
-		return isTcServicesEnabled;
-	}
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
deleted file mode 100644
index 31b8fe7..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
+++ /dev/null
@@ -1,151 +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.rdf.core.access;
-
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * A TC (Graph) Provider allows access to and optionally 
- * creation of named {@link ImmutableGraph}s and {@link Graph}s (mutable graphs)
- *
- * @author reto
- */
-public interface TcProvider {
-
-    /**
-     * Get a <code>ImmutableGraph</code> by its name
-     *
-     * @param name the name of the ImmutableGraph
-     * @return the <code>ImmutableGraph</code> with the specified name
-     * @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
-     *         with the specified name
-     */
-    ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException;
-
-    /**
-     * Get an <code>Graph</code> taht is not <code>ImmutableGrah</code>. The instances
-     * returned in different invocations are <code>equals</code>.
-     *
-     * @param the name of the <code>Graph</code>
-     * @return name the <code>Graph</code> with the specified name
-     * @throws NoSuchEntityException if there is no <code>Graph</code>
-     *         with the specified name
-     */
-    Graph getMGraph(IRI name) throws NoSuchEntityException;
-    
-    /**
-     * This method is used to get a <code>Graph</code> indifferently
-     * whether it's a ImmutableGraph or not. If the <code>name</code> names an 
-     * <code>Graph</code> the result is the same as when invoking 
-     * <code>getMGraph</code> with that argument, analogously for 
-     * <code>ImmutableGraph</code>S the method returns an instance equals to what 
-     * <code>getImmutableGraph</code> would return. 
-     * 
-     * @param name the name of the <Code>ImmutableGraph</code> or <code>Graph</code>
-     * @return the <Code>ImmutableGraph</code> or <code>Graph</code>
-     * @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
-     *         or <code>Graph</code> with the specified name
-     */
-    Graph getGraph(IRI name) throws NoSuchEntityException;
-
-    /**
-     * Lists the name of the <Code>ImmutableGraph</code>s available through this
-     * <code>TcProvider</code>, implementations may take into account the
-     * security context and omit <Code>ImmutableGraph</code>s for which access is not
-     * allowed.
-     *
-     * @return the list of <Code>ImmutableGraph</code>s
-     */
-    Set<IRI> listImmutableGraphs();
-
-    /**
-     * Lists the name of the <Code>Graph</code>s available through this
-     * <code>TcProvider</code> that are not <Code>ImmutableGraph</code>, implementations may take into account the
-     * security context and omit <Code>Graph</code>s for which access is not
-     * allowed.
-     *
-     * @return the list of <Code>Graph</code>s
-     */
-    Set<IRI> listMGraphs();
-
-    /**
-     * Lists the name of the <Code>Graph</code>s available through this
-     * <code>TcProvider</code> indifferently whether they are mutables or 
-     * immutables, implementations may take into account the security context and
-     * omit <Code>Graph</code>s for which access is not allowed.
-     *
-     * @return the list of <Code>Graph</code>s
-     */
-    Set<IRI> listGraphs();
-
-    /**
-     * Creates an initially empty <code>Graph</code> with a specified name
-     *
-     * @param name names the new <code>Graph</code>
-     * @return the newly created <code>Graph</code>
-     * @throws UnsupportedOperationException if this provider doesn't support
-     *         creating <code>Graph</code>S
-     * @throws EntityAlreadyExistsException if an Graph with the specified name
-     *         already exists
-     */
-    Graph createGraph(IRI name) throws UnsupportedOperationException, 
-            EntityAlreadyExistsException;
-
-    /**
-     * Creates a <code>ImmutableGraph</code> with a specified name
-     *
-     * @param name the name of the <code>ImmutableGraph</code> to be created
-     * @param triples the triples of the new <code>ImmutableGraph</code>
-     * @return the newly created <code>ImmutableGraph</code>
-     * @throws UnsupportedOperationException if this provider doesn't support
-     *         creating <code>ImmutableGraph</code>S
-     * @throws EntityAlreadyExistsException if a ImmutableGraph with the specified name
-     *         already exists
-     */
-    ImmutableGraph createImmutableGraph(IRI name, Graph triples) 
-            throws UnsupportedOperationException, EntityAlreadyExistsException;
-    
-    /**
-     * Deletes the <code>ImmutableGraph</code> or <code>Graph</code> of a specified name.
-     * If <code>name</code> references a ImmutableGraph and the ImmutableGraph has other names, it
-     * will still be available with those other names.
-     * 
-     * @param name the entity to be removed
-     * @throws UnsupportedOperationException if this provider doesn't support
-     *         entities deletion.
-     * @throws NoSuchEntityException if <code>name</code> doesn't refer to a 
-     *           <code>ImmutableGraph</code> or an <code>Graph</code>.
-     * @throws EntityUndeletableException if the specified ImmutableGraph is undeletable
-     */
-    void deleteGraph(IRI name) throws UnsupportedOperationException,
-            NoSuchEntityException, EntityUndeletableException;
-
-    /**
-     * get a set of the names of a <code>ImmutableGraph</code>
-     *
-     * @param ImmutableGraph
-     * @return the set names of <code>ImmutableGraph</code>, the set is empty if
-     *         <code>ImmutableGraph</code> is unknown
-     */
-    Set<IRI> getNames(ImmutableGraph immutableGraph);
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
deleted file mode 100644
index 094238d..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
+++ /dev/null
@@ -1,457 +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.rdf.core.access;
-
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-
-/**
- * This makes a set of WeightedTcProvider appear as one TcProvider. It delegates
- * requests to the WeightedTcProvider with the highest Weight
- *
- * @author reto
- */
-public class TcProviderMultiplexer implements TcProvider {
-
-    protected SortedSet<WeightedTcProvider> providerList = new TreeSet<WeightedTcProvider>(
-            new WeightedProviderComparator());
-    /**
-     * Mapping to Graph's and ServiceRegistration using their URI's as key.
-     * Makes sure that per URI only one instance of the Graph is used,
-     * otherwise the locks in the <code>Graph</code>s would have no effect
-     * between different instances and concurrency issues could occur.
-     */
-    private Map<IRI, MGraphHolder> mGraphCache = Collections.synchronizedMap(new HashMap<IRI, MGraphHolder>());
-
-	/**
-	 * Flag to indicate whether mgraphs should be cached for faster access. By
-	 * default caching is enabled for backward compatibility.
-	 */
-	private boolean isCachingEnabled = true;
-
-    /**
-     * Registers a provider
-     *
-     * @param provider
-     *            the provider to be registered
-     */
-    public void addWeightedTcProvider(WeightedTcProvider provider) {
-        providerList.add(provider);
-        updateGraphCache(provider, true);
-    }
-
-    /**
-     * Unregister a provider
-     *
-     * @param provider
-     *            the provider to be deregistered
-     */
-    public void removeWeightedTcProvider(
-            WeightedTcProvider provider) {
-        providerList.remove(provider);
-        updateGraphCache(provider, false);
-    }
-
-    /**
-     * subclasses overwrite this method to be notified when a new
-     * ImmutableGraph is available (either because it has been created or being
-     * provided by a newly added WeightedTcProvider). The default implementation
-     * does nothing.
-     *
-     * @param name
-     */
-    protected void graphAppears(IRI name) {
-    }
-
-    /**
-     * subclasses overwrite this method to be notified when a new
-     * Graph is available (either because it has been created or being
-     * provided by a newly added WeightedTcProvider). The default implementation
-     * does nothing.
-     *
-     * @param name
-     */
-    protected void mGraphAppears(IRI name) {
-    }
-
-    /**
-     * subclasses overwrite this method to be notified whenGraph is 
-     * no longer available (either because it has been deleted or bacause its
-     * WeightedTcProvider was removed). The default implementation does nothing.
-     *
-     * for implementational reasons even for name of Graph not
-     * previously registered.
-     *
-     * @param name
-     */
-    protected void tcDisappears(IRI name) {
-    }
-
-    /**
-     * Updates the lockableMGraphCache AFTER a new <code>provider</code> was
-     * bound or unbound.
-     * This method also takes care of registering and unregistering
-     * provided triple collections as services based on the weight of
-     * all affected providers.
-     *
-     * @param provider
-     *            the provider that was added or removed
-     * @param providerAdded
-     *            <code>boolean</code> that should be set as <code>true</code>
-     *            if <code>provider</code> was added to
-     *            <code>org.apache.clerezza.rdf.core.TcManager.providerList</code>
-     *            otherwise <code>false</code>
-     */
-    private void updateGraphCache(WeightedTcProvider provider,
-            boolean providerAdded) {
-        Set<IRI> uriSet = provider.listGraphs();
-        if (!(uriSet == null || uriSet.isEmpty())) {
-            if (providerAdded) {
-                weightedProviderAdded(provider, uriSet);
-            } else {
-                weightedProviderRemoved(provider, uriSet);
-            }
-        }
-    }
-
-    private void weightedProviderAdded(WeightedTcProvider newProvider,
-            Set<IRI> newProvidedUris) {
-        Set<WeightedTcProvider> lowerWeightedProviderList = getLowerWeightedProvider(newProvider);
-    	if (isCachingEnabled()) {
-	        for (IRI name : newProvidedUris) {
-	            final MGraphHolder holder = mGraphCache.get(name);
-	            if ((holder != null) && (holder.getWeightedTcProvider() != null)) {
-	                if (lowerWeightedProviderList.contains(holder.getWeightedTcProvider())) {
-	                    tcDisappears(name);
-	                    mGraphCache.remove(name);
-	                } else {
-	                    continue;
-	                }
-	            }
-	            Graph triples = newProvider.getGraph(name);
-	            if (triples instanceof Graph) {
-	           		mGraphCache.put(name, new MGraphHolder(newProvider, ensureLockable((Graph)triples)));
-	                mGraphAppears(name);
-	            } else {
-	                graphAppears(name);
-	            }
-	    	}
-        }
-    }
-
-    
-
-    private Set<WeightedTcProvider> getLowerWeightedProvider(
-            WeightedTcProvider newProvider) {
-        boolean referenceProviderPassed = false;
-        Set<WeightedTcProvider> lowerWeightedProviderList = new HashSet<WeightedTcProvider>();
-        for (WeightedTcProvider weightedProvider : providerList) {
-            if (referenceProviderPassed) {
-                lowerWeightedProviderList.add(weightedProvider);
-            } else if (newProvider.equals(weightedProvider)) {
-                referenceProviderPassed = true;
-            }
-        }
-        return lowerWeightedProviderList;
-    }
-
-    private void weightedProviderRemoved(WeightedTcProvider oldProvider,
-            Set<IRI> oldProvidedUris) {
-        for (IRI name : oldProvidedUris) {
-            final MGraphHolder holder = mGraphCache.get(name);
-            if ((holder != null) && (holder.getWeightedTcProvider() != null)
-                    && holder.getWeightedTcProvider().equals(oldProvider)) {
-                tcDisappears(name);
-                mGraphCache.remove(name);
-
-            	if (isCachingEnabled()) {
-	                // check if another WeightedTcProvider has the Graph.
-	                // And if so register as service.
-	                for (WeightedTcProvider provider : providerList) {
-	                    try {
-	                        Graph triples = provider.getGraph(name);
-	                        if (triples instanceof Graph) {
-	                       		mGraphCache.put(name, new MGraphHolder(provider, ensureLockable((Graph)triples)));
-	                            mGraphAppears(name);
-	                        } else {
-	                            graphAppears(name);
-	                        }
-	                        break;
-	                    } catch (NoSuchEntityException e) {
-	                        // continue;
-	                    }
-	                }
-            	}
-            }
-        }
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        for (TcProvider provider : providerList) {
-            try {
-                return provider.getImmutableGraph(name);
-            } catch (NoSuchEntityException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name)
-            throws NoSuchEntityException {
-        Graph result = getMGraphFromCache(name);
-        if (result == null) {
-            synchronized (this) {
-                result = getMGraphFromCache(name);
-                if (result == null) {
-                    result = getUnsecuredMGraphAndAddToCache(name);
-                }
-            }
-        }
-        return result;
-    }
-
-    private Graph getMGraphFromCache(IRI name) {
-        MGraphHolder holder = mGraphCache.get(name);
-        if (holder == null) {
-            return null;
-        }
-        return holder.getMGraph();
-    }
-
-    private Graph getUnsecuredMGraphAndAddToCache(IRI name)
-            throws NoSuchEntityException {
-        for (WeightedTcProvider provider : providerList) {
-            try {
-                Graph providedMGraph = provider.getMGraph(name);
-                Graph result = ensureLockable(providedMGraph);
-
-                if (isCachingEnabled()) {
-	                mGraphCache.put(name, new MGraphHolder(
-	                        provider, result));
-                }
-                return result;
-            } catch (NoSuchEntityException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name)
-            throws NoSuchEntityException {
-        Graph result;
-        for (WeightedTcProvider provider : providerList) {
-            try {
-                result = provider.getGraph(name);
-                if (result instanceof ImmutableGraph) {
-                    return result;
-                } else {
-                    // This is to ensure the Graph gets added to the cache
-                    return getMGraph(name);
-                }
-            } catch (NoSuchEntityException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name)
-            throws UnsupportedOperationException {
-
-        for (WeightedTcProvider provider : providerList) {
-            try {
-                Graph result = provider.createGraph(name);
-                // unregisters a possible ImmutableGraph or Graph service under this name
-                // provided by a WeightedTcProvider with a lower weight.
-                tcDisappears(name);
-                if (isCachingEnabled()) {
-                	mGraphCache.put(name, new MGraphHolder(provider, null));
-                }
-                mGraphAppears(name);
-                return result;
-            } catch (UnsupportedOperationException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        throw new UnsupportedOperationException(
-                "No provider could create Graph.");
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        for (WeightedTcProvider provider : providerList) {
-            try {
-                ImmutableGraph result = provider.createImmutableGraph(name, triples);
-
-                // unregisters a possible ImmutableGraph or Graph service under this name
-                // provided by a WeightedTcProvider with a lower weight.
-                tcDisappears(name);
-                if (isCachingEnabled()) {
-                	mGraphCache.put(name, new MGraphHolder(provider, null));
-                }
-                graphAppears(name);
-                return result;
-            } catch (UnsupportedOperationException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        throw new UnsupportedOperationException(
-                "No provider could create ImmutableGraph.");
-    }
-
-    @Override
-    public void deleteGraph(IRI name) {
-        for (TcProvider provider : providerList) {
-            try {
-                provider.deleteGraph(name);
-                final MGraphHolder holder = mGraphCache.get(name);
-                if ((holder != null)
-                        && (holder.getWeightedTcProvider() != null)
-                        && holder.getWeightedTcProvider().equals(provider)) {
-                    tcDisappears(name);
-                    mGraphCache.remove(name);
-                }
-                return;
-            } catch (UnsupportedOperationException e) {
-                // we do nothing and try our luck with the next provider
-            } catch (NoSuchEntityException e) {
-                //we do nothing and try our luck with the next provider
-            } catch (IllegalArgumentException e) {
-                //we do nothing and try our luck with the next provider
-            }
-        }
-        // this throws a NoSuchEntityException if the ImmutableGraph doesn't exist
-        getGraph(name);
-        // the entity exists but cannot be deleted
-        throw new UnsupportedOperationException(
-                "No provider could delete the entity.");
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        Set<IRI> result = new HashSet<IRI>();
-        for (TcProvider provider : providerList) {
-            result.addAll(provider.getNames(ImmutableGraph));
-        }
-        return result;
-    }
-
-    @Override
-    public Set<IRI> listGraphs() {
-        Set<IRI> result = new HashSet<IRI>();
-        for (TcProvider provider : providerList) {
-            result.addAll(provider.listGraphs());
-        }
-        return result;
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        Set<IRI> result = new HashSet<IRI>();
-        for (TcProvider provider : providerList) {
-            result.addAll(provider.listMGraphs());
-        }
-        return result;
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        Set<IRI> result = new HashSet<IRI>();
-        for (TcProvider provider : providerList) {
-            result.addAll(provider.listImmutableGraphs());
-        }
-        return result;
-    }
-
-    private Graph ensureLockable(Graph providedMGraph) {
-        //Graphs are alway locable now
-        return providedMGraph;
-    }
-
-    /**
-     * Contains an unsecured Graph, a ServiceRegistration and
-     * the WeightedTcProvider that generated the ImmutableGraph
-     */
-    private static class MGraphHolder {
-
-        private WeightedTcProvider tcProvider;
-        private WeakReference<Graph> mGraphReference;
-
-        MGraphHolder(WeightedTcProvider tcProvider, Graph graph) {
-            this.tcProvider = tcProvider;
-            this.mGraphReference = new WeakReference<Graph>(graph);
-        }
-
-        Graph getMGraph() {
-            return this.mGraphReference.get();
-        }
-
-        WeightedTcProvider getWeightedTcProvider() {
-            return this.tcProvider;
-        }
-    }
-
-    //methods for debuging / monitoring
-    public SortedSet<WeightedTcProvider> getProviderList() {
-        return providerList;
-    }
-
-    public boolean isCachingEnabled() {
-		return isCachingEnabled;
-	}
-    
-    public void setCachingEnabled(boolean isCachingEnabled) {
-		this.isCachingEnabled = isCachingEnabled;
-		
-		if (!isCachingEnabled()) {
-			mGraphCache.clear();
-		}
-	}
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedProviderComparator.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedProviderComparator.java
deleted file mode 100644
index a3e2409..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedProviderComparator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.clerezza.rdf.core.access;
-/*
- *
- * 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.
- *
-*/
-
-
-import java.util.Comparator;
-
-/**
- * Compares the WeightedTcManagementProviders, descending for weight and
- * ascending by name
- */
-public class WeightedProviderComparator implements Comparator<WeightedTcProvider> {
-
-    @Override
-    public int compare(WeightedTcProvider o1, WeightedTcProvider o2) {
-        int o1Weight = o1.getWeight();
-        int o2Weight = o2.getWeight();
-        if (o1Weight != o2Weight) {
-            return o2Weight - o1Weight;
-        }
-        return o1.getClass().toString().compareTo(o2.getClass().toString());
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedTcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedTcProvider.java
deleted file mode 100644
index bc1e7f2..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/WeightedTcProvider.java
+++ /dev/null
@@ -1,36 +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.rdf.core.access;
-
-/**
- * This interface is implemented by providers to which {@link TcManagerImpl}
- * delegates.
- *
- * @author reto
- */
-public interface WeightedTcProvider extends TcProvider {
-
-    /**
-     * Get the weight of this provider. {@link TcManager} will prioritize
-     * <code>TcProvider</code>s with greater weight.
-     * 
-     * @return a positive number indicating the weight of the provider
-     */
-    int getWeight();
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/package.html b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/package.html
deleted file mode 100644
index 8098e02..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/package.html
+++ /dev/null
@@ -1,56 +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.
- */
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>org.apache.clerezza.rdf.mopdel.access</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	</head>
-	<body>
-		<p>This package provides access to named {@link
-			org.apache.clerezza.rdf.model.ImmutableGraph}S and {@link
-			org.apache.clerezza.rdf.model.Graph}S that may originate from various
-			implementations.</p>
-		<h3>Accessing</h3>
-		<p>
-			If running in a dependency injection system you should get an instance
-			of
-			<code>TcManager</code>
-			by the framework, otherwise use the static method
-			<code>TcManager.getInstance</code>
-			.
-		</p>
-		<h3>Adding a provider</h3>
-		<p>A provider implements {@link WeightedTcProvider}.</p>
-		<p>
-			To work outside a component injection framework it contains a file
-			<code>META-INF/services/org.apache.clerezza.rdf.model.access.WeightedTcProvider</code>
-			containing the name of the implementing class.
-		</p>
-		<p>
-			To work in a OSGi-DS context the provider register a component
-			exposing
-			<code>org.apache.clerezza.rdf.model.access.WeightedTcProvider</code>
-			as service interface.
-		</p>
-	</body>
-</html>
\ No newline at end of file
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
deleted file mode 100644
index 3f3551f..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
+++ /dev/null
@@ -1,354 +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.rdf.core.access.security;
-
-import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.AllPermission;
-import java.security.Permission;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
-import org.apache.clerezza.commons.rdf.RDFTerm;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import org.apache.clerezza.utils.security.PermissionParser;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Literal;
-
-/**
- * Controls the permissions needed to access a triple collection provided by
- * <code>TcManager</code>.
- *
- * Clients with a ConfigureTcAcessPermission can set the permissions required to
- * access a Graph. These permissions are stored persistently in an
- * Graph named urn:x-localinstance:/graph-access.graph
- *
- * Clients should get an instance from TcManager.getTcAccessController()
- * 
- * @author reto
- */
-public abstract class TcAccessController {
-
-    private final TcManager tcManager;
-    private final IRI permissionGraphName = new IRI("urn:x-localinstance:/graph-access.graph");
-    //we can't rely on ontology plugin in rdf core
-    private String ontologyNamespace = "http://clerezza.apache.org/2010/07/10/graphpermssions#";
-    private final IRI readPermissionListProperty = new IRI(ontologyNamespace + "readPermissionList");
-    private final IRI readWritePermissionListProperty = new IRI(ontologyNamespace + "readWritePermissionList");
-    /**
-     * The first item in the subject RDF list.
-     */
-    public static final IRI first = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
-    /**
-     * The rest of the subject RDF list after the first item.
-     */
-    public static final IRI rest = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
-    public static final IRI rdfNil = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
-    private final Map<IRI, Collection<Permission>> readPermissionCache =
-            Collections.synchronizedMap(new HashMap<IRI, Collection<Permission>>());
-    private final Map<IRI, Collection<Permission>> readWritePermissionCache =
-            Collections.synchronizedMap(new HashMap<IRI, Collection<Permission>>());
-
-    /**
-     *
-     * @param tcManager the tcManager used to locate urn:x-localinstance:/graph-access.graph
-     */
-    public TcAccessController() {
-        this.tcManager = getTcManager();
-    }
-
-    public void checkReadPermission(IRI GraphUri) {
-        if (GraphUri.equals(permissionGraphName)) {
-            //This is world readable, as this prevents as from doingf things as
-            //priviledged during verfification
-            return;
-        }
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            //will AllPermissions the rest is obsolete
-            try {
-                AccessController.checkPermission(new AllPermission());
-            } catch (AccessControlException e) {
-                Collection<Permission> perms = getRequiredReadPermissions(GraphUri);
-                if (perms.size() > 0) {
-                    for (Permission permission : perms) {
-                        AccessController.checkPermission(permission);
-                    }
-                } else {
-                    AccessController.checkPermission(new TcPermission(
-                            GraphUri.getUnicodeString(), TcPermission.READ));
-                }
-            }
-        }
-    }
-
-    public void checkReadWritePermission(IRI GraphUri) {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            //will AllPermissions the rest is obsolete
-            try {
-                AccessController.checkPermission(new AllPermission());
-            } catch (AccessControlException e) {
-                if (GraphUri.equals(permissionGraphName)) {
-                    AccessController.checkPermission(new TcPermission(
-                            GraphUri.getUnicodeString(), TcPermission.READWRITE));
-                } else {
-                    Collection<Permission> perms = getRequiredReadWritePermissions(GraphUri);
-                    if (perms.size() > 0) {
-                        for (Permission permission : perms) {
-                            AccessController.checkPermission(permission);
-                        }
-                    } else {
-                        AccessController.checkPermission(new TcPermission(
-                                GraphUri.getUnicodeString(), TcPermission.READWRITE));
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Set the set of permissions required for read access to a triple-collection, if
-     * the set is non-empty the default TCPermisson is no longer required.
-     *
-     * @param GraphUri
-     * @param permissionDescriptions
-     */
-    public void setRequiredReadPermissionStrings(IRI GraphUri,
-            Collection<String> permissionDescriptions) {
-        readPermissionCache.remove(GraphUri);
-        final Graph permissionMGraph = getOrCreatePermisionGraph();
-        Lock l = permissionMGraph.getLock().writeLock();
-        l.lock();
-        try {
-            removeExistingRequiredReadPermissions(GraphUri, permissionMGraph);
-            final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
-            permissionMGraph.add(new TripleImpl(GraphUri,
-                    readPermissionListProperty, permissionList));
-        } finally {
-            l.unlock();
-        }
-    }
-
-    /**
-     * Set the set of permissions required for read access to a triple-collection, if
-     * the set is non-empty the default TCPermisson is no longer required.
-     *
-     * @param GraphUri
-     * @param permissionDescriptions
-     */
-    public void setRequiredReadPermissions(IRI GraphUri,
-            Collection<Permission> permissions) {
-        Collection<String> permissionStrings = new ArrayList<String>();
-        for (Permission permission : permissions) {
-            permissionStrings.add(permission.toString());
-        }
-        setRequiredReadPermissionStrings(GraphUri, permissionStrings);
-    }
-
-    /**
-     * Set the set of permissions required for read-write access to a
-     * triple-collection, if
-     * the set is non-empty the default TCPermisson is no longer required.
-     *
-     * @param GraphUri
-     * @param permissionDescriptions
-     */
-    public void setRequiredReadWritePermissionStrings(IRI GraphUri,
-            Collection<String> permissionDescriptions) {
-        readWritePermissionCache.remove(GraphUri);
-        final Graph permissionMGraph = getOrCreatePermisionGraph();
-        Lock l = permissionMGraph.getLock().writeLock();
-        l.lock();
-        try {
-            removeExistingRequiredReadPermissions(GraphUri, permissionMGraph);
-            final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
-            permissionMGraph.add(new TripleImpl(GraphUri,
-                    readWritePermissionListProperty, permissionList));
-        } finally {
-            l.unlock();
-        }
-    }
-
-    /**
-     * Set the set of permissions required for read-write access to a
-     * triple-collection, if
-     * the set is non-empty the default TCPermisson is no longer required.
-     *
-     * @param GraphUri
-     * @param permissionDescriptions
-     */
-    public void setRequiredReadWritePermissions(IRI GraphUri,
-            Collection<Permission> permissions) {
-        Collection<String> permissionStrings = new ArrayList<String>();
-        for (Permission permission : permissions) {
-            permissionStrings.add(permission.toString());
-        }
-        setRequiredReadWritePermissionStrings(GraphUri, permissionStrings);
-    }
-
-    /**
-     * Get the set of permissions required for read access to the
-     * triple-collection, the set may be empty meaning that the default
-     * TCPermission is required.
-     *
-     * @param GraphUri
-     * @return the collection of permissions
-     */
-    public Collection<Permission> getRequiredReadPermissions(IRI GraphUri) {
-        Collection<Permission> result = readPermissionCache.get(GraphUri);
-        if (result == null) {
-            result = new ArrayList<Permission>();
-            Collection<String> permissionStrings = getRequiredReadPermissionStrings(GraphUri);
-            for (String string : permissionStrings) {
-                result.add(PermissionParser.getPermission(string, getClass().getClassLoader()));
-            }
-            readPermissionCache.put(GraphUri, result);
-        }
-        return result;
-    }
-
-    /**
-     * Get the set of permissions required for read-write access to the
-     * triple-collection, the set may be empty meaning that the default
-     * TCPermission is required.
-     *
-     * @param GraphUri
-     * @return the collection of permissions
-     */
-    public Collection<Permission> getRequiredReadWritePermissions(IRI GraphUri) {
-        Collection<Permission> result = readWritePermissionCache.get(GraphUri);
-        if (result == null) {
-            result = new ArrayList<Permission>();
-            Collection<String> permissionStrings = getRequiredReadWritePermissionStrings(GraphUri);
-            for (String string : permissionStrings) {
-                result.add(PermissionParser.getPermission(string, getClass().getClassLoader()));
-            }
-            readWritePermissionCache.put(GraphUri, result);
-        }
-        return result;
-    }
-
-    private BlankNodeOrIRI createList(Iterator<String> iterator, Graph permissionMGraph) {
-        if (!iterator.hasNext()) {
-            return rdfNil;
-        }
-        final BlankNode result = new BlankNode();
-        permissionMGraph.add(new TripleImpl(result, first,
-                LiteralFactory.getInstance().createTypedLiteral(iterator.next())));
-        permissionMGraph.add(new TripleImpl(result, rest,
-                createList(iterator, permissionMGraph)));
-        return result;
-
-    }
-
-    //called withiong write-lock
-    private void removeExistingRequiredReadPermissions(IRI GraphUri,
-            Graph permissionMGraph) {
-        try {
-            Triple t = permissionMGraph.filter(GraphUri, readPermissionListProperty, null).next();
-            RDFTerm list = t.getObject();
-            removeList((BlankNodeOrIRI) list, permissionMGraph);
-            permissionMGraph.remove(t);
-        } catch (NoSuchElementException e) {
-            //There was no existing to remove
-        }
-    }
-
-    private void removeList(BlankNodeOrIRI list, Graph permissionMGraph) {
-        try {
-            Triple t = permissionMGraph.filter(list, rest, null).next();
-            RDFTerm restList = t.getObject();
-            removeList((BlankNodeOrIRI) restList, permissionMGraph);
-            permissionMGraph.remove(t);
-            Iterator<Triple> iter = permissionMGraph.filter(list, first, null);
-            iter.next();
-            iter.remove();
-        } catch (NoSuchElementException e) {
-            //if it has no rest its rdf:NIL and has no first
-        }
-    }
-
-    private Collection<String> getRequiredReadWritePermissionStrings(final IRI GraphUri) {
-        return getRequiredPermissionStrings(GraphUri, readWritePermissionListProperty);
-    }
-    private Collection<String> getRequiredReadPermissionStrings(final IRI GraphUri) {
-        return getRequiredPermissionStrings(GraphUri, readPermissionListProperty);
-    }
-    private Collection<String> getRequiredPermissionStrings(final IRI GraphUri, IRI property) {
-        try {
-            final Graph permissionMGraph = tcManager.getMGraph(permissionGraphName);
-            Lock l = permissionMGraph.getLock().readLock();
-            l.lock();
-            try {
-                Triple t = permissionMGraph.filter(GraphUri, property, null).next();
-                BlankNodeOrIRI list = (BlankNodeOrIRI) t.getObject();
-                LinkedList<String> result = new LinkedList<String>();
-                readList(list, permissionMGraph, result);
-                return result;
-            } catch (NoSuchElementException e) {
-                return new ArrayList<String>(0);
-            } finally {
-                l.unlock();
-            }
-        } catch (NoSuchEntityException e) {
-            return new ArrayList<String>(0);
-        }
-    }
-
-    private void readList(BlankNodeOrIRI list, Graph permissionMGraph, LinkedList<String> target) {
-        if (list.equals(rdfNil)) {
-            return;
-        }
-        Triple restTriple = permissionMGraph.filter(list, rest, null).next();
-        BlankNodeOrIRI restList = (BlankNodeOrIRI) restTriple.getObject();
-        readList(restList, permissionMGraph, target);
-        Triple firstTriple = permissionMGraph.filter(list, first, null).next();
-        Literal firstValue = (Literal) firstTriple.getObject();
-        String value = LiteralFactory.getInstance().createObject(String.class, firstValue);
-        target.addFirst(value);
-    }
-
-    private Graph getOrCreatePermisionGraph() {
-        try {
-            return tcManager.getMGraph(permissionGraphName);
-        } catch (NoSuchEntityException e) {
-            return tcManager.createGraph(permissionGraphName);
-        }
-    }
-
-    /**
-     * Note that this will only be invoked once
-     * @return 
-     */
-    protected abstract TcManager getTcManager();
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcPermission.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcPermission.java
deleted file mode 100644
index 1f16972..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcPermission.java
+++ /dev/null
@@ -1,149 +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.rdf.core.access.security;
-
-import java.security.Permission;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * A permission to access <code>Graph<code>s matching a specified 
- * name pattern. A pattern is matched if and only if the pattern is equals
- * to name of the <code>Graph<code> or the pattern ends with "/*" and
- * the name of the <code>Graph<code> starts with the characters
- * preceding the '*' in the pattern.
- *
- * @author reto, tsuy
- */
-public class TcPermission extends Permission {
-    public final static String READWRITE = "readwrite";
-    public final static String READ = "read";
-
-    private String tcNamePattern;
-    /**
-     * true if readwrite granted false if only read
-     */
-    private boolean allowReadWrite = false;
-
-    final static Pattern actionPattern = Pattern.compile(",( *)");
-    /**
-     * Conststructs a TcPermission for a specified name pattern and a list of
-     * actions.
-     *
-     * @param tcNamePattern see class description
-     * @param actions a comma separated list of the strings "read" and "readwrite",
-     *        the canonical form is just "read" or "readwrite" as "readwrite"
-     *        implies "read".
-     */
-    public TcPermission(String tcNamePattern, String actions)  {
-        super(tcNamePattern);
-        this.tcNamePattern = tcNamePattern;
-        //check and set actions
-        final Set actionSet = new HashSet(Arrays.asList(actionPattern.split(actions)));
-        if (actionSet.remove(READWRITE)) {
-            allowReadWrite = true;
-        } else {
-            if (!actionSet.contains(READ)) {
-                throw new IllegalArgumentException("actions must be either \"read\" or \"readwrite\"");
-            }
-        }
-        actionSet.remove(READ);
-        if (actionSet.size() > 0) {
-            throw new IllegalArgumentException("actions must only contain \"read\" and \"readwrite\"");
-        }
-    }
-
-    @Override
-    public boolean implies(Permission permission) {
-        if (permission instanceof TcPermission) {
-            TcPermission other = (TcPermission) permission;
-            if (!patternImplies(other.tcNamePattern)) {
-                return false;
-            }
-            if (!actionsImplies(other.allowReadWrite)) {
-                return false;
-            }
-            return true;
-            
-            
-        }
-        return false;
-    }
-
-    private boolean actionsImplies(boolean readwriteOther) {
-        if (!readwriteOther) {
-            return true;
-        } else {
-            return allowReadWrite;
-        }
-        
-    }
-
-    private boolean patternImplies(String tcNamePatternOther) {
-        if (tcNamePattern.equals(tcNamePatternOther)) {
-            return true;
-        }
-        if (tcNamePattern.endsWith("/*")) {
-            return tcNamePatternOther.startsWith(
-                    tcNamePattern.substring(0, tcNamePattern.length()-1));
-        }
-        return false;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TcPermission other = (TcPermission) obj;
-        if (this.tcNamePattern != other.tcNamePattern 
-                && (this.tcNamePattern == null
-                || !this.tcNamePattern.equals(other.tcNamePattern))) {
-            return false;
-        }
-        if (this.allowReadWrite != other.allowReadWrite) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 97 * hash + (this.tcNamePattern != null ?
-            this.tcNamePattern.hashCode() : 0);
-        if (allowReadWrite) {
-            hash++;
-        }
-        return hash;
-    }
-
-    
-
-    @Override
-    public String getActions() {
-        return allowReadWrite ? READWRITE : READ;
-    }
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
deleted file mode 100644
index 5fe7341..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
+++ /dev/null
@@ -1,328 +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.rdf.core.serializedform;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.logging.Level;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This singleton class provides a method
- * <code>parse</code> to transform serialized RDF forms into {@link ImmutableGraph}s.
- *
- * Functionality is delegated to registered {@link ParsingProvider}s. Such
- * <code>ParsingProvider</code>s can be registered and unregistered, later
- * registered
- * <code>ParsingProvider</code>s shadow previously registered providers for the
- * same format.
- *
- * Note on synchronization:
- * <code>ParsingProvider</code>s must be able to handle concurrent requests.
- *
- * @author reto
- *
- */
-@Component(service = Parser.class)
-public class Parser {
-
-    private ConfigurationAdmin configurationAdmin;
-    /**
-     * The list of providers in the order of registration
-     */
-    private List<ParsingProvider> providerList = new ArrayList<ParsingProvider>();
-    /**
-     * A map to quickly locate a provider
-     */
-    private volatile Map<String, ParsingProvider> providerMap = new HashMap<String, ParsingProvider>();
-    /**
-     * The singleton instance
-     */
-    private volatile static Parser instance;
-    private boolean active;
-
-    private static final Logger log = LoggerFactory.getLogger(Parser.class);
-    /**
-     * the constructor sets the singleton instance to allow instantiation
-     * by OSGi-DS. This constructor should not be called except by OSGi-DS,
-     * otherwise the static <code>getInstance</code> method should be used.
-     */
-    public Parser() {
-        log.info("constructing Parser");
-        Parser.instance = this;
-    }
-
-    /**
-     * A constructor for tests, which doesn't set the singleton instance
-     *
-     * @param dummy an ignored argument to distinguish this from the other constructor
-     */
-    Parser(Object dummy) {
-        active = true;
-    }
-
-    /**
-     * This returns the singleton instance, if an instance has been previously
-     * created (e.g. by OSGi declarative services) this instance is returned,
-     * otherwise a new instance is created and providers are injected using 
-     * the service provider interface (META-INF/services/)
-     *
-     * @return the singleton Parser instance
-     */
-    public static Parser getInstance() {
-        if (instance == null) {
-            synchronized (Parser.class) {
-                if (instance == null) {
-                    new Parser();
-                    Iterator<ParsingProvider> parsingProviders =
-                            ServiceLoader.load(ParsingProvider.class).iterator();
-                    while (parsingProviders.hasNext()) {
-                        ParsingProvider parsingProvider = parsingProviders.next();
-                        instance.bindParsingProvider(parsingProvider);
-                    }
-                    instance.active = true;
-                    instance.refreshProviderMap();
-                }
-            }
-        }
-        return instance;
-
-    }
-
-    @Activate
-    protected void activate(final ComponentContext componentContext) {
-        active = true;
-        refreshProviderMap();
-        //changing the congiguration before this finshed activating causes a new instance to be created
-        /*(new Thread() {
-            @Override
-            public void run() {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException ex) {
-                    return;
-                }
-                refreshProviderMap();
-            }
-            
-            
-        }).start();*/
-    }
-
-    @Deactivate
-    protected void deactivate(final ComponentContext componentContext) {
-        active = false;
-    }
-    
-    @Modified
-    void modified(ComponentContext ctx) {
-        log.debug("modified");
-    }
-
-    /**
-     * Parses a serialized ImmutableGraph from an InputStream. This delegates the
-     * processing to the provider registered for the specified format, if
-     * the formatIdentifier contains a ';'-character only the section before
-     * that character is used for choosing the provider.
-     *
-     * @param serializedGraph an inputstream with the serialization
-     * @param formatIdentifier a string identifying the format (usually the MIME-type)
-     * @return the ImmutableGraph read from the stream
-     * @throws UnsupportedFormatException
-     */
-    public ImmutableGraph parse(InputStream serializedGraph,
-            String formatIdentifier) throws UnsupportedFormatException {
-        return parse(serializedGraph, formatIdentifier, null);
-    }
-
-    /**
-     * Parses a serialized ImmutableGraph from an InputStream. This delegates the
-     * processing to the provider registered for the specified format, if
-     * the formatIdentifier contains a ';'-character only the section before
-     * that character is used for choosing the provider.
-     *
-     * @param target the Graph to which the parsed triples are added
-     * @param serializedGraph an inputstream with the serialization
-     * @param formatIdentifier a string identifying the format (usually the MIME-type)
-     * @throws UnsupportedFormatException
-     */
-    public void parse(Graph target, InputStream serializedGraph,
-            String formatIdentifier) throws UnsupportedFormatException {
-        parse(target, serializedGraph, formatIdentifier, null);
-    }
-
-    /**
-     * Parses a serialized ImmutableGraph from an InputStream. This delegates the
-     * processing to the provider registered for the specified format, if
-     * the formatIdentifier contains a ';'-character only the section before
-     * that character is used for choosing the provider.
-     *
-     * @param serializedGraph an inputstream with the serialization
-     * @param formatIdentifier a string identifying the format (usually the MIME-type)
-     * @param baseUri the uri against which relative uri-refs are evaluated
-     * @return the ImmutableGraph read from the stream
-     * @throws UnsupportedFormatException
-     */
-    public ImmutableGraph parse(InputStream serializedGraph,
-            String formatIdentifier, IRI baseUri) throws UnsupportedFormatException {
-        Graph graph = new SimpleMGraph();
-        parse(graph, serializedGraph, formatIdentifier, baseUri);
-        return graph.getImmutableGraph();
-    }
-
-    /**
-     * Parses a serialized ImmutableGraph from an InputStream. This delegates the
-     * processing to the provider registered for the specified format, if
-     * the formatIdentifier contains a ';'-character only the section before
-     * that character is used for choosing the provider.
-     *
-     * @param target the Graph to which the parsed triples are added
-     * @param serializedGraph an inputstream with the serialization
-     * @param formatIdentifier a string identifying the format (usually the MIME-type)
-     * @param baseUri the uri against which relative uri-refs are evaluated
-     * @throws UnsupportedFormatException
-     */
-    public void parse(Graph target, InputStream serializedGraph,
-            String formatIdentifier, IRI baseUri) throws UnsupportedFormatException {
-        String deParameterizedIdentifier;
-        int semicolonPos = formatIdentifier.indexOf(';');
-        if (semicolonPos > -1) {
-            deParameterizedIdentifier = formatIdentifier.substring(0, semicolonPos);
-        } else {
-            deParameterizedIdentifier = formatIdentifier;
-        }
-        ParsingProvider provider = providerMap.get(deParameterizedIdentifier);
-        if (provider == null) {
-            throw new UnsupportedParsingFormatException(formatIdentifier);
-        }
-        provider.parse(target, serializedGraph, formatIdentifier, baseUri);
-    }
-
-    /**
-     * Get a set of supported formats
-     *
-     * @return a set if stings identifying formats (usually the MIME-type)
-     */
-    public Set<String> getSupportedFormats() {
-        return Collections.unmodifiableSet(providerMap.keySet());
-    }
-
-    /**
-     * Registers a parsing provider
-     *
-     * @param provider the provider to be registered
-     */
-    @Reference(policy = ReferencePolicy.DYNAMIC,
-            cardinality = ReferenceCardinality.MULTIPLE)
-    public void bindParsingProvider(ParsingProvider provider) {
-        providerList.add(provider);
-        refreshProviderMap();
-    }
-
-    /**
-     * Unregister a parsing provider
-     *
-     * @param provider the provider to be deregistered
-     */
-    public void unbindParsingProvider(ParsingProvider provider) {
-        providerList.remove(provider);
-        refreshProviderMap();
-    }
-
-    /**
-     * Update providerMap with the providers in the providerList
-     *
-     */
-    private void refreshProviderMap() {
-        if (active) {
-            try {
-                final Map<String, ParsingProvider> newProviderMap = new HashMap<String, ParsingProvider>();
-                for (ParsingProvider provider : providerList) {
-                    String[] formatIdentifiers = getFormatIdentifiers(provider);
-                    for (String formatIdentifier : formatIdentifiers) {
-                        newProviderMap.put(formatIdentifier, provider);
-                    }
-                }
-                providerMap = newProviderMap;
-                if (configurationAdmin != null) { //i.e. when we are in an OSGi environment
-                    Dictionary<String, Object> newConfig = configurationAdmin.getConfiguration(getClass().getName()).getProperties();
-                    if (newConfig == null) {
-                        newConfig = new Hashtable<String, Object>();
-                    }
-                    Set<String> supportedFormats = getSupportedFormats();
-                    String[] supportedFromatsArray = supportedFormats.toArray(new String[supportedFormats.size()]);
-                    newConfig.put(SupportedFormat.supportedFormat, supportedFromatsArray);
-                    configurationAdmin.getConfiguration(getClass().getName()).update(newConfig);
-                }
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-
-    
-
-    /**
-     * Extract format identifiers for a parsing provider
-     *
-     * @param provider the provider to be registered
-     * @return formatIdentifiers
-     */
-    private String[] getFormatIdentifiers(ParsingProvider parsingProvider) {
-        Class<? extends ParsingProvider> clazz = parsingProvider.getClass();
-        SupportedFormat supportedFormatAnnotation = clazz.getAnnotation(SupportedFormat.class);
-        String[] formatIdentifiers = supportedFormatAnnotation.value();
-        return formatIdentifiers;
-    }
-
-    @Reference
-    protected void bindConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
-        this.configurationAdmin = configurationAdmin;
-    }
-
-    protected void unbindConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
-        this.configurationAdmin = null;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
deleted file mode 100644
index 3998beb..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.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.rdf.core.serializedform;
-
-import java.io.InputStream;
-
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-
-/**
- * An instance of this class parses RDF-ImmutableGraph from one or more serialization
- * formats. The supported formats are indicated using the {@link SupportedFormat}
- * annotation.
- *
- * @author reto
- */
-public interface ParsingProvider {
-
-    /**
-     * Parses a stream as the specified RDF-format. This method will be invoked
-     * for a supported format, a format is considered as supported if the part
-     * before a ';'-character in the <code>formatIdentifier</code> matches
-     * a <code>SupportedFormat</code> annotation of the implementing class.
-     *
-     * @param target the mutable ImmutableGraph to which the read triples shall be added
-     * @param serializedGraph the stream from which the serialized ImmutableGraph is read
-     * @param formatIdentifier a String identifying the format
-     * @param baseUri the baseUri for interpreting relative uris, may be null
-     */
-    void parse(Graph target, InputStream serializedGraph,
-            String formatIdentifier, IRI baseUri);
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
deleted file mode 100644
index 48fa0b7..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
+++ /dev/null
@@ -1,270 +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.rdf.core.serializedform;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.Graph;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This singleton class provides a method <code>serialize</code> to transform a
- * {@link ImmutableGraph} into serialized RDF forms.
- * 
- * Functionality is delegated to registered {@link SerializingProvider}s. Such
- * <code>SerializingProvider</code>s can be registered and unregistered, later
- * registered <code>SerializingProvider</code>s shadow previously registered
- * providers for the same format.
- * 
- * Note on synchronization: <code>SerializingProvider</code>s must be able to
- * handle concurrent requests.
- * 
- * @author mir
- * 
- */
-@Component(service = Serializer.class)
-public class Serializer {
-    
-    private ConfigurationAdmin configurationAdmin;
-
-    /**
-     * The list of providers in the order of registration
-     */
-    private List<SerializingProvider> providerList = new ArrayList<SerializingProvider>();
-
-    /**
-     * A map to quickly locate a provider
-     */
-    private volatile Map<String, SerializingProvider> providerMap = new HashMap<String, SerializingProvider>();
-
-    /**
-     * The singleton instance
-     */
-    private volatile static Serializer instance;
-    
-    private static final Logger log = LoggerFactory.getLogger(Serializer.class);
-    
-    private boolean active;
-
-    /**
-     * the constructor sets the singleton instance to allow instantiation
-     * by OSGi-DS. This constructor should not be called except by OSGi-DS,
-     * otherwise the static <code>getInstance</code> method should be used.
-     */
-    public Serializer() {
-        Serializer.instance = this;
-    }
-
-    /**
-     * A constructor for tests, which doesn't set the singleton instance
-     * 
-     * @param dummy
-     *            an ignored argument to distinguish this from the other
-     *            constructor
-     */
-    Serializer(Object dummy) {
-        active = true;
-    }
-
-    /**
-     * This returns the singleton instance, if an instance has been previously
-     * created (e.g. by OSGi declarative services) this instance is returned,
-     * otherwise a new instance is created and providers are injected using the
-     * service provider interface (META-INF/services/)
-     * 
-     * @return the singleton Serializer instance
-     */
-    public static Serializer getInstance() {
-        if (instance == null) {
-            synchronized (Serializer.class) {
-                if (instance == null) {
-                    new Serializer();
-                    Iterator<SerializingProvider> SerializingProviders = ServiceLoader
-                            .load(SerializingProvider.class).iterator();
-                    while (SerializingProviders.hasNext()) {
-                        SerializingProvider SerializingProvider = SerializingProviders
-                                .next();
-                        instance.bindSerializingProvider(SerializingProvider);
-                    }
-                    instance.active = true;
-                    instance.refreshProviderMap();
-                }
-            }
-        }
-        return instance;
-
-    }
- 
-    @Activate
-    protected void activate(final ComponentContext componentContext) {
-        active = true;
-        refreshProviderMap();
-    }
-
-    @Deactivate
-    protected void deactivate(final ComponentContext componentContext) {
-        active = false;
-    }
-    
-    @Modified
-    void modified(ComponentContext ctx) {
-        log.debug("modified");
-    }
-
-    /**
-     * Serializes a ImmutableGraph into an OutputStream. This delegates the
-     * processing to the provider registered for the specified format, if
-     * the formatIdentifier contains a ';'-character only the section before
-     * that character is used for choosing the provider.
-     * 
-     * @param serializedGraph
-     *            an outputStream into which the ImmutableGraph will be serialized
-     * @param tc  the <code>Graph</code> to be serialized
-     * @param formatIdentifier
-     *            a string specifying the serialization format (usually the
-     *            MIME-type)
-     * @throws UnsupportedFormatException
-     */
-    public void serialize(OutputStream serializedGraph, Graph tc,
-            String formatIdentifier) throws UnsupportedFormatException {
-        String deParameterizedIdentifier;
-        int semicolonPos = formatIdentifier.indexOf(';');
-        if (semicolonPos > -1) {
-            deParameterizedIdentifier = formatIdentifier.substring(0, semicolonPos);
-        } else {
-            deParameterizedIdentifier = formatIdentifier;
-        }
-        SerializingProvider provider = providerMap.get(deParameterizedIdentifier);
-        if (provider == null) {
-            throw new UnsupportedSerializationFormatException(formatIdentifier);
-        }
-        provider.serialize(serializedGraph, tc, formatIdentifier);
-    }
-
-    /**
-     * Get a set of supported formats
-     *
-     * @return a set if stings identifying formats (usually the MIME-type)
-     */
-    public Set<String> getSupportedFormats() {
-        return Collections.unmodifiableSet(providerMap.keySet());
-    }
-    
-    /**
-     * Registers a Serializing provider
-     * 
-     * @param provider
-     *            the provider to be registered
-     */
-    @Reference(policy = ReferencePolicy.DYNAMIC, 
-            cardinality = ReferenceCardinality.MULTIPLE)
-    public void bindSerializingProvider(SerializingProvider provider) {
-        providerList.add(provider);
-        refreshProviderMap();
-
-    }
-
-    /**
-     * Unregister a Serializing provider
-     * 
-     * @param provider
-     *            the provider to be unregistered
-     */
-    public void unbindSerializingProvider(SerializingProvider provider) {
-        providerList.remove(provider);
-        refreshProviderMap();
-
-    }
-
-    private void refreshProviderMap() {
-        if (active) {
-            final Map<String, SerializingProvider> newProviderMap = new HashMap<String, SerializingProvider>();
-            //we want more generic providers first so they get overridden by more specific ones
-            Collections.sort(providerList, new Comparator<SerializingProvider>() {
-                @Override
-                public int compare(SerializingProvider s1, SerializingProvider s2) {
-                    return getFormatIdentifiers(s2).length - getFormatIdentifiers(s1).length;
-                }
-            });
-            for (SerializingProvider provider : providerList) {
-                String[] formatIdentifiers = getFormatIdentifiers(provider);
-                for (String formatIdentifier : formatIdentifiers) {
-                    newProviderMap.put(formatIdentifier, provider);
-                }
-            }
-            providerMap = newProviderMap;
-            if (configurationAdmin != null) { //we are in OSGi environment
-                try {
-                    Dictionary<String, Object> newConfig = configurationAdmin.getConfiguration(getClass().getName()).getProperties();
-                    if (newConfig == null) {
-                        newConfig = new Hashtable<String, Object>();
-                    }
-                    Set<String> supportedFormats = getSupportedFormats();
-                    String[] supportedFromatsArray = supportedFormats.toArray(new String[supportedFormats.size()]);
-                    newConfig.put(SupportedFormat.supportedFormat, supportedFromatsArray);
-                    configurationAdmin.getConfiguration(getClass().getName()).update(newConfig);
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }
-        }
-    }
-
-    private String[] getFormatIdentifiers(
-            SerializingProvider SerializingProvider) {
-        Class<? extends SerializingProvider> clazz = SerializingProvider
-                .getClass();
-        SupportedFormat supportedFormatAnnotation = clazz
-                .getAnnotation(SupportedFormat.class);
-        String[] formatIdentifiers = supportedFormatAnnotation.value();
-        return formatIdentifiers;
-    }
-    
-    @Reference
-    protected void bindConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
-        this.configurationAdmin = configurationAdmin;
-    }
-
-    protected void unbindConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
-        this.configurationAdmin = null;
-    }
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java
deleted file mode 100644
index ecf4ab8..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.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.rdf.core.serializedform;
-
-import java.io.OutputStream;
-
-import org.apache.clerezza.commons.rdf.Graph;
-
-
-/**
- * An instance of this class serializes <code>Graph</code>s to a
- * specified serialization format. The supported formats are indicated using the
- * {@link SupportedFormat} annotation.
- *
- * @author mir
- */
-public interface SerializingProvider {
-    
-    /** Serializes a <code>Graph</code> to a specified
-     * <code>OutputStream</code> in the format identified by
-     * <code>formatIdentifier</code>. This method will be invoked
-     * for a supported format, a format is considered as supported if the part
-     * before a ';'-character in the <code>formatIdentifier</code> matches
-     * a <code>SupportedFormat</code> annotation of the implementing class.
-     * 
-     * @param outputStream
-     * @param tc
-     * @param formatIdentifier
-     */
-    public void serialize(OutputStream outputStream, Graph tc,
-            String formatIdentifier);
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SupportedFormat.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SupportedFormat.java
deleted file mode 100644
index 8174366..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SupportedFormat.java
+++ /dev/null
@@ -1,61 +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.rdf.core.serializedform;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to annotate {@link ParsingProvider}s to indicate
- * the format(s) they support.
- *
- * @author reto
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SupportedFormat {
-
-    /**
-     * used as a key for the OSGi service property
-     */
-    public static final String supportedFormat = "supportedFormat";
-    public static final String RDF_XML = "application/rdf+xml";
-    public static final String TURTLE = "text/turtle";
-    public static final String X_TURTLE = "application/x-turtle";
-    public static final String N_TRIPLE = "application/n-triples";
-    /**
-    * @deprecated: The mime-type for N Triples is "application/n-triples": http://www.w3.org/TR/n-triples/#sec-mediaReg-n-triples
-    */
-    @Deprecated
-    public static final String TEXT_RDF_NT = "text/rdf+nt";
-    public static final String N3 = "text/rdf+n3";
-    public static final String RDF_JSON = "application/rdf+json";
-    //both html and xhtml can be rdf formats with RDFa
-    public static final String XHTML = "application/xhtml+xml";
-    public static final String HTML = "text/html";
-
-    /**
-     * A list of format Identifiers (typically MIME-types) types without
-     * parameter (without ';'-character).
-     * E.g. {"application/rdf+xml","application/turtle"}
-     */
-    String[] value();
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedFormatException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedFormatException.java
deleted file mode 100644
index f4249f1..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedFormatException.java
+++ /dev/null
@@ -1,37 +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.rdf.core.serializedform;
-
-/**
- *
- * This exception is thrown on an attempt to parse a format for which no 
- * <code>ParsingProvider</code> is known.
- *
- * @author reto
- */
-public abstract class UnsupportedFormatException extends RuntimeException {
-
-    public UnsupportedFormatException(String message) {
-        super(message);
-    }
-
-
-    
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedParsingFormatException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedParsingFormatException.java
deleted file mode 100644
index 6d64830..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedParsingFormatException.java
+++ /dev/null
@@ -1,35 +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.rdf.core.serializedform;
-
-/**
- *
- * @author reto
- */
-public class UnsupportedParsingFormatException extends UnsupportedFormatException {
-    /**
-     * Creates an instance for a specified unsupported format.
-     * 
-     * @param formatIdentifier the unsupported format
-     */
-    public UnsupportedParsingFormatException(String formatIdentifier) {
-        super("No parser available for "+formatIdentifier);
-    }
-
-}
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedSerializationFormatException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedSerializationFormatException.java
deleted file mode 100644
index c1a4384..0000000
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/UnsupportedSerializationFormatException.java
+++ /dev/null
@@ -1,35 +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.rdf.core.serializedform;
-
-/**
- *
- * @author reto
- */
-public class UnsupportedSerializationFormatException extends UnsupportedFormatException {
-    /**
-     * Creates an instance for a specified unsupported format.
-     * 
-     * @param formatIdentifier the unsupported format
-     */
-    public UnsupportedSerializationFormatException(String formatIdentifier) {
-        super("No serializer available for "+formatIdentifier);
-    }
-
-}
diff --git a/rdf/core/src/main/resources/META-INF/documentation.nt b/rdf/core/src/main/resources/META-INF/documentation.nt
deleted file mode 100644
index 6bbe00e..0000000
--- a/rdf/core/src/main/resources/META-INF/documentation.nt
+++ /dev/null
@@ -1,286 +0,0 @@
-<bundle:///smart-content-binding-content-content-el/0-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tSmart Content Binding (SCB) is an open source framework developed by \n\t\t\tclerezza.org aiming primarily at providing a java implementation of the \n\t\t\tgraph data model specified by W3C RDF [<a href=\"#ref1\">1</a>] and \n\t\t\tfunctionalities to operate on that data model. SCB offers a service \n\t\t\tinterface to access multiple  [...]
-<bundle:///smart-content-binding-content-content-el/0-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/0-title> <http://discobits.org/ontology#infoBit> "Introduction"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/0-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/0> <http://discobits.org/ontology#infoBit> "<strong xmlns=\"http://www.w3.org/1999/xhtml\">Introduction</strong>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/1-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tSCB comprises the following architectural components as depicted in Fig. 1:\n\t\t</p>\n\t\t<ul xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\t<li>Core</li>\n\t\t\t<li>Facades</li>\n\t\t\t<li>Utilities</li>\n\t\t\t<li>Storage Providers</li>\n\t\t\t<li>Parsing Providers</li>\n\t\t\t<li>Serializing Providers</li>\n\t\t\t<li>Ontologies Tool [...]
-<bundle:///smart-content-binding-content-content-el/1-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/1-title> <http://discobits.org/ontology#infoBit> "Architecture"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/1-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/1> <http://discobits.org/ontology#contains> _:6743c073a950bff61f67984d65c7ab521 . 
-<bundle:///smart-content-binding-content-content-el/1> <http://discobits.org/ontology#contains> _:abb823c3fd5a90d56aac8ef66bbc27a71 . 
-<bundle:///smart-content-binding-content-content-el/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/3-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tIf you want to build SCB from its sources, you need JDK version 1.6 to compile. \n\t\t\tMaven version 2.0.9 has been used to build SCB.\n\t\t</p>\n"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/3-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/3-title> <http://discobits.org/ontology#infoBit> "Building SCB"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/3-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/3> <http://discobits.org/ontology#contains> _:217ceb83017ea96671846d12e5d5c0b51 . 
-<bundle:///smart-content-binding-content-content-el/3> <http://discobits.org/ontology#contains> _:2bbf09528c25da145225e8b0980bf2d41 . 
-<bundle:///smart-content-binding-content-content-el/3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/4-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tTo develop an application on top of SCB, you need to have the Core and optionally \n\t\t\tUtilities and Fa\u00E7ades.\n\t\t</p>\n"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/4-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/4-title> <http://discobits.org/ontology#infoBit> "Developing Applications using SCB"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/4-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/4> <http://discobits.org/ontology#contains> _:02da6ab7feb6eade48467f3e619fd0901 . 
-<bundle:///smart-content-binding-content-content-el/4> <http://discobits.org/ontology#contains> _:c30e92dcdbdf63d1674984e7ad74927f1 . 
-<bundle:///smart-content-binding-content-content-el/4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/5-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tTo deploy an application which uses SCB, Java(TM) SE Runtime Environment 6 or \n\t\t\thigher is needed. If the application does not use OSGi, then the SCB Core, \n\t\t\tthe jars required for compilation, as well as the needed implementations \n\t\t\t(typically one provider for storage, serialization, and parsing) must be in \n\t\t\tthe  [...]
-<bundle:///smart-content-binding-content-content-el/5-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/5-title> <http://discobits.org/ontology#infoBit> "Deploying an Application Requiring SCB"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/5-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/5> <http://discobits.org/ontology#contains> _:49dbfd013a17670491793c2b6b146add1 . 
-<bundle:///smart-content-binding-content-content-el/5> <http://discobits.org/ontology#contains> _:654813a906187207ad3cc8cb41f681811 . 
-<bundle:///smart-content-binding-content-content-el/5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/6-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tSince SCB applies a Service Oriented Architecture approach, following components \n\t\t\tcan be easily extended: Storage Providers, Parsing Providers, and Serializing \n\t\t\tProviders. Using OSGi, new bundles just need to implement the required service \n\t\t\tinterfaces. To be located outside an OSGi environment, they should also prov [...]
-<bundle:///smart-content-binding-content-content-el/6-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///smart-content-binding-content-content-el/6-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/6-title> <http://discobits.org/ontology#infoBit> "Extending and Customizing SCB"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/6-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/6> <http://discobits.org/ontology#contains> _:a19b1dc6a786e1f624246fa77f26064b1 . 
-<bundle:///smart-content-binding-content-content-el/6> <http://discobits.org/ontology#contains> _:c114892cb40ca25cb7973c1a33bb5efa1 . 
-<bundle:///smart-content-binding-content-content-el/6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/7-content> <http://discobits.org/ontology#infoBit> "<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tSmart Content Binding (SCB) is an open source framework developed by \n\t\t\tclerezza.org aiming primarily at providing a java implementation of the \n\t\t\tgraph data model specified by W3C RDF  and \n\t\t\tfunctionalities to operate on that data model. SCB offers a service \n\t\t\tinterface to access multiple named graphs and it can u [...]
-<bundle:///smart-content-binding-content-content-el/7-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/7-title> <http://discobits.org/ontology#infoBit> "Introduction"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/7-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/7> <http://discobits.org/ontology#contains> _:06de11c8dbffa159dcc8a94c5824221f1 . 
-<bundle:///smart-content-binding-content-content-el/7> <http://discobits.org/ontology#contains> _:79600405cf779cbb275363842bdc1d601 . 
-<bundle:///smart-content-binding-content-content-el/7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content-el/8-title> <http://discobits.org/ontology#infoBit> "overview"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-content-el/8-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-content-el/8> <http://discobits.org/ontology#contains> _:09e6c68551c8fa17fa88596d397668df1 . 
-<bundle:///smart-content-binding-content-content-el/8> <http://discobits.org/ontology#contains> _:fb5472113832d5b923c18b82ba74ae891 . 
-<bundle:///smart-content-binding-content-content-el/8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:0442d4e015ee629beb8468bc68eaa1d81 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:3e039903e53ca66562cb0a7cbab3c7a31 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:4e93a664498f08b22be631968648c7af1 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:a8795ea2e02fe02590420a4d6fba3a491 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:e192088cac6ea25495e86e375b508d111 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:e491014d95c2d6dad89d8af9b607eb6c1 . 
-<bundle:///smart-content-binding-content-content> <http://discobits.org/ontology#contains> _:e4e071f0106e6ea3eba559cc5d12c05c1 . 
-<bundle:///smart-content-binding-content-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///smart-content-binding-content-el/0> <http://discobits.org/ontology#infoBit> "Smart Content Binding is just the name for the RDFsupport in clerezza."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/0> <http://discobits.org/ontology#infoBit> "Once you have an overview over SCB the best resource is the javadoc API documentation. The following gives hints and describes best prectices on particular toopics."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/0> <http://discobits.org/ontology#infoBit> "The MGraphs returned by the TcManager are lockable. A LockableMGraph has a getLock()-Method returning a ReadWriteLock. Write-Locks can be used if the applications logic requires it, i.e. when it wants to ensure that the Graph isn't modified by another thread while some triples are being added or removed bading on the presence or absence of other triples (note that its a viola [...]
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/1> <http://discobits.org/ontology#infoBit> "Readlocks must be used when multiple threads access an Graph and a method returning an Iterator is used. In this case a read-lock must be obtained before calling the method on Graph and released only after the last usage of the returned iterator. Failing to do so may result in ConcurrentModification when another threads modifies the Graph while we are iterating over it."^^<ht [...]
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/2> <http://discobits.org/ontology#infoBit> "Currently (this might change infuture versions), it is also necessary to lock on the MGraphs against which a sparql select queries is directed. The lock on the MGraphs should be kept till iteration over the resultset is compleeted."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-content> <http://discobits.org/ontology#infoBit> "There is no such thing, if you try to get a write-lock withing a read-locked section you'll have a deadlock."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-title> <http://discobits.org/ontology#infoBit> "How I create I deadlocksafe Lock?"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-title> <http://discobits.org/ontology#infoBit> "How do I create deadlock-safe locks?"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3> <http://discobits.org/ontology#contains> _:8ab36b67bdc95792f2115eecc5162cd01 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3> <http://discobits.org/ontology#contains> _:cb3233d321cd250df6fe98812441b5051 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-content> <http://discobits.org/ontology#infoBit> "The service documentation should be clear about which MGarphs the service might be writing to, so the caller can make sure it holds no read-lock on one of these Graph."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-title> <http://discobits.org/ontology#infoBit> "What is the best way to Lock a ImmutableGraph in a service? (the developers, wich use the service know nothing about the lock and set own locks - so the service needs to check something) "^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4> <http://discobits.org/ontology#contains> _:02b191249bf7687b1462297ecaa885c81 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4> <http://discobits.org/ontology#contains> _:c46179c34632150d8e547e0bfa876b0f1 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-content> <http://discobits.org/ontology#infoBit> "See the documentation and tutorials for the java.util.concurrent.locks package."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-title> <http://discobits.org/ontology#infoBit> "Where do I find additional documenation and source-code examples?"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5> <http://discobits.org/ontology#contains> _:18132129e31939d4cc3e69c31a3c3c1a1 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5> <http://discobits.org/ontology#contains> _:6f4f5466d9cdc098f1d7e39802eb10851 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:4e5af087b6558782e485c3ffb9eba0d91 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:5fd3833c38a90777881461cadbce10111 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:8396ce895fcfec9de970578cbee48c911 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:93d47b3987bcd1b86f7d7926e86bd9b71 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:c6114f4df500bc98732a3ec17c1ad02d1 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://discobits.org/ontology#contains> _:ee141109a4cf29d666728340f5c4b6d81 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-title> <http://discobits.org/ontology#infoBit> "When to use locks?"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-content-el/1-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2-content-el/1> <http://discobits.org/ontology#contains> _:2295250078eb898f110a82ec86de6cbc1 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1> <http://discobits.org/ontology#contains> _:f0ef4ed5eeefc21737de5dfef0555aed1 . 
-<bundle:///smart-content-binding-content-el/2-content-el/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-el/2-content> <http://discobits.org/ontology#contains> _:80bdd3e0c8433cee78b26eada35a95ba1 . 
-<bundle:///smart-content-binding-content-el/2-content> <http://discobits.org/ontology#contains> _:a30340a3f45f8e94a36ad72f90fe25c21 . 
-<bundle:///smart-content-binding-content-el/2-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///smart-content-binding-content-el/2-title> <http://discobits.org/ontology#infoBit> "Developing with SCB"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-el/2-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content-el/2> <http://discobits.org/ontology#contains> _:06e52455a4b6e2e77881aae4fe82e4781 . 
-<bundle:///smart-content-binding-content-el/2> <http://discobits.org/ontology#contains> _:f8b936b53d7909d068de07da0bb79fe91 . 
-<bundle:///smart-content-binding-content-el/2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-content-title> <http://discobits.org/ontology#infoBit> "The RDF support in Apache Clerezza"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-content-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-content> <http://discobits.org/ontology#contains> _:226e2277b6151cc848d901cbbff6de0e1 . 
-<bundle:///smart-content-binding-content> <http://discobits.org/ontology#contains> _:354985fd2ca28f9ec33cd306f6ec73c01 . 
-<bundle:///smart-content-binding-content> <http://discobits.org/ontology#contains> _:65d0078ce0a8051b5757de5c0cf094311 . 
-<bundle:///smart-content-binding-content> <http://discobits.org/ontology#contains> _:d021e7a7266f4497dca78f93e3d16a6a1 . 
-<bundle:///smart-content-binding-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#OrderedContent> .
-<bundle:///smart-content-binding-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-overview-title> <http://discobits.org/ontology#infoBit> "Overview"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-overview-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-overview/artifacts-content> <http://discobits.org/ontology#infoBit> "\t\t<p xmlns=\"http://www.w3.org/1999/xhtml\">\n\t\t\tEach architectural component described above comprises one or more artifacts as \n\t\t\tlisted in Table 1.\n\t\t\t<br></br><br></br><i>Table 1: Artifacts of each architectural components</i><br></br>\n\t\t</p>\n\t\t<table xmlns=\"http://www.w3.org/1999/xhtml\" border=\"1\" cellpadding=\"4\">\n\t\t\t<tr>\n\t\t\t\t<th>Architectural Comp [...]
-<bundle:///smart-content-binding-overview/artifacts-content> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-overview/artifacts-title> <http://discobits.org/ontology#infoBit> "Artifacts"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-overview/artifacts-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding-overview/artifacts> <http://discobits.org/ontology#contains> _:14f13331873e2ed9f8fb13631e01816e1 . 
-<bundle:///smart-content-binding-overview/artifacts> <http://discobits.org/ontology#contains> _:d3214ba35fe284e4752c4523427ca2581 . 
-<bundle:///smart-content-binding-overview/artifacts> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-overview> <http://discobits.org/ontology#contains> _:d71a4a887a9c40161afd887e4129b5401 . 
-<bundle:///smart-content-binding-overview> <http://discobits.org/ontology#contains> _:f72f730abe25ec009ab48cf11f823f161 . 
-<bundle:///smart-content-binding-overview> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-<bundle:///smart-content-binding-title> <http://discobits.org/ontology#infoBit> "Smart Content Binding"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-<bundle:///smart-content-binding-title> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
-<bundle:///smart-content-binding> <http://discobits.org/ontology#contains> _:94dc8181a1adfa918b21fd3681840b5b1 . 
-<bundle:///smart-content-binding> <http://discobits.org/ontology#contains> _:f8f82fe3319239d3989c0f0c2a86c5551 . 
-<bundle:///smart-content-binding> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#TitledContent> .
-_:02b191249bf7687b1462297ecaa885c81 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-title> . 
-_:02b191249bf7687b1462297ecaa885c81 <http://discobits.org/ontology#pos> "0" . 
-_:02b191249bf7687b1462297ecaa885c81 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:02da6ab7feb6eade48467f3e619fd0901 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/4-content> . 
-_:02da6ab7feb6eade48467f3e619fd0901 <http://discobits.org/ontology#pos> "1" . 
-_:02da6ab7feb6eade48467f3e619fd0901 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:0442d4e015ee629beb8468bc68eaa1d81 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-overview/artifacts> . 
-_:0442d4e015ee629beb8468bc68eaa1d81 <http://discobits.org/ontology#pos> "2" . 
-_:0442d4e015ee629beb8468bc68eaa1d81 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:06de11c8dbffa159dcc8a94c5824221f1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/7-content> . 
-_:06de11c8dbffa159dcc8a94c5824221f1 <http://discobits.org/ontology#pos> "1" . 
-_:06de11c8dbffa159dcc8a94c5824221f1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:06e52455a4b6e2e77881aae4fe82e4781 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content> . 
-_:06e52455a4b6e2e77881aae4fe82e4781 <http://discobits.org/ontology#pos> "1" . 
-_:06e52455a4b6e2e77881aae4fe82e4781 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:09e6c68551c8fa17fa88596d397668df1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/7> . 
-_:09e6c68551c8fa17fa88596d397668df1 <http://discobits.org/ontology#pos> "1" . 
-_:09e6c68551c8fa17fa88596d397668df1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:14f13331873e2ed9f8fb13631e01816e1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-overview/artifacts-title> . 
-_:14f13331873e2ed9f8fb13631e01816e1 <http://discobits.org/ontology#pos> "0" . 
-_:14f13331873e2ed9f8fb13631e01816e1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:18132129e31939d4cc3e69c31a3c3c1a1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-title> . 
-_:18132129e31939d4cc3e69c31a3c3c1a1 <http://discobits.org/ontology#pos> "0" . 
-_:18132129e31939d4cc3e69c31a3c3c1a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:217ceb83017ea96671846d12e5d5c0b51 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/3-title> . 
-_:217ceb83017ea96671846d12e5d5c0b51 <http://discobits.org/ontology#pos> "0" . 
-_:217ceb83017ea96671846d12e5d5c0b51 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:226e2277b6151cc848d901cbbff6de0e1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-title> . 
-_:226e2277b6151cc848d901cbbff6de0e1 <http://discobits.org/ontology#pos> "0" . 
-_:226e2277b6151cc848d901cbbff6de0e1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:2295250078eb898f110a82ec86de6cbc1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-title> . 
-_:2295250078eb898f110a82ec86de6cbc1 <http://discobits.org/ontology#pos> "0" . 
-_:2295250078eb898f110a82ec86de6cbc1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:2bbf09528c25da145225e8b0980bf2d41 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/3-content> . 
-_:2bbf09528c25da145225e8b0980bf2d41 <http://discobits.org/ontology#pos> "1" . 
-_:2bbf09528c25da145225e8b0980bf2d41 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:354985fd2ca28f9ec33cd306f6ec73c01 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-overview> . 
-_:354985fd2ca28f9ec33cd306f6ec73c01 <http://discobits.org/ontology#pos> "1" . 
-_:354985fd2ca28f9ec33cd306f6ec73c01 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:3e039903e53ca66562cb0a7cbab3c7a31 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/1> . 
-_:3e039903e53ca66562cb0a7cbab3c7a31 <http://discobits.org/ontology#pos> "1" . 
-_:3e039903e53ca66562cb0a7cbab3c7a31 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:49dbfd013a17670491793c2b6b146add1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/5-content> . 
-_:49dbfd013a17670491793c2b6b146add1 <http://discobits.org/ontology#pos> "1" . 
-_:49dbfd013a17670491793c2b6b146add1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:4e5af087b6558782e485c3ffb9eba0d91 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/1> . 
-_:4e5af087b6558782e485c3ffb9eba0d91 <http://discobits.org/ontology#pos> "1" . 
-_:4e5af087b6558782e485c3ffb9eba0d91 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:4e93a664498f08b22be631968648c7af1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/7> . 
-_:4e93a664498f08b22be631968648c7af1 <http://discobits.org/ontology#pos> "0" . 
-_:4e93a664498f08b22be631968648c7af1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:5fd3833c38a90777881461cadbce10111 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4> . 
-_:5fd3833c38a90777881461cadbce10111 <http://discobits.org/ontology#pos> "4" . 
-_:5fd3833c38a90777881461cadbce10111 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:654813a906187207ad3cc8cb41f681811 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/5-title> . 
-_:654813a906187207ad3cc8cb41f681811 <http://discobits.org/ontology#pos> "0" . 
-_:654813a906187207ad3cc8cb41f681811 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:65d0078ce0a8051b5757de5c0cf094311 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2> . 
-_:65d0078ce0a8051b5757de5c0cf094311 <http://discobits.org/ontology#pos> "2" . 
-_:65d0078ce0a8051b5757de5c0cf094311 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:6743c073a950bff61f67984d65c7ab521 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/1-content> . 
-_:6743c073a950bff61f67984d65c7ab521 <http://discobits.org/ontology#pos> "1" . 
-_:6743c073a950bff61f67984d65c7ab521 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:6f4f5466d9cdc098f1d7e39802eb10851 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5-content> . 
-_:6f4f5466d9cdc098f1d7e39802eb10851 <http://discobits.org/ontology#pos> "1" . 
-_:6f4f5466d9cdc098f1d7e39802eb10851 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:79600405cf779cbb275363842bdc1d601 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/7-title> . 
-_:79600405cf779cbb275363842bdc1d601 <http://discobits.org/ontology#pos> "0" . 
-_:79600405cf779cbb275363842bdc1d601 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:80bdd3e0c8433cee78b26eada35a95ba1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/0> . 
-_:80bdd3e0c8433cee78b26eada35a95ba1 <http://discobits.org/ontology#pos> "0" . 
-_:80bdd3e0c8433cee78b26eada35a95ba1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:8396ce895fcfec9de970578cbee48c911 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/5> . 
-_:8396ce895fcfec9de970578cbee48c911 <http://discobits.org/ontology#pos> "5" . 
-_:8396ce895fcfec9de970578cbee48c911 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:8ab36b67bdc95792f2115eecc5162cd01 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-title> . 
-_:8ab36b67bdc95792f2115eecc5162cd01 <http://discobits.org/ontology#pos> "0" . 
-_:8ab36b67bdc95792f2115eecc5162cd01 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:93d47b3987bcd1b86f7d7926e86bd9b71 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3> . 
-_:93d47b3987bcd1b86f7d7926e86bd9b71 <http://discobits.org/ontology#pos> "3" . 
-_:93d47b3987bcd1b86f7d7926e86bd9b71 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:94dc8181a1adfa918b21fd3681840b5b1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-title> . 
-_:94dc8181a1adfa918b21fd3681840b5b1 <http://discobits.org/ontology#pos> "0" . 
-_:94dc8181a1adfa918b21fd3681840b5b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:a19b1dc6a786e1f624246fa77f26064b1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/6-title> . 
-_:a19b1dc6a786e1f624246fa77f26064b1 <http://discobits.org/ontology#pos> "0" . 
-_:a19b1dc6a786e1f624246fa77f26064b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:a30340a3f45f8e94a36ad72f90fe25c21 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1> . 
-_:a30340a3f45f8e94a36ad72f90fe25c21 <http://discobits.org/ontology#pos> "1" . 
-_:a30340a3f45f8e94a36ad72f90fe25c21 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:a8795ea2e02fe02590420a4d6fba3a491 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/3> . 
-_:a8795ea2e02fe02590420a4d6fba3a491 <http://discobits.org/ontology#pos> "3" . 
-_:a8795ea2e02fe02590420a4d6fba3a491 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:abb823c3fd5a90d56aac8ef66bbc27a71 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/1-title> . 
-_:abb823c3fd5a90d56aac8ef66bbc27a71 <http://discobits.org/ontology#pos> "0" . 
-_:abb823c3fd5a90d56aac8ef66bbc27a71 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:c114892cb40ca25cb7973c1a33bb5efa1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/6-content> . 
-_:c114892cb40ca25cb7973c1a33bb5efa1 <http://discobits.org/ontology#pos> "1" . 
-_:c114892cb40ca25cb7973c1a33bb5efa1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:c30e92dcdbdf63d1674984e7ad74927f1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/4-title> . 
-_:c30e92dcdbdf63d1674984e7ad74927f1 <http://discobits.org/ontology#pos> "0" . 
-_:c30e92dcdbdf63d1674984e7ad74927f1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:c46179c34632150d8e547e0bfa876b0f1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/4-content> . 
-_:c46179c34632150d8e547e0bfa876b0f1 <http://discobits.org/ontology#pos> "1" . 
-_:c46179c34632150d8e547e0bfa876b0f1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:c6114f4df500bc98732a3ec17c1ad02d1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/2> . 
-_:c6114f4df500bc98732a3ec17c1ad02d1 <http://discobits.org/ontology#pos> "2" . 
-_:c6114f4df500bc98732a3ec17c1ad02d1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:cb3233d321cd250df6fe98812441b5051 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/3-content> . 
-_:cb3233d321cd250df6fe98812441b5051 <http://discobits.org/ontology#pos> "1" . 
-_:cb3233d321cd250df6fe98812441b5051 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:d021e7a7266f4497dca78f93e3d16a6a1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/0> . 
-_:d021e7a7266f4497dca78f93e3d16a6a1 <http://discobits.org/ontology#pos> "0" . 
-_:d021e7a7266f4497dca78f93e3d16a6a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:d3214ba35fe284e4752c4523427ca2581 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-overview/artifacts-content> . 
-_:d3214ba35fe284e4752c4523427ca2581 <http://discobits.org/ontology#pos> "1" . 
-_:d3214ba35fe284e4752c4523427ca2581 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:d71a4a887a9c40161afd887e4129b5401 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-overview-title> . 
-_:d71a4a887a9c40161afd887e4129b5401 <http://discobits.org/ontology#pos> "0" . 
-_:d71a4a887a9c40161afd887e4129b5401 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:e192088cac6ea25495e86e375b508d111 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/5> . 
-_:e192088cac6ea25495e86e375b508d111 <http://discobits.org/ontology#pos> "5" . 
-_:e192088cac6ea25495e86e375b508d111 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:e491014d95c2d6dad89d8af9b607eb6c1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/6> . 
-_:e491014d95c2d6dad89d8af9b607eb6c1 <http://discobits.org/ontology#pos> "6" . 
-_:e491014d95c2d6dad89d8af9b607eb6c1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:e4e071f0106e6ea3eba559cc5d12c05c1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/4> . 
-_:e4e071f0106e6ea3eba559cc5d12c05c1 <http://discobits.org/ontology#pos> "4" . 
-_:e4e071f0106e6ea3eba559cc5d12c05c1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:ee141109a4cf29d666728340f5c4b6d81 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content-el/0> . 
-_:ee141109a4cf29d666728340f5c4b6d81 <http://discobits.org/ontology#pos> "0" . 
-_:ee141109a4cf29d666728340f5c4b6d81 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:f0ef4ed5eeefc21737de5dfef0555aed1 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-content-el/1-content> . 
-_:f0ef4ed5eeefc21737de5dfef0555aed1 <http://discobits.org/ontology#pos> "1" . 
-_:f0ef4ed5eeefc21737de5dfef0555aed1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:f72f730abe25ec009ab48cf11f823f161 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content> . 
-_:f72f730abe25ec009ab48cf11f823f161 <http://discobits.org/ontology#pos> "1" . 
-_:f72f730abe25ec009ab48cf11f823f161 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:f8b936b53d7909d068de07da0bb79fe91 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-el/2-title> . 
-_:f8b936b53d7909d068de07da0bb79fe91 <http://discobits.org/ontology#pos> "0" . 
-_:f8b936b53d7909d068de07da0bb79fe91 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:f8f82fe3319239d3989c0f0c2a86c5551 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content> . 
-_:f8f82fe3319239d3989c0f0c2a86c5551 <http://discobits.org/ontology#pos> "1" . 
-_:f8f82fe3319239d3989c0f0c2a86c5551 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
-_:fb5472113832d5b923c18b82ba74ae891 <http://discobits.org/ontology#holds> <bundle:///smart-content-binding-content-content-el/8-title> . 
-_:fb5472113832d5b923c18b82ba74ae891 <http://discobits.org/ontology#pos> "0" . 
-_:fb5472113832d5b923c18b82ba74ae891 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#Entry> . 
diff --git a/rdf/core/src/site/resources/documentation/images/scb_architecture.png b/rdf/core/src/site/resources/documentation/images/scb_architecture.png
deleted file mode 100644
index 0d22a8a..0000000
Binary files a/rdf/core/src/site/resources/documentation/images/scb_architecture.png and /dev/null differ
diff --git a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/LICENSE b/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/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.
diff --git a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml b/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
deleted file mode 100644
index c778c7f..0000000
--- a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
+++ /dev/null
@@ -1,59 +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>
-    <groupId>org.example.clerezza</groupId>
-    <artifactId>combined.tutorial</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>SCB Jaxrs Tutorial</name>    
-    <parent>
-        <artifactId>clerezza</artifactId>
-        <groupId>org.apache.clerezza</groupId>
-        <version>0.11-SNAPSHOT</version>
-        <relativePath>../../../../../../../parent</relativePath>
-    </parent>
-    <repositories>
-        <repository>
-            <id>clerezza-release</id>
-            <name>clerezza.org distribution repository</name>
-            <url>http://repo.trialox.org/release</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>clerezza-snapshot</id>
-            <name>clerezza.org snapshot repository</name>
-            <url>http://repo.trialox.org/snapshot</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>jaxrs.rdf.providers</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.seedsnipe</artifactId>
-            <version>0.7-SNAPSHOT</version>
-        </dependency>
-    </dependencies>    
-</project>
\ No newline at end of file
diff --git a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/java/org/example/apache/clerezza/combined/tutorial/TutorialApp.java b/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/java/org/example/apache/clerezza/combined/tutorial/TutorialApp.java
deleted file mode 100644
index 9a99d5d..0000000
--- a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/java/org/example/apache/clerezza/combined/tutorial/TutorialApp.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.example.clerezza.combined.tutorial;
-/*
- *
- * 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.
- *
-*/
-
-
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-
-import org.osgi.service.component.ComponentContext;
-
-import org.apache.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
-import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.rdf.ontologies.FOAF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.clerezza.rdf.core.ImmutableGraph;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-
-/**
- * Get Persons by their email
- *
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- */
-
-@Path("/foaf")
-public class TutorialApp {
-    
-    /**
-     * @scr.reference
-     */
-    TcManager tcManager;
-    
-    /**
-     * @scr.reference
-     */
-    private RenderletManager renderletManager;
-    
-    private UriRef graphName = new UriRef("http://localhost.mygraph");
-
-    @GET
-    @Path("find")
-    @Produces("application/rdf+xml")
-    public ImmutableGraph getPersonRdf(@QueryParam("mbox") String mboxString) {
-        Graph graph = tcManager.getMGraph(graphName);
-        NonLiteral person = getPersonByMbox(mboxString, graph);
-        return new GraphNode(person, graph).getNodeContext();
-    }
-
-    @GET
-    @Path("find")
-    @Produces("application/xhtml+xml")
-    public GraphNode getPersonHtml(@QueryParam("mbox") String mboxString) {
-        Graph graph = tcManager.getMGraph(graphName);
-        NonLiteral person = getPersonByMbox(mboxString, graph);
-        return new GraphNode(person, graph);
-    }
-
-    private NonLiteral getPersonByMbox(String mboxString, Graph graph) {
-        Iterator<Triple> iter = graph.filter(null, FOAF.mbox, new UriRef(mboxString));
-        NonLiteral person = null;
-        while(iter.hasNext()) {
-            person = iter.next().getSubject();
-        }
-        return person;
-    }
-    
-    /**
-     * The activate method is called when SCR activates the component configuration.
-     * This method gets the system ImmutableGraph or create a new one if it doesn't exist.
-     * 
-     * @param componentContext
-     */
-    protected void activate(ComponentContext componentContext) {
-        
-        URL templateURL = getClass().getResource("tutorial.xhtml");    
-        try {
-            renderletManager.registerRenderlet(SeedsnipeRenderlet.class
-                    .getName(), new UriRef(templateURL.toURI().toString()),
-                    FOAF.Person, null, MediaType.APPLICATION_XHTML_XML_TYPE,
-                    true);
-        } catch (URISyntaxException ex) {
-            throw new WebApplicationException(ex);
-        }
-        Graph tc;
-        try {
-            tcManager.getMGraph(graphName);
-        } catch (NoSuchEntityException nsee) {
-            tc = tcManager.createMGraph(graphName);
-            InputStream fin = null;
-            fin = getClass().getResourceAsStream("data.turtle");
-            Parser parser = Parser.getInstance();
-            tc.addAll(parser.parse(fin, "text/turtle"));
-        }
-    }
-}
-
diff --git a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/data.turtle b/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/data.turtle
deleted file mode 100644
index 88005cd..0000000
--- a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/data.turtle
+++ /dev/null
@@ -1,32 +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.
-
-@prefix foaf: <http://xmlns.com/foaf/0.1/>.
-
-[	a foaf:Person;
-    foaf:title "Mr";
-    foaf:name "John Doe";
-    foaf:mbox <ma...@example.org>;
-	foaf:topic_interest <http://dbpedia.org/resource/Category:BBC_television_sitcoms>;
-    foaf:nick "jo" ] .
-
-[	a foaf:Person;
-    foaf:title "Mr";
-    foaf:name "Jane Bloggs";
-    foaf:mbox <ma...@example.org>;
-    foaf:openid <http://openid.example.org/jbloggs> ] .
-
diff --git a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/tutorial.xhtml b/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/tutorial.xhtml
deleted file mode 100644
index db7418c..0000000
--- a/rdf/core/src/site/resources/documentation/scb-triaxrs-tutorial/src/main/resources/org/example/apache/clerezza/combined/tutorial/tutorial.xhtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-
- 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.
-
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	${ns:foaf=http://xmlns.com/foaf/0.1/}
-	${ns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#}
-	${ns:dc=http://purl.org/dc/elements/1.1/}
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<title>clerezza - Combined Tutorial</title>
-</head>
-<body>
-	<h1>clerezza - Combined Tutorial</h1>
-	<h2>FOAF Person:</h2>
-	<div>
-		<p>Name: ${foaf:title} ${foaf:name}</p>
-		<p>Email: ${foaf:mbox}</p>
-		${if foaf:nick}
-		<p>Nickname: ${foaf:nick}</p>
-		${/if}
-		<p>Topic interests: <br />
-		${loop}
-			${foaf:topic_interest}<br />
-		${/loop}
-		</p>
-	</div>
-</body>
-</html>
diff --git a/rdf/core/src/site/resources/documentation/style/documentation.css b/rdf/core/src/site/resources/documentation/style/documentation.css
deleted file mode 100644
index a7cbd81..0000000
--- a/rdf/core/src/site/resources/documentation/style/documentation.css
+++ /dev/null
@@ -1,34 +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.
- *
-*/
-
-.note {
-    background-color:  #f4e010;
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-blockcode {
-	white-space: pre;
-	display: block;
-	background-color:  #f4e0e0;
-	padding-left: 4em;
-	margin-bottom: 1em;
-}
diff --git a/rdf/core/src/site/resources/documentation/style/style.css b/rdf/core/src/site/resources/documentation/style/style.css
deleted file mode 100644
index ff49a4d..0000000
--- a/rdf/core/src/site/resources/documentation/style/style.css
+++ /dev/null
@@ -1,421 +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.
- *
-*/
-
-/*---------------------------------------------------------------------------
- *  Two- and three-column layout
- */
-
-#banner {
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    height: 116px;
-}
-
-#left {
-    position: absolute;
-    z-index: 2;
-    left: 8px;
-    width: 184px;
-    top: 125px;
-    bottom: 8px;
-    margin: 0px;
-    padding: 0px;
-}
-
-#right {
-    position: absolute;
-    z-index: 1;
-    right: 8px;
-    width: 184px;
-    top: 125px;
-    bottom: 8px;
-    margin: 0px;
-    padding: 0px;
-}
-
-.Content3Column {
-    position: absolute;
-    top: 125px;
-    bottom: 8px;
-    left: 208px;
-    right: 216px;
-}
-
-.Content2Column {
-    position: absolute;
-    top: 125px;
-    bottom: 8px;
-    left: 208px;
-    right: 16px;
-}
-
-#center {
-    z-index: 3;
-    margin: 0px;
-    border: none;
-    padding-bottom: 8px;
-}
-
-
-/*---------------------------------------------------------------------------
- *  Default element styles
- */
-
-body {
-    padding: 0px;
-    margin: 0px;
-    border: 0px;
-
-    font-family: helvetica, arial, sans-serif;
-    font-size: 12px;
-
-    background-color: white;
-    color: black;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    margin: 0px;
-    border: 0px;
-    padding: 0px;
-    font-weight: normal;
-}
-
-a:link { color: #008DA8; }
-a:active { color: #FE5400; }
-a:hover { color: #FE5400; }
-a:visited { color: black; }
-
-iframe {
-    width:100%;
-    height: 800px;
-    border: 0px;
-}
-
-img {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-}
-
-p {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    margin-bottom: 10px;
-}
-
-blockquote {
-    margin-bottom: 10px;
-}
-
-td {
-    font-size: 12px;
-    padding: 2px;
-}
-
-tr.a {
-    background-color:  #e0e0e0;
-}
-tr.b {
-    background-color: #ffffff;
-}
-
-th {
-    font-size: 12px;
-    font-weight: bold;
-    white-space: nowrap;
-    padding: 2px;
-}
-
-th.Row {
-    text-align: left;
-    vertical-align: top;
-}
-
-ul, ol {
-    border: 0px;
-    padding: 0px;
-    margin-top: 0px;
-    margin-bottom: 12px;
-    margin-left: 20px;
-}
-
-
-/*---------------------------------------------------------------------------
- *  Page banner
- */
-
-#banner {
-    margin: 0px;
-    border: 0px;
-    border-bottom: 1px solid #008DA8;
-    padding: 0px;
-    background-color: #e0e0e0;
-    color: #008DA8;
-    vertical-align: bottom;
-}
-
-#banner a { text-decoration: none; }
-#banner a:visited { color: #008DA8; }
-#banner a:hover { color: #FE5400; }
-#banner a:active { color: #FE5400; }
-
-#logo {
-    position: absolute;
-    top: 5px;
-    left: 8px;
-}
-
-#versions {
-    position: absolute;
-    width: auto;
-    right: 0px;
-    top: 0px;
-    margin: 8px;
-    font-weight: normal;
-}
-
-/*---------------------------------------------------------------------------
- *  Page content
- */
-
-#content {
-    margin: 0px;
-    background-color: white;
-    color: black;
-    height: 100%;
-}
-
-#content h1 {
-    width: 100%;
-    font-size: 18px;
-    background-color: #008DA8;
-    color: white;
-    padding: 2px;
-    padding-left: 6px;
-    margin-top: 24px;
-    margin-bottom: 12px;
-}
-
-#content .FirstChild {  /* IE doesn't understand first-child pseudoelement */
-    margin-top: 0px;
-}
-
-#content a { text-decoration: underline; }
-#content a:link { color: #008DA8; }
-#content a:visited { color: #008DA8; }
-#content a:active { color: #FE5400; }
-#content a:hover { color: #FE5400; }
-
-#content h2 {
-    margin-top: 24px;
-    border-top: 1px solid #008DA8;
-    margin-bottom: 16px;
-    font-size: 15px;
-    font-weight: bold;
-    background-color:  #e0e0e0;;
-    padding: 2px;
-}
-
-#content li {
-    margin-bottom: 6px;
-}
-
-#content th {
-    background-color:  #e0e0e0;
-}
-
-#content td {
-    
-}
-
-.Source pre {
-    padding: 4px;
-    font-family: courier new, monospace;
-    font-size: 11px;
-    border: 1px solid #008DA8;
-    background-color:  #e0e0e0;
-    color: black;
-}
-
-.Source:before {
-    margin: 0px;
-    padding: 0px;
-    border: 0px;
-    font-size: inherit;
-    line-spacing: 100%;
-}
-
-.highlight {
-    background-color:  #e0e0e0;
-    border: 1px dotted #008DA8;
-    padding: 5px;
-}
-
-/* The following are for images, but can also apply to div's containing images. */
-
-#content .Float {
-    float: right;
-    margin-left: 8px;
-    margin-right: 0px;
-    margin-top: 8px;
-    margin-bottom: 8px;
-}
-
-#content .Diagram {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 8px;
-    margin-bottom: 8px;
-}
-
-
-#content .Inline {
-    display: inline;
-}
-
-.RuleOfThumb {
-    font-weight: bold;
-}
-
-/*---------------------------------------------------------------------------
- *  Side panels
- */
-
-.SidePanel {
-    background-color: white;
-    padding: 0px;
-    font-size: 11px;
-}
-
-.SidePanel h1 {
-    margin: 0px;
-    border: 0px;
-    padding: 4px;
-
-    color: #008DA8;
-
-    font-size: 12px;
-    font-weight: bold;
-}
-
-
-.SidePanel a { text-decoration: none; }
-.SidePanel a:link { color: #000000; }
-.SidePanel a:visited { color: #000000; }
-.SidePanel a:active { color: #FE5400; }
-.SidePanel a:hover { color: #FE5400; }
-
-/*---------------------------------------------------------------------------
- *  Menus
- */
-
-.MenuGroup {
-    border-left: 1px solid #A3DAE6;
-    border-top: 1px solid #A3DAE6;
-    border-bottom: 1px solid white; /* IE work-around */
-
-    margin-bottom: 8px;
-    background-color: white;
-    color: #008DA8;
-}
-
-.MenuGroup ul {
-    margin: 0px;
-    padding-left: 4px;
-    list-style-type: none;
-}
-
-.MenuGroup li {
-    padding: 2px;
-}
-
-.MenuGroup .currentLink {
-/*    background-color: #060;*/
-    background-color:  #e0e0e0;
-    color: #008DA8;
-}
-
-
-/*---------------------------------------------------------------------------
- *  News panel
- */
-
-.NewsGroup {
-    border-left: 1px solid #A3DAE6;
-    border-top: 1px solid #A3DAE6;
-    border-bottom: 1px solid white; /* IE workaround */
-    margin-bottom: 8px;
-
-    color: #008DA8;
-}
-
-.NewsItem {
-    margin: 4px;
-}
-
-.NewsDate {
-    font-weight: bold;
-    margin: 0px;
-    padding: 0px;
-}
-
-.NewsText {
-    padding: 0px;
-    margin: 0px;
-    margin-bottom: 8px;
-}
-
-.NewsText a { text-decoration: underline; }
-.NewsText a:link { color: #008DA8; }
-.NewsText a:visited { color: #008DA8; }
-.NewsText a:active { color: #FE5400; }
-.NewsText a:hover { color: #FE5400; }
-
-.NewsMore {
-    font-size: smaller;
-    margin: 4px;
-    margin-top: 8px;
-    text-align: left;
-}
-
-.NewsGroup td {
-    font-size: 12px;
-}
-
-/*---------------------------------------------------------------------------
- *  Document meta-information
- */
-
-.Meta {
-    margin-top: 64px;
-    font-size: smaller;
-    color: #008DA8;
-    text-align: right;
-}
-
-.Meta a { text-decoration: underline; }
-.Meta a:link { color: #008DA8; }
-.Meta a:visited { color: #008DA8; }
-.Meta a:active { color: #FE5400; }
-.Meta a:hover { color: #FE5400; }
diff --git a/rdf/core/src/site/resources/documentation/tutorial1/LICENSE b/rdf/core/src/site/resources/documentation/tutorial1/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/rdf/core/src/site/resources/documentation/tutorial1/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.
diff --git a/rdf/core/src/site/resources/documentation/tutorial1/pom.xml b/rdf/core/src/site/resources/documentation/tutorial1/pom.xml
deleted file mode 100644
index 25ce4a1..0000000
--- a/rdf/core/src/site/resources/documentation/tutorial1/pom.xml
+++ /dev/null
@@ -1,106 +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>
-    <groupId>org.example.clerezza.scb</groupId>
-    <artifactId>tutorial1</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>tutorial1</name>
-    <url>http://maven.apache.org</url>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>0.7-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>0.7-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>0.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.jena.parser</artifactId>
-            <version>0.5-SNAPSHOT</version>
-    <!-- <scope>runtime</scope> -->
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.jena.serializer</artifactId>
-            <version>0.4-SNAPSHOT</version>
-    <!-- <scope>runtime</scope> -->
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.5.5</version>
-    <!-- <scope>runtime</scope> -->
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.simple.storage</artifactId>
-            <version>0.2-SNAPSHOT</version>
-            <!-- <scope>runtime</scope> -->
-        </dependency>
-
-
-    </dependencies>
-    <repositories>
-        <repository>
-            <id>clerezza-release</id>
-            <name>clerezza.org distribution repository</name>
-            <url>http://repo.trialox.org/release</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>clerezza-snapshot</id>
-            <name>clerezza.org snapshot repository</name>
-            <url>http://repo.trialox.org/snapshot</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
\ No newline at end of file
diff --git a/rdf/core/src/site/resources/documentation/tutorial1/src/main/java/org/example/apache/clerezza/scb/tutorial1/Tutorial1App.java b/rdf/core/src/site/resources/documentation/tutorial1/src/main/java/org/example/apache/clerezza/scb/tutorial1/Tutorial1App.java
deleted file mode 100644
index f0e2e8c..0000000
--- a/rdf/core/src/site/resources/documentation/tutorial1/src/main/java/org/example/apache/clerezza/scb/tutorial1/Tutorial1App.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.example.clerezza.scb.tutorial1;
-/*
- *
- * 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.
- *
-*/
-
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.table.AbstractTableModel;
-import org.apache.clerezza.rdf.core.ImmutableGraph;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.utils.GraphNode;
-
-/**
- * A panel allowing browsing the context of resoures, a main method loads
- * the panel in a new windows.
- * @author rbn
- */
-
-public class Tutorial1App extends JPanel {
-
-    //where our knowledge is stored
-    private Graph graph;
-    //the URI for which the context is shown
-    private String selectedUri;
-    //These get notified when the selected URI changes
-    private Set<UriChangedListener> uriChangedListeners
-            = new HashSet<UriChangedListener>();
-    //these get notified when graph was modified
-    private Set<GraphChangedListener> graphChangedListeners
-            = new HashSet<GraphChangedListener>();
-
-    public static void main(String[] args) throws Exception {
-        javax.swing.SwingUtilities.invokeLater(new Runnable() {
-
-            public void run() {
-                //Create and set up the window.
-                JFrame frame = new JFrame("Triple GUI");
-                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                final Tutorial1App tutorial1App = new Tutorial1App("http://dbpedia.org/resource/Category:BBC_television_sitcoms");
-                frame.getContentPane().add(tutorial1App);
-                //Display the window.
-                frame.pack();
-                frame.setVisible(true);
-            }
-        });
-    }
-
-    /**
-     * Constructs a Tutorial1App with an initially selected URI for which the
-     * describing triples are retrieved from the web.
-     *
-     * @param selectedUri the initial selected URI
-     */
-    public Tutorial1App(final String selectedUri) {
-        this.selectedUri = selectedUri;
-        //get the singleton instance of TcManager
-        final TcManager tcManager = TcManager.getInstance();
-        //the arbitrary name we use for our mutable ImmutableGraph
-        final UriRef mGraphName = new UriRef("http://tutorial.example.org/");
-        //the m-ImmutableGraph into which we'll put the triples we collect
-        graph = tcManager.createMGraph(mGraphName);
-        try {
-            loadContextFromWeb();
-        } catch (IOException ex) {
-            System.err.println("Error retrieving " + selectedUri);
-            ex.printStackTrace();
-        }
-
-        Iterator<Triple> typeTriples = graph.filter(new UriRef(selectedUri), RDF.type, null);
-        while (typeTriples.hasNext()) {
-            System.out.println(typeTriples.next());
-        }
-
-        setLayout(new BorderLayout());
-        add(createNavigation(), BorderLayout.PAGE_START);
-        add(createMainArea(), BorderLayout.CENTER);
-        add(createFooter(), BorderLayout.PAGE_END);
-    }
-
-    public String getSelectedUri() {
-        return selectedUri;
-    }
-
-    public void setSelectedUri(String selectedUri) {
-        this.selectedUri = selectedUri;
-        for (UriChangedListener uriChangedListener : uriChangedListeners) {
-            uriChangedListener.uriChanged();
-        }
-    }
-
-    public void addGraphChangedListeners(GraphChangedListener gcl) {
-        graphChangedListeners.add(gcl);
-    }
-
-    public void addUriChangedListeners(UriChangedListener ucl) {
-        uriChangedListeners.add(ucl);
-    }
-
-    /**
-     * 
-     * @return the context of the currently selected URI
-     */
-    public ImmutableGraph getCurrentContext() {
-        return new GraphNode(new UriRef(selectedUri), graph).getNodeContext();
-    }
-
-    /**
-     * Dereference the selected URI and add the retroieved triples to graph
-     *
-     * @throws java.io.IOException
-     */
-    private void loadContextFromWeb() throws IOException {
-        final URL url = new URL(selectedUri);
-        final URLConnection con = url.openConnection();
-        con.addRequestProperty("Accept", "application/rdf+xml");
-        final InputStream inputStream = con.getInputStream();
-
-        //get the singleton instance of Parser
-        final Parser parser = Parser.getInstance();
-        ImmutableGraph deserializedGraph = parser.parse(inputStream, "application/rdf+xml");
-
-        graph.addAll(deserializedGraph);
-        for (GraphChangedListener graphChangedListener : graphChangedListeners) {
-            graphChangedListener.graphChanged();
-        }
-    }
-
-    private JPanel createNavigation() {
-        JPanel navigation = new JPanel();
-        navigation.add(new JLabel("URI: "));
-        final JTextField selectedUriField = new JTextField(selectedUri, 80);
-        navigation.add(selectedUriField);
-        addUriChangedListeners(new UriChangedListener() {
-
-            @Override
-            public void uriChanged() {
-                selectedUriField.setText(selectedUri);
-            }
-        });
-        JButton showContextButton = new JButton("Show Context");
-        navigation.add(showContextButton);
-        JButton loadContextButton = new JButton("Load Context from Web");
-        navigation.add(loadContextButton);
-        loadContextButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    setSelectedUri(selectedUriField.getText());
-                    loadContextFromWeb();
-                    
-                } catch (IOException ex) {
-                    Logger.getLogger(Tutorial1App.class.getName()).log(Level.SEVERE, null, ex);
-                }
-            }
-        });
-        showContextButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                setSelectedUri(selectedUriField.getText());
-            }
-        });
-        return navigation;
-    }
-
-    private Component createMainArea() {
-        //main area with triple-table
-        final TripleDataTableModel dataModel = new TripleDataTableModel();
-        addUriChangedListeners(dataModel);
-        addGraphChangedListeners(dataModel);
-        final JTable table = new JTable(dataModel);
-        table.setCellSelectionEnabled(true);
-        table.addMouseListener(new MouseAdapter() {
-
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                int col = table.getSelectedColumn();
-                if (col == 1) {
-                    return;
-                }
-                int row = table.getSelectedRow();
-                final Object cellValue = dataModel.getValueAt(row, col);
-                if (cellValue instanceof UriRef) {
-                    setSelectedUri(((UriRef) cellValue).getUnicodeString());
-                }
-            }
-        });
-        JScrollPane scrollpane = new JScrollPane(table);
-        return scrollpane;
-    }
-
-    private Component createFooter() {
-        JPanel footer = new JPanel();
-        footer.add(new JLabel("Size of local ImmutableGraph: "));
-        final JLabel sizeLabel = new JLabel(Integer.toString(graph.size()));
-        addGraphChangedListeners(new GraphChangedListener() {
-
-            @Override
-            public void graphChanged() {
-                sizeLabel.setText(Integer.toString(graph.size()));
-            }
-        });
-        sizeLabel.setText(Integer.toString(graph.size()));
-        footer.add(sizeLabel);
-        return footer;
-    }
-
-    class TripleDataTableModel extends AbstractTableModel implements UriChangedListener, GraphChangedListener {
-
-        private final List<Triple> tripleList = new ArrayList<Triple>();
-
-        public TripleDataTableModel() {
-            tripleList.addAll(getCurrentContext());
-        }
-
-        public int getColumnCount() {
-            return 3;
-        }
-
-        public int getRowCount() {
-            return tripleList.size();
-        }
-
-        public Object getValueAt(int row, int col) {
-            Triple triple = tripleList.get(row);
-            switch (col) {
-                case 0:
-                    return triple.getSubject();
-                case 1:
-                    return triple.getPredicate();
-                default:
-                    return triple.getObject();
-            }
-        }
-
-
-        @Override
-        public void uriChanged() {
-            tripleList.clear();
-            tripleList.addAll(getCurrentContext());
-            fireTableDataChanged();
-        }
-
-        @Override
-        public void graphChanged() {
-            tripleList.clear();
-            tripleList.addAll(getCurrentContext());
-            fireTableDataChanged();
-        }
-    }
-
-    public interface UriChangedListener {
-        void uriChanged();
-    }
-
-    public interface GraphChangedListener {
-        void graphChanged();
-    }
-}
diff --git a/rdf/core/src/site/resources/images/clerezza.png b/rdf/core/src/site/resources/images/clerezza.png
deleted file mode 100644
index cb0efb0..0000000
Binary files a/rdf/core/src/site/resources/images/clerezza.png and /dev/null differ
diff --git a/rdf/core/src/site/site.xml b/rdf/core/src/site/site.xml
deleted file mode 100644
index 3b68681..0000000
--- a/rdf/core/src/site/site.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * 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>
-    <body>
-        <menu name="Documentation">
-            <item name="SCB Overview" href="documentation/overview.xhtml"/>
-            <item name="Tutorial 1" href="documentation/tutorial_1.xhtml"/> 
-            <item name="Tutorial 2" href="documentation/scb-triaxrs-tutorial.xhtml"/>
-        </menu>
-    </body>
-</project>
diff --git a/rdf/core/src/site/xsite/content/overview.xhtml b/rdf/core/src/site/xsite/content/overview.xhtml
deleted file mode 100644
index 74da552..0000000
--- a/rdf/core/src/site/xsite/content/overview.xhtml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * 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.
- */
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
-	<head>
-		<title>Smart Content Binding: An Overview</title>
-	</head>
-	<body>
-		<h1>Smart Content Binding: An Overview</h1>
-		<p>Author: Hasan - clerezza.org</p>
-		<p>Date: November 10, 2008</p>
-		<p>Contributor: Reto Bachmann-Gmür - clerezza.org</p>
-		<h2>Introduction</h2>
-		<p>
-			Smart Content Binding (SCB) is an open source framework developed by
-			clerezza.org aiming primarily at providing a java implementation of the
-			ImmutableGraph data model specified by W3C RDF [<a href="#ref1">1</a>] and
-			functionalities to operate on that data model. SCB offers a service
-			interface to access multiple named graphs and it can use various
-			providers to manage RDF graphs in a technology specific manner, e.g.,
-			using Jena [<a href="#ref2">2</a>] (TBD) or Sesame [<a href="#ref3">3</a>].
-			It also provides façades that allow an application to use Jena or Sesame (TBD)
-			APIs to process RDF graphs (note that the choice of a façade is independent of
-                        the chosen backend; you can for example use the Jena façade to write
-                        your code against the Jena API while using the Sesame provider to store
-                        your data in a Sesame store).
-			Furthermore, SCB offers a serialization and a parsing service to convert
-			a ImmutableGraph into a certain representation (format) and vice versa. In order
-			to support ontologies usage, SCB provides a tool to convert ontologies
-			defined in various formats including RDF/XML into Java classes.
-		</p>
-
-		<h2>Architecture</h2>
-		<p>
-			SCB comprises the following architectural components as depicted in Fig. 1:
-		</p>
-		<ul>
-			<li>Core</li>
-			<li>Façades</li>
-			<li>Utilities</li>
-			<li>Storage Providers</li>
-			<li>Parsing Providers</li>
-			<li>Serializing Providers</li>
-			<li>Ontologies Tool</li>
-		</ul>
-		<p>
-			<img src="images/scb_architecture.png" alt="SCB Architecture"/>
-			<br/><i>Figure 1: SCB Architecture</i>
-		</p>
-		<p>
-			The Core contains interface definitions of the RDF ImmutableGraph data model and its
-			implementation. The three main classes are <code>ImmutableGraph</code>, <code>Graph</code>,
-			and <code>Graph</code>. The class <code>ImmutableGraph</code> represents an
-			immutable RDF ImmutableGraph, as such its identity criterion is defined in terms of
-			ImmutableGraph-isomorphism. The class <code>Graph</code> represents a mutable RDF ImmutableGraph,
-			which enables triples to be added to or removed from a ImmutableGraph. The class
-			<code>Graph</code> is the super class of both the class <code>ImmutableGraph</code>
-			and <code>Graph</code>.
-			SCB Core provides three services: <code>TcManager</code> [<a href="#ref4">4</a>] allows access to
-			the various <code>Graph</code>s, <code>Parser</code> [<a href="#ref5">5</a>] and
-			<code>Serializer</code> [<a href="#ref6">6</a>] to allow reading and writing graphs from and to
-			various formats. In an OSGi environment these services are accessed using the
-			service registry or injected using OSGi Declarative Services. In a non OSGi environment
-			static factory methods are used to return an instance.
-			The <code>TcManager</code> delegates actual processing tasks to a specific Storage Provider
-			chosen from a set of Storage Providers based on their priority number (weight).
-			Storage Providers can be dynamically bound to or unbound from the Core.
-			The functionality required by the Parser and Serializer is delegated to registered
-			Parsing and Serializing Providers respectively, according to their capability
-			(supported formats). Later registered providers shadow previous ones for the same format.
-		</p>
-		<p>
-			The current implementation of SCB includes a Jena Façade. The Jena Façade allows an
-			application to use Jena API to manipulate a TC.
-		</p>
-		<p>
-			In order to ease operations on a resource in a TC, the Utilities component provides
-			a class with a set of useful methods, e.g., to delete all triples (statements) with
-			the resource as subject and a specified predicate.
-		</p>
-		<p>
-			Finally, the Ontologies Tool contains a standalone application called SchemaGen to
-			generate the Java source code with constants from an ontology description.
-		</p>
-		<h2>Artifacts</h2>
-		<p>
-			Each architectural component described above comprises one or more artifacts as
-			listed in Table 1.
-			<br/><br/><i>Table 1: Artifacts of each architectural components</i><br/>
-		</p>
-		<table border="1" cellpadding="4">
-			<tr>
-				<th>Architectural Component</th>
-				<th>Artifact</th>
-				<th>Artifact Type</th>
-			</tr>
-			<tr>
-				<td rowspan="2">Core</td>
-				<td>org.clerezza.rdf.core</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>org.clerezza.rdf.core.test</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>Façades</td>
-				<td>org.clerezza.rdf.jena.facade</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>Utilities</td>
-				<td>org.clerezza.rdf.utils</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td rowspan="2">Storage Providers</td>
-				<td>org.clerezza.rdf.sesame.storage</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>org.clerezza.rdf.jena.storage</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>Parsing Providers</td>
-				<td>org.clerezza.rdf.jena.parser</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>Serializing Providers</td>
-				<td>org.clerezza.rdf.jena.serializer</td>
-				<td>Jar and OSGi bundle</td>
-			</tr>
-			<tr>
-				<td>Ontologies Tool</td>
-				<td>org.clerezza.rdf.tool.schemagen</td>
-				<td>Executable jar</td>
-			</tr>
-		</table>
-		<h2>Building SCB</h2>
-		<p>
-			If you want to build SCB from its sources, you need JDK version 1.6 to compile.
-			Maven version 2.0.9 has been used to build SCB.
-		</p>
-		<h2>Developing Applications using SCB</h2>
-		<p>
-			To develop an application on top of SCB, you need to have the Core and optionally
-			Utilities and Façades.
-		</p>
-		<h2>Deploying an Application Requiring SCB</h2>
-		<p>
-			To deploy an application which uses SCB, Java(TM) SE Runtime Environment 6 or
-			higher is needed. If the application does not use OSGi, then the SCB Core,
-			the jars required for compilation, as well as the needed implementations
-			(typically one provider for storage, serialization, and parsing) must be in
-			the classpath. If the application uses OSGi, these jars are loaded as bundles,
-			and to run in OSGi, Declarative Services must be enabled (see the documentation
-			of your OSGi container).
-		</p>
-		<p>
-			The use of SCB in an OSGi environment has been tested with Apache Felix [<a href="#ref7">7</a>]
-			and Eclipse Equinox [<a href="#ref8">8</a>].
-		</p>
-		<h2>Extending and Customizing SCB</h2>
-		<p>
-			Since SCB applies a Service Oriented Architecture approach, following components
-			can be easily extended: Storage Providers, Parsing Providers, and Serializing
-			Providers. Using OSGi, new bundles just need to implement the required service
-			interfaces. To be located outside an OSGi environment, they should also provide
-			files in "META-INF/services" for the services they expose. Consult the SCB JavaDoc
-			for more information [<a href="#ref9">9</a>].
-		</p>
-		<h2>References</h2>
-		<p id="ref1">[1] W3C: Resource Description Framework (RDF): Concepts and Abstract Syntax; 2004, <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/</a>
-		</p>
-		<p id="ref2">[2] <a href="http://jena.sourceforge.net/">http://jena.sourceforge.net/</a>
-		</p>
-		<p id="ref3">[3] <a href="http://www.openrdf.org/">http://www.openrdf.org/</a>
-		</p>
-		<p id="ref4">[4] <a href="http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/index.html?org/clerezza/rdf/core/access/TcManager.html">
-			http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/index.html?org/clerezza/rdf/core/access/TcManager.html</a>
-		</p>
-		<p id="ref5">[5] <a href="http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/org/clerezza/rdf/core/serializedform/Parser.html">
-			http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/org/clerezza/rdf/core/serializedform/Parser.html</a>
-		</p>
-		<p id="ref6">[6] <a href="http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/org/clerezza/rdf/core/serializedform/Serializer.html">
-			http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/org/clerezza/rdf/core/serializedform/Serializer.html</a>
-		</p>
-		<p id="ref7">[7] <a href="http://felix.apache.org/site/index.html">http://felix.apache.org/site/index.html</a>
-		</p>
-		<p id="ref8">[8] <a href="http://www.eclipse.org/equinox/">http://www.eclipse.org/equinox/</a>
-		</p>
-		<p id="ref9">[9] <a href="http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/index.html">http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/index.html</a>
-		</p>
-	</body>
-</html>
\ No newline at end of file
diff --git a/rdf/core/src/site/xsite/content/scb-triaxrs-tutorial.xhtml b/rdf/core/src/site/xsite/content/scb-triaxrs-tutorial.xhtml
deleted file mode 100644
index 9389bad..0000000
--- a/rdf/core/src/site/xsite/content/scb-triaxrs-tutorial.xhtml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * 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.
- */
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
-	<head>
-		<title>Tutorial 2: Developing RDF backed RESTful applicationts</title>
-		<link rel="stylesheet" type="text/css" href="style/documentation.css"/>
-	</head>
-	<body>
-		<h1>Tutorial 2: Developing RDF backed RESTful applications</h1>
-		<p>Author: Reto Bachmann-Gmür and Tsuyoshi Ito - clerezza.org</p>
-		<p>Contributor: Hasan - clerezza.org</p>
-		<h2>Table of Contents</h2>
-		<p>
-			<a href="#introduction">1. Introduction</a>
-		</p>
-		<p>
-			<a href="#setting">2. Setting up the project</a>
-		</p>
-		<p>
-			<a href="#accessible">3. Creating an accessible service</a>
-		</p>
-		<p>
-			<a href="#build">4. Build</a>
-		</p>
-		<p>
-			<a href="#install">5. Installing the bundle</a>
-		</p>
-		<p>
-			<a href="#test">5. Test your bundle</a>
-		</p>
-		<p>
-			<a href="#references">6. References</a>
-		</p>
-		<h2 id="introduction">1. Introduction</h2>
-		<p>
-			REST [<a href="#ref1">1</a>] is a software architecture style
-			applicable to the World Wide Web. With the advent of the Semantic Web
-			this resource oriented design shows its strength. The web of documents
-			evolves seamlessly to a web of data and knowledge.
-		</p>
-		<p>
-			RESTful Web applications are designed based on a set of REST
-			principles. In this introductory tutorial you'll learn how to develop
-			a RESTful application that delivers human readable semantic content
-			which is stored in a triple store.
-		</p>
-		<p>
-			Therefore, you will learn about SCB [<a href="#ref2">2</a>] and Triaxrs
-			[<a href="#ref3">3</a>] and how to use them to develop an RDF-backed
-			RESTful Web application. The time it takes to go through this tutorial
-			is around 30 minutes.
-		</p>
-		<h2 id="setting">2. Setting up the project</h2>
-		<p>
-			Create a maven project with the following parent and dependencies
-			(see the Triaxrs Tutorial 1 (Developing a RESTful Web Application
-			for OSGi Runtime Environment) for more detail [<a href="#ref4">4</a>]):
-		</p>
-
-        <p>First configure the repositories as follows:</p>
-		<blockcode>
-&lt;repositories&gt;
-	 &lt;repository&gt;
-		 &lt;id&gt;clerezza-release&lt;/id&gt;
-		 &lt;name&gt;clerezza.org distribution repository&lt;/name&gt;
-		 &lt;url&gt;http://repo.trialox.org/release&lt;/url&gt;
-		 &lt;layout&gt;default&lt;/layout&gt;
-	 &lt;/repository&gt;
-	 &lt;repository&gt;
-		 &lt;id&gt;clerezza-snapshot&lt;/id&gt;
-		 &lt;name&gt;clerezza.org snapshot repository&lt;/name&gt;
-		 &lt;url&gt;http://repo.trialox.org/snapshot&lt;/url&gt;
-		 &lt;layout&gt;default&lt;/layout&gt;
-	 &lt;/repository&gt;
-&lt;/repositories&gt;
-		</blockcode>
-		<blockcode>
-&lt;parent&gt;
-	 &lt;artifactId&gt;org.clerezza.parent&lt;/artifactId&gt;
-	 &lt;groupId&gt;org.clerezza&lt;/groupId&gt;
-	 &lt;version&gt;0.1-SNAPSHOT&lt;/version&gt; //check <a href="http://repo.trialox.org/release/org/clerezza/org.clerezza.parent/">here</a> for the newest release version or
-    <a href="http://repo.trialox.org/snapshot/org/clerezza/org.clerezza.parent/">here</a> for newest snapshot version&lt;/parent&gt; 		</blockcode>
-    <p>It in not necessary to define the <code>version</code> parameter of each dependency because they are specified in the parents pom file.</p>
-		<blockcode>
-&lt;dependency&gt;
- 	 &lt;groupId&gt;org.clerezza&lt;/groupId&gt;
- 	 &lt;artifactId&gt;org.clerezza.jaxrs.rdf.providers&lt;/artifactId&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-	 &lt;groupId&gt;org.clerezza&lt;/groupId&gt;
-	 &lt;artifactId&gt;org.clerezza.platform.typerendering.seedsnipe&lt;/artifactId&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-	 &lt;groupId&gt;org.clerezza&lt;/groupId&gt;
-	 &lt;artifactId&gt;org.clerezza.triaxrs&lt;/artifactId&gt;
-&lt;/dependency&gt;
-		</blockcode>
-		<p>Also set packaging to <code>bundle</code></p>
-		<p class="note">
-			By default the <code>maven-bundle-plugin</code> will export the
-			package named &lt;groupId>.&lt;artifactId> and its subpackages,
-			so the exposed components must be defined in a package named that way.
-			In our example we use <code>org.example.clerezza</code> as
-			groupId and <code>combined.tutorial</code> as artifactId.
-		</p>
-
-		<h2 id="accessible">3. Creating an accessible service</h2>
-		<p>
-			Like in the Triaxrs Tutorial 1 [<a href="#ref4">4</a>] we create a
-			JAX-RS class to get information about persons. To have some data to
-			play with, we will add an RDF file encoded in the Turtle format into
-			the resource tree of our project. Thus, we create the file
-			src/main/resources/org/example/clerezza/combined/tutorial/data.turtle
-			with the following content:</p>
-	<blockcode>
-@prefix foaf: &lt;http://xmlns.com/foaf/0.1/&gt;.
-
-[	a foaf:Person;
-    foaf:title "Mr";
-    foaf:name "John Doe";
-    foaf:mbox &lt;mailto:john@example.org&gt;;
-    foaf:topic_interest &lt;http://dbpedia.org/resource/Category:BBC_television_sitcoms&gt;;
-    foaf:nick "jo" ] .
-
-[	a foaf:Person;
-    foaf:title "Mrs";
-    foaf:name "Jane Bloggs";
-    foaf:mbox &lt;mailto:jane@example.org&gt;;
-    foaf:openid &lt;http://openid.example.org/jbloggs&gt; ] .
-		</blockcode>
-
-		<p>
-			The JAX-RS resource class mentioned above is called in this tutorial
-			<code>TutorialApp</code> and looks as follows:
-		</p>
-		<blockcode>
-package org.example.clerezza.combined.tutorial;
-
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-
-import org.osgi.service.component.ComponentContext;
-
-import org.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
-import org.clerezza.platform.typerendering.RenderletManager;
-import org.clerezza.rdf.ontologies.FOAF;
-import org.clerezza.rdf.utils.GraphNode;
-import org.clerezza.rdf.core.ImmutableGraph;
-import org.clerezza.rdf.core.Graph;
-import org.clerezza.rdf.core.NonLiteral;
-import org.clerezza.rdf.core.Triple;
-import org.clerezza.rdf.core.Graph;
-import org.clerezza.rdf.core.UriRef;
-import org.clerezza.rdf.core.access.NoSuchEntityException;
-import org.clerezza.rdf.core.access.TcManager;
-import org.clerezza.rdf.core.serializedform.Parser;
-
-/**
- * Get Persons by their email
- *
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- */
-
-@Path("/foaf")
-public class TutorialApp {
-
-	/**
-	 * @scr.reference
-	 */
-	TcManager tcManager;
-
-	/**
-	 * @scr.reference
-	 */
-	private RenderletManager renderletManager;
-
-	private UriRef graphName = new UriRef("http://localhost.mygraph");
-
-	@GET
-	@Path("find")
-	@Produces("application/rdf+xml")
-	public ImmutableGraph getPersonRdf(@QueryParam("mbox") String mboxString) {
-		Graph graph = tcManager.getMGraph(graphName);
-		NonLiteral person = getPersonByMbox(mboxString, graph);
-		return new GraphNode(person, graph).getNodeContext();
-	}
-
-	@GET
-	@Path("find")
-	@Produces("application/xhtml+xml")
-	public GraphNode getPersonHtml(@QueryParam("mbox") String mboxString) {
-		Graph graph = tcManager.getMGraph(graphName);
-		NonLiteral person = getPersonByMbox(mboxString, graph);
-		return new GraphNode(person, graph);
-	}
-
-	private NonLiteral getPersonByMbox(String mboxString, Graph graph) {
-		Iterator&lt;Triple&gt; iter = graph.filter(null, FOAF.mbox, new UriRef(mboxString));
-		NonLiteral person = null;
-		while(iter.hasNext()) {
-			person = iter.next().getSubject();
-		}
-		return person;
-	}
-
-	/**
-	 * The activate method is called when SCR activates the component configuration.
-	 * This method gets the system ImmutableGraph or create a new one if it doesn't exist.
-	 *
-	 * @param componentContext
-	 */
-	protected void activate(ComponentContext componentContext) {
-
-		URL templateURL = getClass().getResource("tutorial.xhtml");
-		try {
-			renderletManager.registerRenderlet(SeedsnipeRenderlet.class
-					.getName(), new UriRef(templateURL.toURI().toString()),
-					FOAF.Person, null, MediaType.APPLICATION_XHTML_XML_TYPE,
-					true);
-		} catch (URISyntaxException ex) {
-			throw new WebApplicationException(ex);
-		}
-		Graph tc;
-		try {
-			tcManager.getMGraph(graphName);
-		} catch (NoSuchEntityException nsee) {
-			tc = tcManager.createMGraph(graphName);
-			InputStream fin = null;
-			fin = getClass().getResourceAsStream("data.turtle");
-			Parser parser = Parser.getInstance();
-			tc.addAll(parser.parse(fin, "text/turtle"));
-		}
-	}
-}
-
-		</blockcode>
-		<p>
-			The resource class above provides two resource methods to process
-			GET requests specifying the path /foaf/find. The JAX-RS annotation
-			@Path on TutorialApp sets the path of the resource to “/foaf”,
-			while the JAX-RS annotation @Path on the resource methods
-			<code>getPersonRdf</code> and <code>getPersonHtml</code> defines
-			the subpath "find". Furthermore, the JAX-RS annotation @Produces
-			defines the list of media types that a Java type or a method
-			can produce. A media type corresponds with the representation of a
-			resource. In this tutorial <code>getPersonRdf</code> should produce
-			"application/rdf+xml", whereas <code>getPersonHtml</code> should
-			produce "application/xhtml+xml". Both methods accept a parameter,
-			whose value is obtained from the GET request parameter called mbox.
-			This is defined through the JAX-RS annotation @QueryParam.
-		</p>
-		<p>
-			A resource can have multiple representations. For example, a web page
-			can be represented as html, pdf, plain text, or other representations.
-			The HTTP defines a mechanism known as content negotiation to allow a
-			client (e.g., a web browser) to specify which representation it would
-			like to get from the server. Using JAX-RS we can define a
-			<code>MessageBodyWriter</code> which maps a Java type to a
-			representation. In this tutorial <code>getPersonRdf</code> returns
-			a ImmutableGraph, whereas <code>getPersonHtml</code> returns a GraphNode,
-			which represents a node in the context of a ImmutableGraph. The clerezza
-			platform provides for either resources ImmutableGraph and GraphNode a
-			corresponding <code>MessageBodyWriter</code>.
-		</p>
-		<p>
-			The clerezza platform's <code>TemplatingMessageBodyWriter</code>
-			produces a representation of the format "application/xhtml+xml"
-			from a <code>GraphNode</code>, whereas the <code>GraphWriter</code>
-			produces "application/rdf+xml" from a <code>ImmutableGraph</code>.
-			<code>GraphWriter</code> is implemented in the maven project
-			org.clerezza.jaxrs.rdf.providers.
-			The <code>TemplatingMessageBodyWriter</code> uses a templating engine
-			to render a <code>GraphNode</code> based on a predefined template file.
-			In order to allow a different <code>GraphNode</code> to be rendered
-			using a different template, each <code>GraphNode</code> and template
-			is bound to a specific RDF type.
-		</p>
-		<p>
-			For the purpose of registering a template, a
-			<code>RenderletManager</code> service is made available. In this tutorial,
-			a template (obtained from the file "tutorial.xhtml") is registered
-			for the RDF type FOAF.Person (http://xmlns.com/foaf/0.1/Person).
-			This is done in the <code>activate</code> method using the
-			<code>RenderletManager</code> service.
-		</p>
-		<p>
-			In the <code>activate</code> method we also use the <code>TcManager</code> to get
-			the <code>Graph</code> called "http://localhost.mygraph". If this
-			ImmutableGraph doesn't exist, a <code>NoSuchEntityException</code> is thrown.
-			In this latter case, we catch this exception and create an
-			<code>Graph</code>. Afterwards we add the triples from the file
-			mentioned above into the ImmutableGraph.
-		</p>
-
-		<p>
-			The following template renders a FOAF.Person. For easier readability
-			namespaces can be defined. Statements which should be interpreted by
-			the templating engine starts with the character <code>$</code>.
-			The templating language allows loops and conditions. More examples
-			are available on the project website of the templating engine
-			(<a href="http://clerezza.org/projects/org.clerezza.templating.seedsnipe/documentation/overview.xhtml" target="_blank" >http://clerezza.org/projects/org.clerezza.templating.seedsnipe/documentation/overview.xhtml</a>
-		</p>
-		<blockcode>
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-&lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"&gt;
-&lt;head&gt;
-	${ns:foaf=http://xmlns.com/foaf/0.1/}
-	&lt;meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/&gt;
-	&lt;title&gt;clerezza - Combined Tutorial&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
-	&lt;h1&gt;clerezza - Combined Tutorial&lt;/h1&gt;
-	&lt;h2&gt;FOAF Person:&lt;/h2&gt;
-	&lt;div&gt;
-		&lt;p&gt;Name: ${foaf:title} ${foaf:name}&lt;/p&gt;
-		&lt;p&gt;Email: ${foaf:mbox}&lt;/p&gt;
-		${if foaf:nick}
-		&lt;p&gt;Nickname: ${foaf:nick}&lt;/p&gt;
-		${/if}
-		&lt;p&gt;Topic interests: &lt;br /&gt;
-		${loop}
-			${foaf:topic_interest}&lt;br /&gt;
-		${/loop}
-		&lt;/p&gt;
-	&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-		</blockcode>
-		<h2 id="build">4. Build</h2>
-		<p>To build the package, execute the command:
-		</p>
-		<blockcode>
-		$ mvn package
-		</blockcode>
-
-		<h2 id="install">5. Installing the bundle in the Clerezza Platform</h2>
-		<p>
-			Download the latest clerezza platform launcher from
-			<a href="http://repo.trialox.org/snapshot/org/clerezza/org.clerezza.platform.launcher.sesame/" target="_blank" >
-			http://repo.trialox.org/snapshot/org/clerezza/org.clerezza.platform.launcher.sesame/</a> and start it.
-			Go to <a href="http://localhost:8080/user/admin/control-panel" target="_blank" >http://localhost:8080/user/admin/control-panel</a> (enter username: admin, password; admin) and upload your bundle.
-		</p>
-		<h2 id="test">Test your bundle</h2>
-		<p>Open the URL <a href="http://localhost:8080/foaf/find">http://localhost:8080/foaf/find</a> and add the URL parameter <code>mbox=mailto:john@example.org</code> to receive information about john</p>
-		<h2 id="references">References</h2>
-		<p id="ref1">[1] R.T. Fielding: Architectural Styles and the Design of Network-based Software Architectures; CHAPTER 5 Representational State Transfer (REST), 2000, <a href="http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm">http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm</a></p>
-		<p id="ref2">[2] Clerezza Smart Content Binding SCB <a href="http://clerezza.org/projects/org.clerezza.rdf.core/">http://clerezza.org/projects/org.clerezza.rdf.core/</a></p>
-		<p id="ref3">[3] Clerezza Triaxrs<a href="http://clerezza.org/projects/org.clerezza.triaxrs/">http://clerezza.org/projects/org.clerezza.triaxrs/</a></p>
-		<p id="ref4">[4] Clerezza Triaxrs Tutorial 1<a href="http://clerezza.org/projects/org.clerezza.triaxrs/documentation/tutorial_1.xhtml">http://clerezza.org/projects/org.clerezza.triaxrs/documentation/tutorial_1.xhtml</a></p>
-		<p><i>That's all folks for this time! <br/><!--You can send your feedback to: --></i></p>
-	</body>
-</html>
diff --git a/rdf/core/src/site/xsite/content/sitemap.xml b/rdf/core/src/site/xsite/content/sitemap.xml
deleted file mode 100644
index 300a1e1..0000000
--- a/rdf/core/src/site/xsite/content/sitemap.xml
+++ /dev/null
@@ -1,31 +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.
-
--->
-<sitemap>
-    <section>
-        <name>Overview</name>
-        <page>overview.xhtml</page>
-    </section>
-    <section>
-        <name>Tutorials</name>
-        <page>tutorial_1.xhtml</page>
-        <page>scb-triaxrs-tutorial.xhtml</page>
-    </section> 
-</sitemap>
diff --git a/rdf/core/src/site/xsite/content/tutorial_1.xhtml b/rdf/core/src/site/xsite/content/tutorial_1.xhtml
deleted file mode 100644
index d653d0c..0000000
--- a/rdf/core/src/site/xsite/content/tutorial_1.xhtml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * 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.
- */
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
-	<head>
-		<title>Tutorial 1: Exploring and aggregating RDF data with SCB</title>
-		<link rel="stylesheet" type="text/css" href="style/documentation.css"/>
-	</head>
-	<body>
-		<h1>Tutorial 1: Exploring and aggregating RDF data with SCB</h1>
-		<p>Author: Reto Bachmann-Gmür - clerezza.org</p>
-		<p>Contributor: Hasan - clerezza.org</p>
-		<p>Update : Florent - apache.org</p>
-		<p>Date: 2010-06-14</p>
-		<h2>Table of Contents</h2>
-		<p>
-			<a href="#objective">1. Objective</a>
-		</p>
-		<p>
-			<a href="#maven">2. Initializing a Maven Project</a>
-		</p>
-		<p>
-			<a href="#functionality">3. Creating a ImmutableGraph and loading Data</a>
-		</p>
-		<p>
-			<a href="#accessing">4. Accessing the Triples</a>
-		</p>
-		<p>
-			<a href="#context">5. Resource context</a>
-		</p>
-		<p>
-			<a href="#example">6. Putting it all together: the example app</a>
-		</p>
-		<p>
-			<a href="#further">7. Taking it further</a>
-		</p>
-		<p>
-			<a href="#references">8. References</a>
-		</p>
-		<h2 id="objective">1. Objective</h2>
-		<p>
-			In this tutorial you will learn how to use SCB to manage data modeled
-			as a ImmutableGraph based on the RDF [<a href="#ref1">1</a>] standard
-			maintained by W3C.
-		</p>
-		<p>
-			You'll learn how to get ImmutableGraph objects from serialized RDF data on
-			the web and how to access such a ImmutableGraph using the core SCB package
-			and the SCB utilities package.
-		</p>
-		<p>
-			Key advantages of SCB include the support of OSGi [<a href="#ref2">2</a>]
-			to allow for a better modularization of application and the support of
-			other triple store APIs through technology specific façades (adapters).
-			However, you will learn to know these key advantages in next tutorials. This
-			tutorial provides for a good foundation to work with and understand
-			the basic concept of SCB ImmutableGraph data model.
-		</p>
-		<p>
-			Our example will download data about BBC television sitcoms from
-			dbpedia into a local ImmutableGraph, display the context of a given resource
-			and download additional data from the web when the user requests it.
-			The	time it takes to go through this tutorial is approximately an hour. This
-			tutorial is intended for java developers, some familiarity with the
-			build tool maven [<a href="#ref3">3</a>] is an advantage.
-		</p>
-		<h2 id="maven">2. Setting up the Maven project</h2>
-		<p>
-			We use maven to build our project and to keep track of dependencies
-			in an IDE independent way. Maven will take care of downloading the
-			required dependencies from their respective repositories.
-		</p>
-		<h3 id="initialization">2.1. Initializing</h3>
-		<p>
-			First, a maven project with the groupId org.example.clerezza.scb
-			and the artifactId tutorial1 will be created by executing the
-			following command in a shell:
-		</p>
-		<!-- blockcode not yet supported in XHTML 1.1, squatting from XHTML 2.0 -->
-		<blockcode>
-$ mvn archetype:generate --batch-mode \
--DarchetypeGroupId=org.apache.maven.archetypes \
--DarchetypeArtifactId=maven-archetype-quickstart \
--DgroupId=org.example.clerezza.scb \
--DartifactId=tutorial1 \
--Dversion=1.0-SNAPSHOT \
--Dpackage=org.example.clerezza.scb.tutorial1
-		</blockcode>
-		<p>
-			If all goes well the output output of the command contains the
-			following:
-		</p>
-		<blockcode>
-------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO]
-------------------------------------------------------------------------
-		</blockcode>
-
-		<p>
-			A new directory called tutorial1 is created containing a source
-			directory src and a file called pom.xml used by maven to build the
-			project. A program file called App.java is created and placed under
-			the directory src/main/java/org/example/clerezza/scb/tutorial1/, we
-			will modify this Class to build our demo application, but before we
-			add the required dependencies to our pom.xml.
-		</p>
-
-		<h3 id="dependencies">2.2. Adding dependencies</h3>
-		<p>
-			As the required Clerezza artifacts are not yet in the maven default
-			repositories we need to add the respective repository locations to
-			our pom.xml (alternatively we could add them globally
-			to the maven settings.xml). Add the following as a child element of
-			<code>project</code> in your pom.xml:
-		</p>
-		<blockcode>
-
-  &lt;repositories>
-    &lt;repository>
-      &lt;id>apache&lt;/id>
-      &lt;name>apache repository&lt;/name>
-      &lt;snapshots>
-	&lt;updatePolicy>always&lt;/updatePolicy>
-	&lt;checksumPolicy>warn&lt;/checksumPolicy>
-      &lt;/snapshots>
-      &lt;url>http://repository.apache.org/content/groups/snapshots-group&lt;/url>
-      &lt;layout>default&lt;/layout>
-    &lt;/repository>
-  &lt;/repositories>
-		</blockcode>
-
-		<p>
-			Now we can add the dependencies to the <code>dependencies</code>
-			section that maven will download from the clerezza repositories.
-		</p>
-		<p>
-			The following are the compile-time dependencies (the default scope
-			for dependencies is <code>compile</code>). Beside
-			<code>org.clerezza.rdf.core</code> which provides the core scb bundles
-			we add <code>org.clerezza.rdf.utils</code> that contains handy utility
-			classes and <code>org.clerezza.rdf.ontologies</code> which contains
-			classes containing constants for the terms of popular ontologies.
-		</p>
-		<blockcode>
-&lt;dependency&gt;
-	&lt;groupId&gt;org.apache.clerezza&lt;/groupId&gt;
-	&lt;artifactId&gt;org.apache.clerezza.rdf.core&lt;/artifactId&gt;
-	&lt;version&gt;0.12-incubating-SNAPSHOT&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-	&lt;groupId&gt;org.apache.clerezza&lt;/groupId&gt;
-	&lt;artifactId&gt;org.apache.clerezza.rdf.utils&lt;/artifactId&gt;
-	&lt;version&gt;0.13-incubating-SNAPSHOT&lt;/version&gt;
-&lt;/dependency&gt;
-&lt;dependency&gt;
-	&lt;groupId&gt;org.apache.clerezza&lt;/groupId&gt;
-	&lt;artifactId&gt;org.apache.clerezza.rdf.ontologies&lt;/artifactId&gt;
-	&lt;version&gt;0.11-incubating-SNAPSHOT&lt;/version&gt;
-&lt;/dependency&gt;
-		</blockcode>
-
-		<p class="note">
-			The set version numbers were the latest at time of writing to
-			find the latest release or snapshot version check
-			https://repository.apache.org/content/repositories/releases/
-			respectively https://repository.apache.org/content/repositories/snapshots/.
-		</p>
-
-		<p>
-			The above dependencies will be sufficient to compile our application,
-			to run the application. However as SCB provides mainly interfaces
-			to exchangeable implementations we should add some runtime dependencies:
-		</p>
-		<!-- NOTE : think this comment is not still valid
-		     <div class="note">
-			At the time of writing this a bug in the maven exec-plugin prevents us
-			from declaring these dependencies as what they actually are, so
-			the runtime scope is commented out.
-		</div>-->
-		<blockcode>
-&lt;dependency>
-	&lt;groupId>org.apache.clerezza&lt;/groupId>
-	&lt;artifactId>org.apache.clerezza.rdf.jena.parser&lt;/artifactId>
-	&lt;version>0.10-incubating-SNAPSHOT&lt;/version>
-	&lt;scope>runtime&lt;/scope>
-&lt;/dependency>
-&lt;dependency>
-	&lt;groupId>org.apache.clerezza&lt;/groupId>
-	&lt;artifactId>org.apache.clerezza.rdf.jena.serializer&lt;/artifactId>
-	&lt;version>0.9-incubating-SNAPSHOT&lt;/version>
-	&lt;scope>runtime&lt;/scope>
-&lt;/dependency>
-&lt;dependency>
-	&lt;groupId>org.slf4j&lt;/groupId>
-	&lt;artifactId>slf4j-simple&lt;/artifactId>
-	&lt;version>1.5.5&lt;/version>
-	&lt;scope>runtime&lt;/scope>
-&lt;/dependency>
-&lt;dependency>
-	&lt;groupId>org.apache.clerezza&lt;/groupId>
-	&lt;artifactId>org.apache.clerezza.rdf.simple.storage&lt;/artifactId>
-	&lt;version>0.7-incubating-SNAPSHOT&lt;/version>
-	&lt;scope>runtime&lt;/scope>
-&lt;/dependency>
-		</blockcode>
-
-		<p>
-			The two dependencies are implementations of rdf parsers and
-			serializers for various formats. They are based on the Jena Framework
-			[<a href="#ref4">4</a>] but you don't have to care about this.
-		</p>
-
-		<p>
-			Almost forgot, maven defaults to some rather old java version, to fix
-			this we should add the following to configure the
-			<code>maven-compiler-plugin</code> to use java 6, the
-			<code>build</code> element is a child of <code>project</code>.
-		</p>
-		<blockcode>
-&lt;build>
-   &lt;pluginManagement>
-	&lt;plugins>
-		&lt;plugin>
-			&lt;groupId>org.apache.maven.plugins&lt;/groupId>
-			&lt;artifactId>maven-compiler-plugin&lt;/artifactId>
-                        &lt;version>2.0.2&lt;/version>
-			&lt;configuration>
-				&lt;source>1.6&lt;/source>
-				&lt;target>1.6&lt;/target>
-                                &lt;encoding>utf-8&lt;/encoding>
-			&lt;/configuration>
-		&lt;/plugin>
-	&lt;/plugins>
-  &lt;/pluginManagement>
-&lt;/build>
-		</blockcode>
-
-		<p>
-		  Try an "$mvn compile" command, build successful will apear.
-		</p> 
-
-		<p>
-		  Enough configuration, lets get our hands dirty and write some code.
-		</p>
-
-		<h2 id="functionality">3. Creating a ImmutableGraph and loading Data</h2>
-		<p>
-			In RDF, Graphs are collections of triples. Strictly speaking graphs
-			are immutable : if you add or remove a triple its a new ImmutableGraph. For
-			that SCB distinguishes between two types of
-			<code>Graph</code>s: <code>ImmutableGraph</code> and
-			<code>Graph</code> where 'M' stands for "mutable". The Graph
-			and ImmutableGraph interfaces both extend <code>Graph</code> which
-			apart from extending <code>java.util.Collection&lt;Triple&gt;</code>
-			provide a method <code>filter</code>
-			to query RDF triples according to filter parameters
-			specified: subject, predicate, and object.
-		</p>
-		<p>
-			The factory we need for getting <code>Graph</code>s
-			is <code>
-				<a href="http://clerezza.org/projects/org.clerezza.rdf.core/apidocs/org/clerezza/rdf/core/access/TcManager.html">
-					TcManager
-				</a></code>, depending on the available
-			storage providers the returned instances may be backed on an efficient
-			triple store like Sesame, or if no provider is available a simple and
-			terribly inefficient HashSet based implementation is returned.
-		</p>
-		<p>
-			To store our accumulated knowledge around BBC television sitcoms
-			we create an <code>Graph</code> with the following code:
-		</p>
-		<blockcode>
-import org.apache.clerezza.rdf.core.*;
-import org.apache.clerezza.rdf.core.access.TcManager;
-
-...
-
-//get the singleton instance of TcManager
-final TcManager tcManager = TcManager.getInstance();
-//the arbitrary name we use for our mutable ImmutableGraph
-final UriRef mGraphName = new UriRef("http://tutorial.example.org/");
-//the m-ImmutableGraph into which we'll put the triples we collect
-final Graph graph = tcManager.createMGraph(mGraphName);
-		</blockcode>
-		<div class="note">
-			We don't repeat the skeleton code generated by the maven archetype
-			but trust the reader can add the statements above at a sensible
-			place in App.java.
-		</div>
-		<p>
-			The code creates an empty Graph with the name
-			&lt;http://tutorial.example.org/>. To verify that all went well
-			we can output the size of <code>graph</code> with the following:
-		</p>
-		<blockcode>
-System.out.println("Size of graph: "+graph.size());
-		</blockcode>
-		<p>
-			To compile and run the application using maven issue the following
-			command in the directory where the pom.xml is:
-		</p>
-		<blockcode>
-$ mvn compile exec:java -Dexec.mainClass=org.example.clerezza.scb.tutorial1.App
-		</blockcode>
-		<p>
-			The actual program output will be armored by the maven logging, you
-			may pass the -q argument, and you'll only see the actual output of our
-			program:
-		</p>
-		<blockcode>
-Size of graph: 0
-		</blockcode>
-		<p>
-			Boring emptiness, lets add the triples dbpedia has about
-			&lt;http://dbpedia.org/resource/Category:BBC_television_sitcoms>. First
-			use standard classes from the java.net package to dereference this
-			URI.
-		</p>
-		<blockcode>
-final URL url = new URL("http://dbpedia.org/resource/Category:BBC_television_sitcoms");
-final URLConnection con = url.openConnection();
-con.addRequestProperty("Accept", "application/rdf+xml");
-final InputStream inputStream = con.getInputStream();
-		</blockcode>
-		<div class="note">
-			The above code sets the "Accept"-Header of the HTTP-Request to
-			"application/rdf+xml" this tells the server that we can handle
-			responses in that format, for comparison the value of the
-			Accept-Header in the request of a browser might look like
-			"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8".<br/>
-			The URI &lt;http://dbpedia.org/resource/Category:BBC_television_sitcoms>
-			represents the abstract notion (the category) of BBC television sitcoms
-			which is not something that can actually be passed over the wire,
-			the server will answer with "303 See Other" response pointing to a
-			document describing the category we originally requested, in our case
-			this is &lt;http://dbpedia.org/data/Category:BBC_television_sitcoms.rdf>
-			for a normal browser it would be
-			&lt;http://dbpedia.org/page/Category:BBC_television_sitcoms>. URLConnection
-			transparently handles this redirection so we don't have to care
-			about sending the second request to the server.
-		</div>
-		<p>
-			Now that we have an InputStream from which rdf/xml can be read we
-			use <code>org.apache.clerezza.rdf.core.serializedform.Parser</code> to
-			convert it to a ImmutableGraph:
-		</p>
-		<blockcode>
-//get the singleton instance of Parser
-final Parser parser = Parser.getInstance();
-ImmutableGraph deserializedGraph = parser.parse(inputStream, "application/rdf+xml");
-		</blockcode>
-		<p>
-			Using the <code>addAll</code> which Graph inherits from
-			<code>Collection&lt;triple></code> we can add the triples of the
-			retrieved ImmutableGraph to graph:
-		</p>
-		<blockcode>
-graph.addAll(deserializedGraph);
-		</blockcode>
-		<p>
-			Outputting the size of the ImmutableGraph now returns something else (the
-			number of triples will vary as dbpedia evolves):
-		</p>
-		<blockcode>
-Size of graph: 251
-		</blockcode>
-		<h2 id="accessing">4. Accessing the Triples</h2>
-		<p>
-			It's good to know that by loading data into our <code>Graph</code>
-			its size has increased, but actually we would like to get data
-			out of <code>graph</code>.  The easiest would be to just use
-			the Serializer to write the ImmutableGraph to standard output:
-		</p>
-		<blockcode>
-final Serializer serializer = Serializer.getInstance();
-serializer.serialize(System.out, graph, "text/turtle");
-		</blockcode>
-		<p>The above code serialized <code>graph</code> in the turtle format
-		to the standard output.  You may want to try "application/n-triples" and
-		"application/rdf+xml" to see the triples serialized in different ways.
-		</p>
-		<p>The typical way to get specific triples is to use the <code>filter</code>
-		method which <code>ImmutableGraph</code> and <code>Graph</code> inherit from
-		<code>Graph</code>. The following outputs the
-		<code>RDF:type</code> of the resource
-		&lt;http://dbpedia.org/resource/Category:BBC_television_sitcoms>:</p>
-		<blockcode>
-Iterator&lt;Triple> typeTriples = graph.filter(new UriRef("http://dbpedia.org/resource/Category:BBC_television_sitcoms"), RDF.type, null);
-while (typeTriples.hasNext()) {
-	System.out.println(typeTriples.next());
-}
-		</blockcode>
-		<p>Note the use of <code>RDF.type</code> a constant from the
-		org.clerezza.rdf.ontologies package and maven artifact, <code>null</code>
-		is used as a wild card, here in the object position</p>
-		<h2 id="context">5. Resource context</h2>
-		<p>Often we want to get a concise description of a resource, the context
-		of a resource. In terms of RDF this can be formalized "context" as the set of
-		statements in which the resource is either subject or object. If such a
-		statement contains a blank node its context is included as well
-		[<a href="#ref5">5</a>].</p>
-		<p>The context can easily be accessed by using the <code>GraphNode</code>
-		class in the org.apache.clerezza.rdf.utils package.</p>
-		<blockcode>
-public ImmutableGraph getCurrentContext() {
-	return new GraphNode(new UriRef(selectedUri), graph).getNodeContext();
-}
-		</blockcode>
-		<p>The method above returns the context of the resource of which
-		<code>selectedUri</code> contains the name.</p>
-		<h2 id="example">6. Putting it all together: the example app</h2>
-		<p>Putting what we learned together and adding a swing front-end:</p>
-		<p>The <a href="http://clerezza.org/projects/org.clerezza.rdf.core/documentation/tutorial1/pom.xml">pom.xml</a> should be equivalent to
-		what you already have if you followed this tutorial, the
-		<a href="http://clerezza.org/projects/org.clerezza.rdf.core/documentation/tutorial1/src/main/java/org/example/clerezza/scb/tutorial1/Tutorial1App.java">
-		java code</a> creates a swing frame with a table containing the context
-		of a selected resource. By default, when clicking on a named resource that
-		is the subject or object of a statement, the context of this resource is
-		shown. By clicking on the button "Load Context from Web" the resource
-		is dereferenced and the triples are added to the local store.</p>
-		<h2 id="further">7. Taking it further</h2>
-		<p>A trivially achievable improvement of the example application would
-		be to add persistent storage.</p>
-		<p>By adding the sesame persitent storage provider to the runtime classpath
-		of the application our <code>Graph</code> is stored in a sesame store
-		[<a href="#ref8">8</a>] (this obsolotes the dependency on
-		<code>org.apache.clerezza.rdf.sesame.storage</code>).
-		</p>
-		<blockcode>
-&lt;dependency>
-	&lt;groupId>org.apache.clerezza&lt;/groupId>
-	&lt;artifactId>org.apache.clerezza.rdf.sesame.storage&lt;/artifactId>
-	&lt;version>0.13-incubating-SNAPSHOT&lt;/version>
-	&lt;!-- &lt;scope>runtime&lt;/scope> -->
-&lt;/dependency>
-		</blockcode>
-		<p>After adding this dependency on the second launch of the application
-		we should get an exception complaining that the ImmutableGraph already exists, the
-		reason for this is that <code>TcManager</code> contains separate methods
-		to access an existing <code>Graph</code> and for creating a new one. The
-		following would solve the issue:</p>
-		<blockcode>
-try {
-	graph = tcManager.getMGraph(mGraphName);
-} catch (NoSuchEntityException e) {
-	graph = tcManager.createMGraph(mGraphName);
-}
-		</blockcode>
-		<p>If anything is unclear or you'd like to take it even further, ask
-		about it on our mailing list <a href="http://mail-archives.apache.org/mod_mbox/incubator-clerezza-dev/">
-		http://mail-archives.apache.org/mod_mbox/incubator-clerezza-dev/</a></p>
-		<h2 id="references">8. References</h2>
-		<p id="ref1">[1] W3C: Resource Description Framework (RDF): Concepts and Abstract Syntax; 2004,
-			<a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/">http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/</a>
-		</p>
-		<p id="ref2">[2] OSGi, <a href="http://www.osgi.org/Main/HomePage">http://www.osgi.org/Main/HomePage</a></p>
-		<p id="ref3">[3] Maven, <a href="http://maven.apache.org/">http://maven.apache.org/</a></p>
-		<p id="ref4">[4] Jena Framework, <a href="http://jena.sourceforge.net/">http://jena.sourceforge.net/</a></p>
-		<p id="ref5">[5] The introduced concept of "context" is close to the
-		one of "RDF Molecules" [6] and Minimum Self contained Graphs [7]</p>
-		<p id="ref6">[6] Ding L.; Finin, T; Peng, Y; Pinheiro da
-		Silva, P; , McGuinness, D , "Tracking RDF ImmutableGraph Provenance using RDF
-		Molecules" , 2005, Proceedings of the Fourth International Semantic Web
-		Conference, November 2005</p>
-		<p id="ref7">[7] Tummarello G.,;Morbidoni C.; Puliti P; Piazza F.
-		"Signing individual fragments of an RDF ImmutableGraph" , 2005, World Wide Web
-		Conference 2005 Poster Track</p>
-		<p id="ref8">[8] Sesame, <a href="http://openrdf.com/">http://openrdf.com/</a></p>
-	</body>
-</html>
diff --git a/rdf/core/src/site/xsite/templates/skin.html b/rdf/core/src/site/xsite/templates/skin.html
deleted file mode 100644
index bb1b45d..0000000
--- a/rdf/core/src/site/xsite/templates/skin.html
+++ /dev/null
@@ -1,71 +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.
-
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>clerezza.org - ${title}</title>
-        <link rel="stylesheet" type="text/css" href="style/style.css"/>
-        ${head}
-    </head>
-    <body>
-
-        <div id="banner">
-            <a href="http://clerezza.org/">
-              <img id="logo" src="../images/clerezza.png" alt="clerezza.org"/>
-            </a><br />
-        </div>
-
-        <div id="center" class="${centerClass}">
-            <div id="content">
-                <!-- <h1 class="FirstChild">${title}</h1> -->
-                ${body}
-                <p>Copyright (c) 2008-2009 trialox.org (trialox AG, Switzerland)</p>
-                <br /><br />
-            </div>
-        </div>
-
-        <div class="SidePanel" id="left">
-            <#list sitemap.sections as section>
-                <div class="MenuGroup">
-                    <h1>${section.name}</h1>
-                    <ul>
-                        <#list section.entries as entry>
-                            <#if entry = page>
-                                <li class="currentLink">${entry.title}</li>
-                            <#else>
-                                <li><a href="${entry.href}">${entry.title}</a></li>
-                            </#if>
-                        </#list>
-                    </ul>
-                </div>
-            </#list>
-            <div class="MenuGroup">
-                  <h1>Project Site</h1>
-                  <ul>
-
-                              <li><a href="../index.html">Back to project site</a></li>
-                  </ul>
-              </div>
-        </div>
-
-  </body>
-</html>
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
deleted file mode 100644
index 36d8692..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
+++ /dev/null
@@ -1,180 +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.rdf.core.access;
-
-import java.io.FilePermission;
-import java.lang.reflect.ReflectPermission;
-import java.security.AccessControlException;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.util.Collections;
-import java.util.PropertyPermission;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.providers.WeightedA;
-import org.apache.clerezza.rdf.core.access.providers.WeightedDummy;
-import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-
-/**
- *
- * @author reto
- */
-public class SecurityTest {
-    
-    public SecurityTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        ////needed to unbind because this is injected with META-INF/services - file
-        TcManager.getInstance().unbindWeightedTcProvider(new WeightedA());
-        TcManager.getInstance().bindWeightedTcProvider(new WeightedDummy());
-        TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
-        TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Before
-    public void setUp() {
-        
-        Policy.setPolicy(new Policy() {
-
-            @Override
-            public PermissionCollection getPermissions(CodeSource codeSource) {
-                PermissionCollection result = new Permissions();
-                result.add(new TcPermission("http://example.org/permitted", "read"));
-                result.add(new TcPermission("http://example.org/ImmutableGraph/alreadyexists", "readwrite"));
-                result.add(new TcPermission("http://example.org/read/ImmutableGraph", "read"));
-                result.add(new TcPermission("http://example.org/area/allowed/*", "readwrite"));
-                result.add(new TcPermission("urn:x-localinstance:/graph-access.graph", "readwrite"));
-                //result.add(new AllPermission());
-                result.add(new RuntimePermission("*"));
-                result.add(new ReflectPermission("suppressAccessChecks"));
-                result.add(new PropertyPermission("*", "read"));
-                //(java.util.PropertyPermission line.separator read)
-                result.add(new FilePermission("/-", "read,write"));
-                return result;
-            }
-        });
-        System.setSecurityManager(new SecurityManager() {
-
-            @Override
-            public void checkPermission(Permission perm) {
-                //System.out.println("Checking "+perm);
-                super.checkPermission(perm);
-            }
-
-            @Override
-            public void checkPermission(Permission perm, Object context) {
-                //System.out.println("Checking "+perm);
-                super.checkPermission(perm, context);
-            }
-
-        });
-    }
-
-    @After
-    public void tearDown() {
-        System.setSecurityManager(null);
-    }
-
-
-    @Test(expected=NoSuchEntityException.class)
-    public void testAcessGraph() {        
-        TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted"));
-    }
-    
-    @Test(expected=AccessControlException.class)
-    public void testNoWildCard() {
-        TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted/subthing"));
-    }
-    
-    @Test(expected=NoSuchEntityException.class)
-    public void testAllowedArea() {
-        TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/area/allowed/something"));
-    }
-    
-    @Test(expected=AccessControlException.class)
-    public void testAcessForbiddenGraph() {
-        TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/forbidden"));
-    }
-
-    @Test(expected=NoSuchEntityException.class)
-    public void testCustomPermissions() {
-        IRI graphUri = new IRI("http://example.org/custom");
-        TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
-                Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
-        //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/graph-access.graph"));
-        System.out.print(ag.toString());
-        TcManager.getInstance().getMGraph(graphUri);
-    }
-
-    @Test(expected=AccessControlException.class)
-    public void testCustomPermissionsIncorrect() {
-        IRI graphUri = new IRI("http://example.org/custom");
-        TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
-                Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
-        //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/graph-access.graph"));
-        System.out.print(ag.toString());
-        TcManager.getInstance().createGraph(graphUri);
-    }
-
-    @Test
-    public void testCustomReadWritePermissions() {
-        IRI graphUri = new IRI("http://example.org/read-write-custom");
-        TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissionStrings(graphUri,
-                Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
-        //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/graph-access.graph"));
-        System.out.print(ag.toString());
-        TcManager.getInstance().createGraph(graphUri);
-    }
-    
-    @Test(expected=EntityAlreadyExistsException.class)
-    public void testCreateMGraph() {
-        TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
-    }
-    @Test(expected=AccessControlException.class)
-    public void testCreateMGraphWithoutWritePermission() {
-        TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
-    }
-    @Test(expected=ReadOnlyException.class)
-    public void testAddTripleToMGraph() {
-        Graph graph = TcManager.getInstance().getMGraph(new IRI("http://example.org/read/ImmutableGraph"));
-        Triple triple = new TripleImpl(new IRI("http://example.org/definition/isNonLiteral"), new IRI("http://example.org/definition/isTest"), new PlainLiteralImpl("test"));
-        graph.add(triple);
-    }
-}
\ No newline at end of file
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
deleted file mode 100644
index 181e36f..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
+++ /dev/null
@@ -1,302 +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.rdf.core.access;
-
-import java.lang.reflect.Field;
-import java.util.Iterator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.providers.WeightedA;
-import org.apache.clerezza.rdf.core.access.providers.WeightedA1;
-import org.apache.clerezza.rdf.core.access.providers.WeightedAHeavy;
-import org.apache.clerezza.rdf.core.access.providers.WeightedBlight;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import org.apache.clerezza.rdf.core.sparql.NoQueryEngineException;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
-import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
-import org.apache.clerezza.rdf.core.sparql.query.DescribeQuery;
-import org.apache.clerezza.rdf.core.sparql.query.Query;
-import org.apache.clerezza.rdf.core.sparql.query.SelectQuery;
-
-import static org.junit.Assert.*;
-
-/**
- * 
- * @author reto
- */
-public class TcManagerTest {
-
-	public static IRI uriRefAHeavy = new IRI("http://example.org/aHeavy");
-	public static IRI uriRefB = new IRI("http://example.org/b");;
-	public static final IRI uriRefA = new IRI("http://example.org/a");
-	public static final IRI uriRefA1 = new IRI("http://example.org/a1");
-	private TcManager graphAccess;
-	private QueryEngine queryEngine;
-	private final WeightedA weightedA = new WeightedA();
-	private final WeightedA1 weightedA1 = new WeightedA1();
-	private WeightedTcProvider weightedBlight = new WeightedBlight();
-
-	@Before
-	public void setUp() {
-		graphAccess = TcManager.getInstance();
-		graphAccess.bindWeightedTcProvider(weightedA);
-		graphAccess.bindWeightedTcProvider(weightedA1);
-		graphAccess.bindWeightedTcProvider(weightedBlight);
-
-		queryEngine = Mockito.mock(QueryEngine.class);
-	}
-
-	@After
-	public void tearDown() {
-		graphAccess = TcManager.getInstance();
-		graphAccess.unbindWeightedTcProvider(weightedA);
-		graphAccess.unbindWeightedTcProvider(weightedA1);
-		graphAccess.unbindWeightedTcProvider(weightedBlight);
-
-		queryEngine = null;
-	}
-
-	@Test
-	public void getGraphFromA() {
-		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
-		Iterator<Triple> iterator = graphA.iterator();
-		assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA), iterator.next());
-		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getGraph(uriRefA);
-		iterator = triplesA.iterator();
-		assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA), iterator.next());
-		assertFalse(iterator.hasNext());
-	}
-
-	@Test
-	public void getGraphFromB() {
-		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefB);
-		Iterator<Triple> iterator = graphA.iterator();
-		assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
-		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getGraph(uriRefB);
-		iterator = triplesA.iterator();
-		assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
-		assertFalse(iterator.hasNext());
-	}
-
-	@Test
-	public void getGraphFromAAfterUnbinding() {
-		graphAccess.unbindWeightedTcProvider(weightedA);
-		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
-		Iterator<Triple> iterator = graphA.iterator();
-		assertEquals(new TripleImpl(uriRefA1, uriRefA1, uriRefA1),
-				iterator.next());
-		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getGraph(uriRefA);
-		iterator = triplesA.iterator();
-		assertEquals(new TripleImpl(uriRefA1, uriRefA1, uriRefA1),
-				iterator.next());
-		assertFalse(iterator.hasNext());
-	}
-
-	@Test
-	public void getGraphFromAWithHeavy() {
-		final WeightedAHeavy weightedAHeavy = new WeightedAHeavy();
-		graphAccess.bindWeightedTcProvider(weightedAHeavy);
-		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
-		Iterator<Triple> iterator = graphA.iterator();
-		assertEquals(new TripleImpl(uriRefAHeavy, uriRefAHeavy, uriRefAHeavy),
-				iterator.next());
-		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getGraph(uriRefA);
-		iterator = triplesA.iterator();
-		assertEquals(new TripleImpl(uriRefAHeavy, uriRefAHeavy, uriRefAHeavy),
-				iterator.next());
-		assertFalse(iterator.hasNext());
-		graphAccess.unbindWeightedTcProvider(weightedAHeavy);
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithString() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess.executeSparqlQuery("", new SimpleMGraph());
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess.executeSparqlQuery((Query) null, new SimpleMGraph());
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithSelectQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess.executeSparqlQuery((SelectQuery) null, new SimpleMGraph());
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithAskQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess.executeSparqlQuery((AskQuery) null, new SimpleMGraph());
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithDescribeQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess
-				.executeSparqlQuery((DescribeQuery) null, new SimpleMGraph());
-	}
-
-	@Test(expected = NoQueryEngineException.class)
-	public void executeSparqlQueryNoEngineWithConstructQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(null);
-
-		// Execute
-		graphAccess.executeSparqlQuery((ConstructQuery) null,
-				new SimpleMGraph());
-	}
-
-	@Test
-	public void executeSparqlQueryWithEngineWithString() throws Exception {
-		// Prepare
-		injectQueryEngine(queryEngine);
-		Graph Graph = new SimpleMGraph();
-
-		// Execute
-		graphAccess.executeSparqlQuery("", Graph);
-
-		// Verify
-		Mockito.verify(queryEngine).execute(graphAccess, Graph, "");
-		Mockito.verify(queryEngine, Mockito.never()).execute(
-				(TcManager) Mockito.anyObject(),
-				(Graph) Mockito.anyObject(),
-				(Query) Mockito.anyObject());
-	}
-
-	@Test
-	public void executeSparqlQueryWithEngineWithSelectQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(queryEngine);
-		Graph Graph = new SimpleMGraph();
-		SelectQuery query = Mockito.mock(SelectQuery.class);
-
-		// Execute
-		graphAccess.executeSparqlQuery(query, Graph);
-
-		// Verify
-		Mockito.verify(queryEngine).execute(graphAccess, Graph,
-				(Query) query);
-		Mockito.verify(queryEngine, Mockito.never()).execute(
-				(TcManager) Mockito.anyObject(),
-				(Graph) Mockito.anyObject(), Mockito.anyString());
-	}
-
-	@Test
-	public void executeSparqlQueryWithEngineWithAskQuery() throws Exception {
-		// Prepare
-		injectQueryEngine(queryEngine);
-		Graph Graph = new SimpleMGraph();
-		AskQuery query = Mockito.mock(AskQuery.class);
-
-		Mockito.when(
-				queryEngine.execute((TcManager) Mockito.anyObject(),
-						(Graph) Mockito.anyObject(),
-						(Query) Mockito.anyObject())).thenReturn(Boolean.TRUE);
-
-		// Execute
-		graphAccess.executeSparqlQuery(query, Graph);
-
-		// Verify
-		Mockito.verify(queryEngine).execute(graphAccess, Graph,
-				(Query) query);
-		Mockito.verify(queryEngine, Mockito.never()).execute(
-				(TcManager) Mockito.anyObject(),
-				(Graph) Mockito.anyObject(), Mockito.anyString());
-	}
-
-	@Test
-	public void executeSparqlQueryWithEngineWithDescribeQuery()
-			throws Exception {
-		// Prepare
-		injectQueryEngine(queryEngine);
-		Graph Graph = new SimpleMGraph();
-		DescribeQuery query = Mockito.mock(DescribeQuery.class);
-
-		// Execute
-		graphAccess.executeSparqlQuery(query, Graph);
-
-		// Verify
-		Mockito.verify(queryEngine).execute(graphAccess, Graph,
-				(Query) query);
-		Mockito.verify(queryEngine, Mockito.never()).execute(
-				(TcManager) Mockito.anyObject(),
-				(Graph) Mockito.anyObject(), Mockito.anyString());
-	}
-
-	@Test
-	public void executeSparqlQueryWithEngineWithConstructQuery()
-			throws Exception {
-		// Prepare
-		injectQueryEngine(queryEngine);
-		Graph Graph = new SimpleMGraph();
-		ConstructQuery query = Mockito.mock(ConstructQuery.class);
-
-		// Execute
-		graphAccess.executeSparqlQuery(query, Graph);
-
-		// Verify
-		Mockito.verify(queryEngine).execute(graphAccess, Graph,
-				(Query) query);
-		Mockito.verify(queryEngine, Mockito.never()).execute(
-				(TcManager) Mockito.anyObject(),
-				(Graph) Mockito.anyObject(), Mockito.anyString());
-	}
-
-	// ------------------------------------------------------------------------
-	// Implementing QueryableTcProvider
-	// ------------------------------------------------------------------------
-
-	private void injectQueryEngine(QueryEngine engine)
-			throws NoSuchFieldException, IllegalAccessException {
-		Field queryEngineField = TcManager.class
-				.getDeclaredField("queryEngine");
-		queryEngineField.setAccessible(true);
-		queryEngineField.set(graphAccess, engine);
-	}
-}
\ No newline at end of file
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
deleted file mode 100644
index 624a80d..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
+++ /dev/null
@@ -1,103 +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.rdf.core.access.providers;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-
-/**
- *
- * @author reto
- */
-public class WeightedA implements WeightedTcProvider {
-    private Set<IRI> mGraphList = new HashSet<IRI>();
-    @Override
-    public int getWeight() {
-        return 5;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        if (name.equals(TcManagerTest.uriRefA)) {
-            Graph mResult = new SimpleMGraph();
-            mResult.add(new TripleImpl(TcManagerTest.uriRefA, 
-                    TcManagerTest.uriRefA, TcManagerTest.uriRefA));
-            mGraphList.add(name);
-            return mResult.getImmutableGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name) throws NoSuchEntityException {
-        return getImmutableGraph(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void deleteGraph(IRI name) throws NoSuchEntityException, 
-            EntityUndeletableException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> listGraphs() {
-        return Collections.singleton(TcManagerTest.uriRefA);
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        return mGraphList;
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        return listGraphs();
-    }
-}
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
deleted file mode 100644
index 9053e02..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
+++ /dev/null
@@ -1,104 +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.rdf.core.access.providers;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-
-/**
- * Same weight as WeightedA, but later in string-ordering
- *
- * @author reto
- */
-public class WeightedA1 implements WeightedTcProvider {
-    private Set<IRI> mGraphList = new HashSet<IRI>();
-    @Override
-    public int getWeight() {
-        return 5;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        if (name.equals(TcManagerTest.uriRefA)) {
-            Graph mResult = new SimpleMGraph();
-            mResult.add(new TripleImpl(TcManagerTest.uriRefA1, 
-                    TcManagerTest.uriRefA1, TcManagerTest.uriRefA1));
-            mGraphList.add(name);
-            return mResult.getImmutableGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name) throws NoSuchEntityException {
-        return getImmutableGraph(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void deleteGraph(IRI name) throws NoSuchEntityException, 
-            EntityUndeletableException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        return mGraphList;
-    }
-
-    @Override
-    public Set<IRI> listGraphs() {
-        return listMGraphs();
-    }
-}
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
deleted file mode 100644
index 7674ca6..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
+++ /dev/null
@@ -1,103 +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.rdf.core.access.providers;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
-
-/**
- *
- * @author reto
- */
-public class WeightedAHeavy implements WeightedTcProvider {
-
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        if (name.equals(TcManagerTest.uriRefA)) {
-            Graph mResult = new SimpleGraph();
-            mResult.add(new TripleImpl(TcManagerTest.uriRefAHeavy, 
-                    TcManagerTest.uriRefAHeavy, TcManagerTest.uriRefAHeavy));
-            return mResult.getImmutableGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name) throws NoSuchEntityException {
-        return getImmutableGraph(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void deleteGraph(IRI name) throws NoSuchEntityException, 
-            EntityUndeletableException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-    @Override
-    public Set<IRI> listGraphs() {
-        return Collections.singleton(TcManagerTest.uriRefA);
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        return new HashSet<IRI>();
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        return listGraphs();
-    }
-}
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
deleted file mode 100644
index 68ad4cf..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
+++ /dev/null
@@ -1,107 +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.rdf.core.access.providers;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
-
-/**
- *
- * @author reto
- */
-public class WeightedBlight implements WeightedTcProvider {
-
-    @Override
-    public int getWeight() {
-        return 2;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
-        if (name.equals(TcManagerTest.uriRefB)) {
-            Graph mResult = new SimpleMGraph();
-            mResult.add(new TripleImpl(TcManagerTest.uriRefB, TcManagerTest.uriRefB, TcManagerTest.uriRefB));
-            return mResult.getImmutableGraph();
-        }
-        if (name.equals(TcManagerTest.uriRefA)) {
-            Graph mResult = new SimpleMGraph();
-            //empty ImmutableGraph
-            return mResult.getImmutableGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getMGraph(IRI name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Graph getGraph(IRI name) throws NoSuchEntityException {
-        return getImmutableGraph(name);
-    }
-
-    @Override
-    public Graph createGraph(IRI name) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void deleteGraph(IRI name) throws NoSuchEntityException, 
-            EntityUndeletableException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> listImmutableGraphs() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public Set<IRI> listMGraphs() {
-        return new HashSet<IRI>();
-    }
-
-    @Override
-    public Set<IRI> listGraphs() {
-        return listMGraphs();
-    }
-
-}
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
deleted file mode 100644
index 5d616fb..0000000
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
+++ /dev/null
@@ -1,156 +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
... 16758 lines suppressed ...