You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/14 15:13:41 UTC

[66/87] [abbrv] clerezza git commit: CLEREZZA-966: moved ported rdf.* modules to hierarchy

CLEREZZA-966: moved ported rdf.* modules to hierarchy

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/d0f43e94
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/d0f43e94
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/d0f43e94

Branch: refs/heads/master
Commit: d0f43e94efa7f9d58dc6e153705f796e9c00e54b
Parents: c8c3494
Author: Reto Gmuer <re...@apache.org>
Authored: Tue Mar 24 10:50:51 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Tue Mar 24 10:50:51 2015 +0000

----------------------------------------------------------------------
 pom.xml                                         |   3 -
 provisioning/security/pom.xml                   |   2 +-
 rdf.file.storage/LICENSE                        | 201 ---------
 rdf.file.storage/pom.xml                        |  70 ----
 .../clerezza/rdf/file/storage/FileGraph.java    | 205 ---------
 .../rdf/file/storage/FileTcProvider.java        | 240 -----------
 ....clerezza.rdf.core.access.WeightedTcProvider |   1 -
 .../rdf/file/storage/FileGraphTest.java         | 132 ------
 .../rdf/file/storage/FileTcProviderTest.java    | 233 -----------
 .../clerezza/rdf/file/storage/FileUtil.java     |  65 ---
 .../apache/clerezza/rdf/file/storage/test-04.nt |   2 -
 .../clerezza/rdf/file/storage/test-04.rdf       |  32 --
 .../clerezza/rdf/file/storage/test-04.ttl       |   4 -
 rdf.rdfa/LICENSE                                | 201 ---------
 rdf.storage.web/LICENSE                         | 201 ---------
 rdf.storage.web/pom.xml                         | 120 ------
 .../resources/OSGI-INF/metatype/metatype.xml    |  32 --
 .../resources/OSGI-INF/serviceComponents.xml    |  39 --
 rdf.storage.web/src/main/scala/WebProxy.scala   | 271 ------------
 rdf.web/LICENSE                                 | 201 ---------
 rdf.web/pom.xml                                 |  40 --
 rdf.web/rdf.web.core/LICENSE                    | 201 ---------
 rdf.web/rdf.web.core/nbactions.xml              |  11 -
 rdf.web/rdf.web.core/pom.xml                    | 117 ------
 .../apache/clerezza/rdf/web/core/Backup.java    | 161 --------
 .../rdf/web/core/BackupMessageBodyWriter.java   | 180 --------
 .../clerezza/rdf/web/core/BackupPermission.java |  67 ---
 .../apache/clerezza/rdf/web/core/Delete.java    |  67 ---
 .../clerezza/rdf/web/core/GraphManagement.java  | 120 ------
 .../web/core/GraphManagementAppPermission.java  |  67 ---
 .../clerezza/rdf/web/core/PlatformRestorer.java |  95 -----
 .../rdf/web/core/RestorePermission.java         |  69 ----
 .../apache/clerezza/rdf/web/core/Restorer.java  | 178 --------
 .../web/core/ResultSetMessageBodyWriter.java    | 208 ----------
 .../org/apache/clerezza/rdf/web/core/Smush.java |  88 ----
 .../clerezza/rdf/web/core/SparqlEndpoint.java   | 411 -------------------
 .../core/SparqlEndpointAccessPermission.java    |  66 ---
 .../apache/clerezza/rdf/web/core/WebAccess.java | 252 ------------
 .../rdf/web/core/WebAccessPermission.java       |  66 ---
 .../rdf/web/core/utils/ResultSetsWrapper.java   |  77 ----
 .../main/resources/META-INF/documentation.nt    |  52 ---
 .../clerezza/rdf/web/core/backup-management.ssp |  37 --
 .../clerezza/rdf/web/core/graph-management.ssp  |  62 ---
 .../clerezza/rdf/web/core/sparql-endpoint.ssp   |  79 ----
 .../clerezza/rdf/web/core/upload-form.xhtml     |  45 --
 .../rdf/web/core/BackupAndRestoreTest.java      | 250 -----------
 rdf.web/rdf.web.ontologies/LICENSE              | 201 ---------
 rdf.web/rdf.web.ontologies/pom.xml              |  66 ---
 .../clerezza/rdf/web/ontologies/backup.rdf      |  73 ----
 .../rdf/web/ontologies/graphmanagement.rdf      |  70 ----
 .../rdf/web/ontologies/sparqlendpoint.rdf       |  62 ---
 rdf/file.storage/LICENSE                        | 201 +++++++++
 rdf/file.storage/pom.xml                        |  70 ++++
 .../clerezza/rdf/file/storage/FileGraph.java    | 205 +++++++++
 .../rdf/file/storage/FileTcProvider.java        | 240 +++++++++++
 ....clerezza.rdf.core.access.WeightedTcProvider |   1 +
 .../rdf/file/storage/FileGraphTest.java         | 132 ++++++
 .../rdf/file/storage/FileTcProviderTest.java    | 233 +++++++++++
 .../clerezza/rdf/file/storage/FileUtil.java     |  65 +++
 .../apache/clerezza/rdf/file/storage/test-04.nt |   2 +
 .../clerezza/rdf/file/storage/test-04.rdf       |  32 ++
 .../clerezza/rdf/file/storage/test-04.ttl       |   4 +
 rdf/pom.xml                                     |   3 +
 rdf/storage.web/LICENSE                         | 201 +++++++++
 rdf/storage.web/pom.xml                         | 120 ++++++
 .../resources/OSGI-INF/metatype/metatype.xml    |  32 ++
 .../resources/OSGI-INF/serviceComponents.xml    |  39 ++
 rdf/storage.web/src/main/scala/WebProxy.scala   | 271 ++++++++++++
 rdf/web/LICENSE                                 | 201 +++++++++
 rdf/web/pom.xml                                 |  40 ++
 rdf/web/rdf.web.core/LICENSE                    | 201 +++++++++
 rdf/web/rdf.web.core/nbactions.xml              |  11 +
 rdf/web/rdf.web.core/pom.xml                    | 117 ++++++
 .../apache/clerezza/rdf/web/core/Backup.java    | 161 ++++++++
 .../rdf/web/core/BackupMessageBodyWriter.java   | 180 ++++++++
 .../clerezza/rdf/web/core/BackupPermission.java |  67 +++
 .../apache/clerezza/rdf/web/core/Delete.java    |  67 +++
 .../clerezza/rdf/web/core/GraphManagement.java  | 120 ++++++
 .../web/core/GraphManagementAppPermission.java  |  67 +++
 .../clerezza/rdf/web/core/PlatformRestorer.java |  95 +++++
 .../rdf/web/core/RestorePermission.java         |  69 ++++
 .../apache/clerezza/rdf/web/core/Restorer.java  | 178 ++++++++
 .../web/core/ResultSetMessageBodyWriter.java    | 208 ++++++++++
 .../org/apache/clerezza/rdf/web/core/Smush.java |  88 ++++
 .../clerezza/rdf/web/core/SparqlEndpoint.java   | 411 +++++++++++++++++++
 .../core/SparqlEndpointAccessPermission.java    |  66 +++
 .../apache/clerezza/rdf/web/core/WebAccess.java | 252 ++++++++++++
 .../rdf/web/core/WebAccessPermission.java       |  66 +++
 .../rdf/web/core/utils/ResultSetsWrapper.java   |  77 ++++
 .../main/resources/META-INF/documentation.nt    |  52 +++
 .../clerezza/rdf/web/core/backup-management.ssp |  37 ++
 .../clerezza/rdf/web/core/graph-management.ssp  |  62 +++
 .../clerezza/rdf/web/core/sparql-endpoint.ssp   |  79 ++++
 .../clerezza/rdf/web/core/upload-form.xhtml     |  45 ++
 .../rdf/web/core/BackupAndRestoreTest.java      | 250 +++++++++++
 rdf/web/rdf.web.ontologies/LICENSE              | 201 +++++++++
 rdf/web/rdf.web.ontologies/pom.xml              |  66 +++
 .../clerezza/rdf/web/ontologies/backup.rdf      |  73 ++++
 .../rdf/web/ontologies/graphmanagement.rdf      |  70 ++++
 .../rdf/web/ontologies/sparqlendpoint.rdf       |  62 +++
 100 files changed, 5591 insertions(+), 5792 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c67c0f0..eb7bcc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,11 +72,9 @@
                 <module>rdf</module>
                 <module>rdf.cris</module>
                 <module>rdf.enrichment</module>
-                <module>rdf.file.storage</module>
                 <module>rdf.locking</module>
                 <module>rdf.rdfjson</module>
                 <module>rdf.stable.serializer</module>
-                <module>rdf.web</module>
                 <module>shell</module>
                 <module>shell.felixshellcommand</module>
                 <module>bundledevtool</module>
@@ -93,7 +91,6 @@
                 <module>web.resources.scripts</module>
                 <module>web.resources.yui</module>
                 <module>rdf.storage.externalizer</module>
-                <module>rdf.storage.web</module>
 
                 <module>ext.virtuoso.jdbc</module>
                 <module>rdf.virtuoso.storage</module>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/provisioning/security/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/security/pom.xml b/provisioning/security/pom.xml
index f8202c0..b5cf21f 100644
--- a/provisioning/security/pom.xml
+++ b/provisioning/security/pom.xml
@@ -1,4 +1,4 @@
-?<xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one

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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.file.storage/pom.xml b/rdf.file.storage/pom.xml
deleted file mode 100644
index 4932a7c..0000000
--- a/rdf.file.storage/pom.xml
+++ /dev/null
@@ -1,70 +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>7-SNAPSHOT</version>
-        <relativePath />
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>rdf.file.storage</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Clerezza - RDF File Storage Provider</name>
-    <description>A file base storage provider</description>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core.test</artifactId>
-            <scope>test</scope>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.jena.parser</artifactId>
-            <scope>test</scope>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.jena.serializer</artifactId>
-            <scope>test</scope>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
deleted file mode 100644
index e9143f9..0000000
--- a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
+++ /dev/null
@@ -1,205 +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.file.storage;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.Collection;
-
-import java.util.Iterator;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-
-/**
- *
- * @author mir
- */
-public class FileGraph extends SimpleGraph {
-
-    private Serializer serializer;
-    private File file;
-    private String fileType;
-
-    FileGraph(Iri uri, Parser parser,
-            Serializer serializer) {
-        this(new File(URI.create(uri.getUnicodeString())), parser, serializer);    
-    }
-
-    public FileGraph(File file, Parser parser, Serializer serializer) {
-        this.file = file;
-        String fileEnding = extractFileEnding(file.getPath());
-        fileType = getMediaTypeForFileEnding(fileEnding);
-        this.serializer = serializer;
-        try {
-            if (file.exists() && file.length() != 0) {
-                InputStream fio = new FileInputStream(file);
-                ImmutableGraph graph = parser.parse(fio, fileType);
-                addAllNoFileAccess(graph);
-            } else {
-                file.createNewFile();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    @Override
-    public boolean add(Triple e) {
-        boolean result = super.add(e);
-        writeToFile();
-        return result;
-    }
-    
-    @Override
-    public boolean addAll(Collection<? extends Triple> c) {
-        boolean modified = addAllNoFileAccess(c);
-        writeToFile();
-        return modified;
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        Iterator<Triple> e = super.filter(null, null, null);
-        while (e.hasNext()) {
-            if (o.equals(e.next())) {
-                e.remove();
-                writeToFile();
-                return true;
-            }
-        }        
-        return false;
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        boolean modified = false;
-        Iterator<Triple> e = super.filter(null, null, null);
-        while (e.hasNext()) {
-            if (c.contains(e.next())) {
-                e.remove();
-                modified = true;
-            }            
-        }
-        writeToFile();
-        return modified;
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        boolean result = super.retainAll(c);
-        writeToFile();
-        return result;
-    }
-    
-    @Override
-    public Iterator<Triple> filter(final BlankNodeOrIri subject,
-            final Iri predicate,
-            final RdfTerm object) {
-        final Iterator<Triple> baseIter = super.filter(subject, predicate, object);
-        Iterator<Triple> iterator = new Iterator<Triple>() {
-
-            @Override
-            public boolean hasNext() {
-                return baseIter.hasNext();
-            }
-
-            @Override
-            public Triple next() {
-                return baseIter.next();
-            }
-
-            @Override
-            public void remove() {
-                baseIter.remove();
-                writeToFile();
-            }
-
-        };
-        return iterator;
-    }
-
-    private boolean addAllNoFileAccess(Collection<? extends Triple> c) {
-        boolean modified = false;
-        Iterator<? extends Triple> e = c.iterator();
-        while (e.hasNext()) {
-            if (super.add(e.next())) {
-                modified = true;
-            }
-        }
-        return modified;
-    }
-
-    private String extractFileEnding(String uriString) {
-        String fileEnding = uriString.substring(uriString.lastIndexOf(".") + 1, uriString.length());
-        return fileEnding;
-    }
-
-    private String getMediaTypeForFileEnding(String fileEnding) {
-        if (fileEnding.equals("rdf")) {
-            return SupportedFormat.RDF_XML;
-        }
-        if (fileEnding.equals("nt")) {
-            return SupportedFormat.N_TRIPLE;
-        }
-        if (fileEnding.equals("ttl")) {
-            return SupportedFormat.TURTLE;
-        }
-        if (fileEnding.equals("n3")) {
-            return SupportedFormat.N3;
-        }
-        return null;
-    }
-
-    private void writeToFile() {
-        synchronized(this) {
-            OutputStream out;
-            try {
-                out = new FileOutputStream(file);
-            } catch (FileNotFoundException ex) {
-                throw new RuntimeException(ex);
-            }
-            try {
-                serializer.serialize(out, this, fileType);
-            } finally {
-                try {
-                    out.close();
-                } catch (IOException ex) {
-                    throw new RuntimeException(ex);
-                }
-            }
-        }
-    }
-
-    public void delete() {
-        file.delete();
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
deleted file mode 100644
index 0b4fd33..0000000
--- a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
+++ /dev/null
@@ -1,240 +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.file.storage;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.osgi.service.component.ComponentContext;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
-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.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-
-/**
- * The <code>FileTcProvider</code> is a <code>WeightedTcProvider</code> that
- * stores <code>Graph</code>S in the file system. <code>ImmutableGraph</code>S are not
- * supported.
- * The <code>Iri</code> of a Graph is location of the file in the file system
- * (e.g. "file:///home/user/myGraph.rdf"). The format of the rdf data in the file
- * depends on the file ending, for example ".rdf" or ".ttl".
- * <code>FileTcProvider</code> uses
- * <code>org.apache.clerezza.rdf.core.serializedform.Parser</code> and
- * <code>org.apache.clerezza.rdf.core.serializedform.Serializer</code> for
- * parsing and serialization, therefore the supported formats depend on the
- * availability of these services.
- * The default weight of the provider is 300.
- *
- * @scr.component
- * @scr.service interface="org.apache.clerezza.rdf.core.access.WeightedTcProvider"
- * @scr.property name="weight" type="Integer" value="300"
- * 
- * @author mir
- */
-public class FileTcProvider implements WeightedTcProvider {
-
-    /**
-     * @scr.reference
-     */
-    private Parser parser;
-    /**
-     * @scr.reference
-     */
-    private Serializer serializer;
-    
-    private Map<Iri, FileGraph> uriRef2GraphMap =
-            new HashMap<Iri, FileGraph>();
-
-    protected static File dataFile = new File("data");
-
-    boolean initialized = false;
-
-    private int weight = 300;
-
-
-    public FileTcProvider() {
-        this.parser = Parser.getInstance();
-        this.serializer = Serializer.getInstance();
-    }
-
-    protected void activate(final ComponentContext componentContext) {
-        weight = (Integer) componentContext.getProperties().get("weight");
-        dataFile = componentContext.getBundleContext().
-                        getDataFile("data");
-    }
-
-    @Override
-    public int getWeight() {
-        return weight;
-    }
-
-    @Override
-    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    /**
-     * Get an <code>Graph</code> by its name. If the file at the specified
-     * location already exists, then a Graph is returned even though it was not
-     * created with createGraph().
-     *
-     * @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 or the file didn't exist.
-     */
-    @Override
-    public Graph getMGraph(Iri name) throws NoSuchEntityException {
-        initialize();
-        Graph mGraph = uriRef2GraphMap.get(name);
-        if (mGraph == null) {
-            final String uriString = name.getUnicodeString();
-            if (!uriString.startsWith("file:")) {
-                throw new NoSuchEntityException(name);
-            }
-            File file = new File(URI.create(uriString));
-            if (file.exists()) {
-                return createGraph(name);
-            } else {
-                throw new NoSuchEntityException(name);
-            }            
-        }
-        return mGraph;
-    }
-
-    @Override
-    public Graph getGraph(Iri name) throws NoSuchEntityException {
-        return getMGraph(name);
-    }
-
-    @Override
-    public Set<Iri> listImmutableGraphs() {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    @Override
-    public Set<Iri> listMGraphs() {
-        initialize();
-        return uriRef2GraphMap.keySet();
-    }
-
-    @Override
-    public Set<Iri> listGraphs() {
-        return listMGraphs();
-    }
-
-
-    @Override
-    public Graph createGraph(Iri name) throws 
-            UnsupportedOperationException, EntityAlreadyExistsException {
-        initialize();
-        if (uriRef2GraphMap.containsKey(name)) {
-            throw new EntityAlreadyExistsException(name);
-        }
-        FileGraph mGraph = new FileGraph(name, parser, serializer);
-        uriRef2GraphMap.put(name, mGraph);
-        writeDataFile();
-        return mGraph;
-    }
-
-    @Override
-    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws
-            UnsupportedOperationException, EntityAlreadyExistsException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    @Override
-    public void deleteGraph(Iri name) throws 
-            UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
-        initialize();
-        FileGraph mGraph = (FileGraph)getGraph(name);
-        mGraph.delete();
-        uriRef2GraphMap.remove(name);
-        writeDataFile();
-    }
-
-    @Override
-    public Set<Iri> getNames(ImmutableGraph graph) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    private void initialize() throws RuntimeException {
-        if (!initialized) {
-            readDataFile();
-            initialized = true;
-        }
-    }
-
-    private void readDataFile() throws RuntimeException {
-        try {
-            if (dataFile.exists()) {
-                FileInputStream fstream = new FileInputStream(dataFile);
-                DataInputStream in = new DataInputStream(fstream);
-                BufferedReader br = new BufferedReader(new InputStreamReader(in));
-                String strLine;
-                while ((strLine = br.readLine()) != null) {
-                    Iri uriRef = new Iri(strLine);
-                    uriRef2GraphMap.put(uriRef, new FileGraph(uriRef, parser, serializer));
-                }
-                in.close();
-            } else {
-                dataFile.createNewFile();
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    private void writeDataFile() {
-        FileOutputStream fout = null;
-        try {
-            fout = new FileOutputStream(dataFile);
-            for (Iri uri : uriRef2GraphMap.keySet()) {
-                fout.write((uri.getUnicodeString() + "\n").getBytes());
-            }
-        } catch (FileNotFoundException ex) {
-            throw new RuntimeException(ex);
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-        finally {
-            try {
-                fout.close();
-            } catch (IOException ex) {
-                Logger.getLogger(FileTcProvider.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/main/resources/META-INF/services/org.apache.clerezza.rdf.core.access.WeightedTcProvider
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/resources/META-INF/services/org.apache.clerezza.rdf.core.access.WeightedTcProvider b/rdf.file.storage/src/main/resources/META-INF/services/org.apache.clerezza.rdf.core.access.WeightedTcProvider
deleted file mode 100644
index cd429a2..0000000
--- a/rdf.file.storage/src/main/resources/META-INF/services/org.apache.clerezza.rdf.core.access.WeightedTcProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.clerezza.rdf.file.storage.FileTcProvider
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
deleted file mode 100644
index e24edb9..0000000
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
+++ /dev/null
@@ -1,132 +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.file.storage;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Iterator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author mir
- */
-public class FileGraphTest {
-
-    private static String tempDir = System.getProperty("java.io.tmpdir");
-    private static final String FILE_PROTOCOL = "file://";
-
-    protected static final String NT_FILE_NAME = "test-04.nt";
-    protected static final String RDF_FILE_NAME = "test-04.rdf";
-    protected static final String TURTLE_FILE_NAME = "test-04.ttl";
-
-    private static final Iri uriA = new Iri("http://example.com/a");
-    private static final Iri uriB = new Iri("http://example.com/b");
-    private static final Iri uriC = new Iri("http://example.com/c");
-
-
-    @BeforeClass
-    public static void setup() throws Exception {
-        createTempFileFromRdfTerm(NT_FILE_NAME);
-        createTempFileFromRdfTerm(RDF_FILE_NAME);
-        createTempFileFromRdfTerm(TURTLE_FILE_NAME);
-    }
-
-    @AfterClass
-    public static void cleanUp() throws Exception {
-        deleteTempFile(NT_FILE_NAME);
-        deleteTempFile(RDF_FILE_NAME);
-        deleteTempFile(TURTLE_FILE_NAME);
-    }
-
-    private static void createTempFileFromRdfTerm(String resourceName) 
-            throws FileNotFoundException, IOException {
-        InputStream in = FileTcProviderTest.class.getResourceAsStream(resourceName);
-        File file = new File(URI.create(getTempFileUri(resourceName)));
-        FileOutputStream fout = new FileOutputStream(file);
-        int inByte;
-        while ((inByte = in.read()) != -1) {
-            fout.write(inByte);
-        }
-    }
-    
-    protected static String getTempFileUri(String name) {
-                String prefix = tempDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
-        return prefix + tempDir.replace(File.separatorChar, '/') + "/" + name;
-    }
-
-    private static void deleteTempFile(String name)
-            throws FileNotFoundException, IOException {
-        File file = new File(tempDir + "/" + name);
-        file.delete();
-    }
-    
-    @Test
-    public void testReadingFromFile() {
-        FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(RDF_FILE_NAME)),
-                Parser.getInstance(), Serializer.getInstance());
-        assertEquals(2, mGraph.size());
-
-        mGraph = new FileGraph(new Iri(getTempFileUri(TURTLE_FILE_NAME)),
-                Parser.getInstance(), Serializer.getInstance());
-        assertEquals(2, mGraph.size());
-
-        mGraph = new FileGraph(new Iri(getTempFileUri(NT_FILE_NAME)),
-                Parser.getInstance(), Serializer.getInstance());
-        assertEquals(2, mGraph.size());
-    }
-    
-    @Test
-    public void testFilter() throws IOException {
-        String fileName = "filter.rdf";
-        FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
-                Parser.getInstance(), Serializer.getInstance());
-
-        mGraph.add(new TripleImpl(uriA, uriB, uriC));
-        mGraph.add(new TripleImpl(uriC, uriB, uriA));
-
-        mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
-                Parser.getInstance(), Serializer.getInstance());
-        
-        
-        assertEquals(2, mGraph.size());
-        Iterator<Triple> iterator = mGraph.filter(null, null, null);
-
-        iterator.next();
-        iterator.remove();
-        assertEquals(1, mGraph.size());
-
-        mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
-                Parser.getInstance(), Serializer.getInstance());
-        assertEquals(1, mGraph.size());
-        deleteTempFile(fileName);
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
deleted file mode 100644
index aeff78d..0000000
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
+++ /dev/null
@@ -1,233 +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.file.storage;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import java.util.Set;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-
-import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.clerezza.rdf.core.test.TcProviderTest;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author mir
- */
-public class FileTcProviderTest extends TcProviderTest {
-    private static final String FILE_PROTOCOL = "file://";
-    private static String tempDir = System.getProperty("java.io.tmpdir");
-    private static String testDir = tempDir + "/FileTcProviderTest";
-    
-    
-    @Override
-    protected Iri generateUri(String name) {
-            String prefix = testDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
-        String path =  prefix + testDir.replace('\\', '/') + "/";
-        return new Iri(path + name + ".rdf");
-    }
-
-    @Before
-    public void setupDirectory() {
-        FileUtil.setUpEmptyDirectory(testDir);
-    }
-
-    @After
-    public void deleteDataFile() {
-        FileUtil.delete(FileTcProvider.dataFile);
-    }
-    
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testCreateImmutableGraph() {
-        super.testCreateImmutableGraph();
-    }
-    
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testCreateImmutableGraphExtended() throws Exception {
-        super.testCreateImmutableGraphExtended();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testGetImmutableGraph() {
-        super.testGetImmutableGraph();
-    }
-
-    
-    @Test
-    @Override
-    public void testGetTriples() {
-        TcProvider fileTcProvider = getInstance();
-        // add Graphs
-        Graph mGraph = new SimpleGraph();
-        // add Graphs
-        mGraph = fileTcProvider.createGraph(uriRefA1);
-        mGraph.add(new TripleImpl(uriRefA1, uriRefA1, uriRefA1));
-        mGraph = fileTcProvider.createGraph(uriRefB1);
-        mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
-
-        // get a Graph
-        Graph tripleCollection2 = fileTcProvider.getGraph(uriRefB1);
-
-        Iterator<Triple> iterator = tripleCollection2.iterator();
-        assertEquals(new TripleImpl(uriRefB1, uriRefB1, uriRefB1), iterator.next());
-        assertFalse(iterator.hasNext());
-    }
-
-    @Test
-    @Override
-    public void testDeleteEntity() {
-        TcProvider fileTcProvider = getInstance();
-        Graph mGraph = fileTcProvider.createGraph(uriRefA);
-        mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
-        fileTcProvider.deleteGraph(uriRefA);
-        try {
-            fileTcProvider.getGraph(uriRefA);
-            assertTrue(false);
-        } catch (NoSuchEntityException e) {
-            assertTrue(true);
-        }
-        fileTcProvider = getInstance();
-        try {
-            fileTcProvider.getGraph(uriRefA);
-            assertTrue(false);
-        } catch (NoSuchEntityException e) {
-            assertTrue(true);
-        }
-    }
-
-    @Override
-    protected TcProvider getInstance() {
-        FileTcProvider fileTcProvider = new FileTcProvider();
-        return fileTcProvider;
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void testGetNames() {
-        //super.testGetNames();
-        getInstance().getNames(new SimpleGraph().getImmutableGraph());
-    }
-
-    
-    /*@Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testCreateGraphExtended() throws Exception {
-        super.testCreateGraphExtended();
-    }*/
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testCreateGraphNoDuplicateNames() throws Exception {
-        super.testCreateGraphNoDuplicateNames();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testCreateGraphWithInitialCollection() throws Exception {
-        super.testCreateGraphWithInitialCollection();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testGraphIsNotMutable() throws Exception {
-        super.testGraphIsNotMutable();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testGraphDeletion() throws Exception {
-        super.testGraphDeletion();
-    }
-
-    @Test(expected=UnsupportedOperationException.class)
-    @Override
-    public void testGetTriplesGraph() throws Exception {
-        super.testGetTriples();
-    }
-
-    @Test
-    public void testDataFile() {
-        TcProvider provider = getInstance();
-        provider.createGraph(uriRefA);
-        File dataFile = new File("data");
-        assertTrue(dataFile.exists());
-
-        Set<String> expected = new HashSet<String>();
-        expected.add(uriRefA.getUnicodeString());
-        assertTrue(expected.equals(getLinesFromFile(dataFile)));
-
-        provider.createGraph(uriRefB);
-        expected.add(uriRefB.getUnicodeString());
-        assertTrue(expected.equals(getLinesFromFile(dataFile)));
-    
-        provider.deleteGraph(uriRefA);
-        expected.remove(uriRefA.getUnicodeString());
-        assertTrue(expected.equals(getLinesFromFile(dataFile)));
-        
-        provider.deleteGraph(uriRefB);
-        expected.remove(uriRefB.getUnicodeString());
-        assertTrue(expected.equals(getLinesFromFile(dataFile)));
-    }
-
-    @Test
-    public void testAutoGraphCreationFromExistingFile() throws Exception{
-        FileGraphTest.setup();
-        TcProvider provider = getInstance();
-        Graph mGraph = provider.getGraph(new Iri(
-                FileGraphTest.getTempFileUri(FileGraphTest.RDF_FILE_NAME)));
-        assertEquals(2 ,mGraph.size());
-        FileGraphTest.cleanUp();
-    }
-    
-    private Set<String> getLinesFromFile(File file) throws RuntimeException {
-        try {
-            FileInputStream fstream = new FileInputStream(file);
-            DataInputStream in = new DataInputStream(fstream);
-            BufferedReader br = new BufferedReader(new InputStreamReader(in));
-            String strLine;
-            Set<String> lines = new HashSet<String>();
-            while ((strLine = br.readLine()) != null) {
-                lines.add(strLine);
-            }
-            in.close();
-            return lines;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
deleted file mode 100644
index e163f8a..0000000
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
+++ /dev/null
@@ -1,65 +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.file.storage;
-
-import java.io.File;
-
-/**
- *
- * @author mir
- */
-public class FileUtil {
-
-     /**
-     * Sets up a new <code>SesameGraph</code>.
-     * @param testName  Name of the test to support.
-     * @throws RepositoryException  If it failed to activate the graph.
-     */
-    public static void setUpEmptyDirectory(String directory) {
-        final File dataDir= new File(directory);
-        dataDir.mkdirs();
-        cleanDirectory(dataDir);
-    }
-
-
-    /**
-     * Cleans the content of the specified directory recursively.
-     * @param dir  Abstract path denoting the directory to clean.
-     */
-    public static void cleanDirectory(File dir) {
-        File[] files= dir.listFiles();
-        if (files!=null && files.length>0) {
-            for (File file: files) {
-                delete(file);
-            }
-        }
-    }
-
-    /**
-     * Deletes the specified file or directory.
-     * @param file  Abstract path denoting the file or directory to clean.
-     */
-    public static void delete(File file) {
-        if (file.isDirectory()) {
-            cleanDirectory(file);
-        }
-        file.delete();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.nt
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.nt b/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.nt
deleted file mode 100644
index 414e4b8..0000000
--- a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-_:genid1 <http://example.org/base#a> <http://example.org/base#b> .
-<http://example.org/base#c> <http://example.org/base#d> _:genid2 .

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.rdf
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.rdf b/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.rdf
deleted file mode 100644
index d046a1b..0000000
--- a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.rdf
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.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.
-
--->
-
-<rdf:RDF
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:j.0="http://example.org/base#" > 
-  <rdf:Description rdf:about="http://example.org/base#c">
-    <j.0:d rdf:nodeID="A0"/>
-  </rdf:Description>
-  <rdf:Description rdf:nodeID="A1">
-    <j.0:a rdf:resource="http://example.org/base#b"/>
-  </rdf:Description>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.ttl
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.ttl b/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.ttl
deleted file mode 100644
index c518147..0000000
--- a/rdf.file.storage/src/test/resources/org/apache/clerezza/rdf/file/storage/test-04.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test empty [] operator; not allowed as predicate
-@prefix : <http://example.org/base#> .
-[] :a :b .
-:c :d [] .

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

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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0f43e94/rdf.storage.web/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.storage.web/pom.xml b/rdf.storage.web/pom.xml
deleted file mode 100644
index 4315683..0000000
--- a/rdf.storage.web/pom.xml
+++ /dev/null
@@ -1,120 +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>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>7-SNAPSHOT</version>
-        <relativePath />
-    </parent>
-    <artifactId>rdf.storage.web</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - RDF Storage Web (Caching Web Storage Provider)</name>
-    <description>A (currently read-only) storage provider retrieving graphs from the web. It
-        implements a caching proxy, relying on another provider for storing triples.</description>
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.scala.utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>osgi.services</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.clerezza.ext</groupId>
-          <artifactId>slf4j-scala-api</artifactId>
-            <version>1.6.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <sourceDirectory>src/main/scala</sourceDirectory>
-        <testSourceDirectory>src/test/scala</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
-                        <Export-Package>${project.groupId}.${project.artifactId}</Export-Package>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                    <downloadJavadocs>true</downloadJavadocs>
-                    <buildcommands>
-                        <buildcommand>ch.epfl.lamp.sdt.core.scalabuilder</buildcommand>
-                    </buildcommands>
-                    <additionalProjectnatures>
-                        <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
-                    </additionalProjectnatures>
-                    <classpathContainers>
-                        <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                        <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file