clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [10/51] [partial] clerezza git commit: CLEREZZA-1012: reduced clerezza to core components, the rest stays in legacy-branch
Date Mon, 03 Oct 2016 15:49:36 GMT
http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
----------------------------------------------------------------------
diff --git a/platform/enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java b/platform/enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
deleted file mode 100644
index 56bf615..0000000
--- a/platform/enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.rdf.enrichment;
-
-import java.security.Permission;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.clerezza.platform.Constants;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
-import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.clerezza.rdf.enrichment.Enricher;
-import org.apache.clerezza.rdf.enrichment.EnrichmentTriples;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.References;
-import org.apache.felix.scr.annotations.Service;
-import org.osgi.service.component.ComponentContext;
-
-/**
- * Provides a read-only MGraph with the name urn:x-localinstance:/enrichment.graph
- * containing the enrichments provided by all available services of type 
- * Enricher on the content graph.
- *
- * For performance reasons EnrichmentTcProvider gets the content-graph from
- * TcManager and doesn't do access control check on every request, to prevent
- * deductions about the content of the content graph by unauthorized users
- * the required permissions on the enrichment graph are set to those on the
- * content graph.
- *
- *
- * @author reto
- */
-@Component
-@Service(WeightedTcProvider.class)
-@References(
-    {
-        @Reference(referenceInterface=Enricher.class, name="enricher",
-                cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
-                policy=ReferencePolicy.DYNAMIC)
-    }
-)
-public class EnrichmentTcProvider implements WeightedTcProvider {
-
-    public static final UriRef ENRICHMENT_GRAPH_URI = new UriRef("urn:x-localinstance:/enrichment.graph");
-    
-    private LockableMGraph contentGraph;
-    private final Collection<Enricher> enrichers = Collections.synchronizedCollection(new HashSet<Enricher>());
-
-    @Reference
-    private ContentGraphProvider cgProvider;
-
-    @Reference
-    private TcManager tcManager;
-
-    @Override
-    public Graph getGraph(UriRef name) throws NoSuchEntityException {
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public MGraph getMGraph(UriRef name) throws NoSuchEntityException {
-        if (ENRICHMENT_GRAPH_URI.equals(name)) {
-            return getEnrichmentGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public TripleCollection getTriples(UriRef name) throws NoSuchEntityException {
-        if (ENRICHMENT_GRAPH_URI.equals(name)) {
-            return getEnrichmentGraph();
-        }
-        throw new NoSuchEntityException(name);
-    }
-
-    @Override
-    public Set<UriRef> listGraphs() {
-        return new HashSet<UriRef>(0);
-    }
-
-    @Override
-    public Set<UriRef> listMGraphs() {
-        return Collections.singleton(ENRICHMENT_GRAPH_URI);
-    }
-
-    @Override
-    public Set<UriRef> listTripleCollections() {
-        return Collections.singleton(ENRICHMENT_GRAPH_URI);
-    }
-
-    @Override
-    public MGraph createMGraph(UriRef name) throws UnsupportedOperationException, EntityAlreadyExistsException {
-        throw new UnsupportedOperationException("creating entities not supported");
-    }
-
-    @Override
-    public Graph createGraph(UriRef name, TripleCollection triples) throws UnsupportedOperationException, EntityAlreadyExistsException {
-        throw new UnsupportedOperationException("creating entities not supported");
-    }
-
-    @Override
-    public void deleteTripleCollection(UriRef name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
-        throw new UnsupportedOperationException("deleting entities not supported");
-    }
-
-    @Override
-    public Set<UriRef> getNames(Graph graph) {
-        return new HashSet<UriRef>(0);
-    }
-
-    @Override
-    public int getWeight() {
-        return 0;
-    }
-
-    private MGraph getEnrichmentGraph() {
-        return new EnrichmentTriples(contentGraph, enrichers);
-    }
-
-    /**
-     * avtivates the component and adds the enrichment-graph to the virtual
-     * content graph.
-     * 
-     * gets the base content-graph from tcManager and sets the permission
-     * required to access the enrichment-graph accordingly
-     */
-    protected void activate(ComponentContext context) {
-        contentGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
-        Collection<Permission> requiredReadPermissions =
-                tcManager.getTcAccessController().getRequiredReadPermissions(Constants.CONTENT_GRAPH_URI);
-        if (requiredReadPermissions.isEmpty()) {
-            tcManager.getTcAccessController().setRequiredReadPermissionStrings(
-                    ENRICHMENT_GRAPH_URI, Collections.singleton(
-                        new TcPermission(Constants.CONTENT_GRAPH_URI_STRING, TcPermission.READ).toString()
-                    ));
-        } else {
-            tcManager.getTcAccessController().setRequiredReadPermissions(
-                    ENRICHMENT_GRAPH_URI, requiredReadPermissions);
-        }
-        cgProvider.addTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
-    }
-
-    /**
-     * deactivates the compononent removing the enrichment-graph from the
-     * virtual content graph
-     */
-    protected void deactivate(ComponentContext context) {
-        cgProvider.removeTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
-        contentGraph = null;
-    }
-
-
-
-    protected void bindEnricher(Enricher enricher) {
-        enrichers.add(enricher);
-    }
-
-    protected void unbindEnricher(Enricher enricher) {
-        enrichers.remove(enricher);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/globalmenu.api/LICENSE
----------------------------------------------------------------------
diff --git a/platform/globalmenu.api/LICENSE b/platform/globalmenu.api/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform/globalmenu.api/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/14575ea3/platform/globalmenu.api/pom.xml
----------------------------------------------------------------------
diff --git a/platform/globalmenu.api/pom.xml b/platform/globalmenu.api/pom.xml
deleted file mode 100644
index 34ea2e1..0000000
--- a/platform/globalmenu.api/pom.xml
+++ /dev/null
@@ -1,49 +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>8-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.globalmenu.api</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.0.1-SNAPSHOT</version>
-    <name>Clerezza - Platform GlobalMenu API</name>
-    <description>
-        The API for providing entries to the global clerezza menu
-    </description>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
----------------------------------------------------------------------
diff --git a/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java b/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
deleted file mode 100644
index e552bad..0000000
--- a/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.globalmenu;
-
-/**
- * This class keeps information about an item for the global menu.
- *
- * @author mir
- */
-public class GlobalMenuItem implements Comparable<GlobalMenuItem> {
-
-    private String path;
-    private String label;
-    private String description;
-    private String identifier;
-    private int priority;
-    private String groupIdentifier;
-
-    /**
-     * Creates a new <code>GlobalMenuItem</code>.
-     *
-     * @param relativeUri of the resource to be shown in the menu.
-     * @param identifier The identifier of the menu item.
-     * @param label Specifies the label of the menu entry.
-     * @param priority the priority, higher numbers appear first in the menu
-     * @param groupIdentifier Specifies the the identifier of the group of which
-     *        the menu item is part.
-     */
-    public GlobalMenuItem(String path, String identifier, String label,
-            int priority, String groupIdentifier) {
-        if (label == null) {
-            throw new IllegalArgumentException("label may not be null");
-        }
-        this.path = path;
-        this.label = label;
-        this.identifier = identifier;
-        this.priority = priority;
-        this.groupIdentifier = groupIdentifier;
-    }
-
-    /**
-     * Creates a new <code>GlobalMenuItem</code>.
-     *
-     * @param relativeUri of the resource to be shown in the menu.
-     * @param identifier The identifier of the menu item.
-     * @param label Specifies the label of the menu entry.
-     * @param description The description of the menu item.
-     * @param priority the priority, higher numbers appear first in the menu
-     * @param groupIdentifier Specifies the the identifier of the group of which
-     *        the menu item is part.
-     */
-    public GlobalMenuItem(String path, String identifier, String label, String description,
-            int priority, String groupIdentifier) {
-        if (label == null) {
-            throw new IllegalArgumentException("label may not be null");
-        }
-        this.path = path;
-        this.label = label;
-        this.description = description;
-        this.identifier = identifier;
-        this.priority = priority;
-        this.groupIdentifier = groupIdentifier;
-    }
-
-    /**
-     * Returns the path of the resource to be shown in the menu. The
-     * path is additional to the bundle prefix and if existing to the
-     * <code>javax.ws.rs.Path</code> annotation of the
-     * <code>GlobalMenuItemsProvider</code> that returned this
-     * <code>GlobalMenuItem</code>.
-     * @return the path
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Returns the label of the menu entry
-     * @return the label
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Returns the description of the menu entry.
-     * @return the groupIdentifier
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Return the identifier of the menu entry.
-     *
-     * @return
-     */
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    /**
-     * Returns the the priority within the group, which is used for sorting
-     * the menu Items, higher numbers appear first in the menu
-     * @return the priority
-     */
-    public int getPriority() {
-        return priority;
-    }
-
-    /**
-     * Returns the the identifier of the group of which this menu item is part,
-     * null if this is a top-level item.
-     * @return the groupIdentifier
-     */
-    public String getGroupIdentifier() {
-        return groupIdentifier;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final GlobalMenuItem other = (GlobalMenuItem) obj;
-        if ((this.path == null) ? (other.path != null) : !this.path.equals(other.path)) {
-            return false;
-        }
-        if (!this.label.equals(other.label)) {
-            return false;
-        }
-        if ((this.description == null) ? (other.description != null) : !this.description.equals(other.description)) {
-            return false;
-        }
-        if (this.priority != other.priority) {
-            return false;
-        }
-        if ((this.groupIdentifier == null) ? (other.groupIdentifier != null) : !this.groupIdentifier.equals(other.groupIdentifier)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 53 * hash + (this.path != null ? this.path.hashCode() : 0);
-        hash = 53 * hash + this.label.hashCode();
-        hash = 53 * hash + (this.description != null ? this.description.hashCode() : 0);
-        hash = 53 * hash + this.priority;
-        hash = 53 * hash + (this.groupIdentifier != null ? this.groupIdentifier.hashCode() : 0);
-        return hash;
-    }
-
-    
-
-    @Override
-    public int compareTo(GlobalMenuItem o) {
-        if (getPriority() == o.getPriority()) {
-            if (this.equals(o)) {
-                return 0;
-            } else {
-                return getLabel().compareTo(o.getLabel());
-            }
-        }
-        return o.getPriority() - getPriority();
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
----------------------------------------------------------------------
diff --git a/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java b/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
deleted file mode 100644
index f4ff7ce..0000000
--- a/platform/globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.globalmenu;
-
-import java.util.Set;
-
-/**
- * An implementation of this interface provides a set of
- * <code>GlobalMenuItem</code>S. A <code>GlobalMenuItem</code> represents an
- * item in the global menu of the Clerezza Platform.
- *
- * @author mir
- */
-public interface  GlobalMenuItemsProvider {
-
-    /**
-     * Returns a <code>Set</code> of <code>GlobalMenuItem</code>S. If there is
-     * no <code>GlobalMenuItem</code> available (e.g. the current user has not
-     * the needed permissions) then the returned set is empty.
-     * @return
-     */
-    public Set<GlobalMenuItem> getMenuItems();
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphnodeprovider/LICENSE
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/LICENSE b/platform/graphnodeprovider/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform/graphnodeprovider/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/14575ea3/platform/graphnodeprovider/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/pom.xml b/platform/graphnodeprovider/pom.xml
deleted file mode 100644
index e285af5..0000000
--- a/platform/graphnodeprovider/pom.xml
+++ /dev/null
@@ -1,145 +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>8-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-    <artifactId>platform.graphnodeprovider</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform GraphNodeProvider</name>
-    <description>A service that provided GraphNodes for URIs with as underlying BaseGraph sources considered
-    authoritative for that resource.</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>platform</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.config</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphprovider.content</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.users.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.usermanager</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.scala.utils</artifactId>
-            <version>1.0.0</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>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-scr-plugin</artifactId>
-            </plugin>
-            <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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphnodeprovider/src/main/resources/OSGI-INF/serviceComponents.xml
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/src/main/resources/OSGI-INF/serviceComponents.xml b/platform/graphnodeprovider/src/main/resources/OSGI-INF/serviceComponents.xml
deleted file mode 100644
index 7494186..0000000
--- a/platform/graphnodeprovider/src/main/resources/OSGI-INF/serviceComponents.xml
+++ /dev/null
@@ -1,42 +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.
-
--->
-
-<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-
-    <scr:component enabled="true" name="org.apache.clerezza.platform.graphnodeprovider.PlatformGraphNodeProvider">
-        <implementation class="org.apache.clerezza.platform.graphnodeprovider.PlatformGraphNodeProvider"/>
-        <service servicefactory="false">
-            <provide interface="org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider"/>
-        </service>
-        <reference name="tcManager" interface="org.apache.clerezza.rdf.core.access.TcManager"
-        cardinality="1..1" policy="static" bind="bindTcManager" unbind="unbindTcManager"/>
-        <reference name="platformConfig" interface="org.apache.clerezza.platform.config.PlatformConfig"
-        cardinality="1..1" policy="static" bind="bindPlatformConfig" unbind="unbindPlatformConfig"/>
-        <reference name="cggProvider" interface="org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider"
-        cardinality="1..1" policy="static" bind="bindCgProvider" unbind="unbindCgProvider"/>
-        <reference name="webIdGraphsService" interface="org.apache.clerezza.platform.users.WebIdGraphsService"
-        cardinality="1..1" policy="static" bind="bindWebIdGraphsService" unbind="unbindWebIdGraphsService"/>
-        <reference name="userManager" interface="org.apache.clerezza.platform.usermanager.UserManager"
-        cardinality="1..1" policy="static" bind="bindUserManager" unbind="unbindUserManager"/>
-    </scr:component>
-
-</components>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
deleted file mode 100644
index 54e0d78..0000000
--- a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.apache.clerezza.platform.graphnodeprovider
-
-/*
- * 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.net.{HttpURLConnection, URL}
-import org.apache.clerezza.commons.rdf._
-import org.slf4j.scala._
-import org.apache.clerezza.rdf.core.access._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.platform.config.PlatformConfig
-import org.apache.clerezza.platform.Constants
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
-import org.apache.clerezza.platform.users.WebIdGraphsService
-import java.util.concurrent.locks.Lock
-import org.apache.clerezza.platform.usermanager.UserManager
-import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.utils.UnionGraph
-import org.apache.clerezza.rdf.utils.UriMutatingGraph
-import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider
-
-/**
- * A service that returns a GraphNode for a specified named resource, the returned GraphNode has
- * as BaseGraph the ContentGraph provided by the ContentGraphProvider and the for remote uris the
- * Graphs they dereference to and for local URIs with a path-section starting with /user/{username}/
- * the local-public-graph of that user.
- */
-class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
-
-  /**
-   * Get a GraphNode for the specified resource, see class comments for details.
-   */
-  def get(uriRef: IRI): GraphNode = {
-    val uriString = uriRef.getUnicodeString
-    val isLocal: Boolean = {
-      import scala.collection.JavaConversions._
-      //we assume all non http* uris to be local
-      !uriString.toLowerCase.startsWith("http") || platformConfig.getBaseUris.exists(baseUri => uriString.startsWith(baseUri.getUnicodeString))
-    }
-    get(uriRef, isLocal)
-  }
-
-  /**
-   * Get a GraphNode for the specified resource, The resource is assumed to be local, i.e. the method behaves like
-   * get(IRI) for a Uri with an authority section contained in the Set retuned by
-   * <code>org.apache.clerezza.platform.config.PlatformConfig#getBaseUris()</code>
-   */
-  def getLocal(uriRef: IRI): GraphNode = {
-    get(uriRef, true)
-  }
-    
-    
-    /**
-     *return true iff getLocal(uriRef).getNodeContext.size > 0
-     */
-    def existsLocal(uriRef: IRI): Boolean = {
-        val cgGraph = cgProvider.getContentGraph
-        lazy val localInstanceUri = {
-            val uri = new java.net.URI(uriRef.getUnicodeString)
-      new IRI(Constants.URN_LOCAL_INSTANCE + uri.getPath)
-    }
-        //TODO handle /user/
-        existsInGraph(uriRef,cgGraph) || existsInGraph(localInstanceUri, cgGraph)
-    }
-  
-    private[this] def existsInGraph(nodeUri: IRI, tc: Graph): Boolean = {
-        var readLock: Lock = tc.getLock.readLock
-        readLock.lock
-        try {
-            return tc.filter(nodeUri, null, null).hasNext || tc.filter(null, null, nodeUri).hasNext
-        }
-        finally {
-            readLock.unlock
-        }
-    }
-    
-  
-  private def get(uriRef: IRI, isLocal: Boolean): GraphNode = {
-    val uriString = uriRef.getUnicodeString
-    
-
-    val uriPath = {
-      val uri = new java.net.URI(uriString)
-      uri.getPath
-    }
-
-    lazy val uriPrefix = {
-      val uri = new java.net.URI(uriString)
-      uri.getScheme+"://"+uri.getAuthority
-    }
-
-    val anyHostUri = new IRI(Constants.URN_LOCAL_INSTANCE + uriPath)
-
-    var mGraphs: List[Graph] = Nil
-
-    def addToUnion(mGraph: Graph) {
-      //adding uncondinionately if (existsInGraph(uriRef, mGraph)) {
-      mGraphs ::= mGraph
-      //}
-      if (isLocal) {
-        if (existsInGraph(anyHostUri, mGraph)) {
-          mGraphs ::= new UriMutatingGraph(mGraph, Constants.URN_LOCAL_INSTANCE, uriPrefix)
-        }
-      }
-    }
-
-    val cgGraph = cgProvider.getContentGraph
-
-    addToUnion(cgGraph)
-
-    if (isLocal && (uriPath != null) && uriPath.startsWith("/user/")) {
-      val nextSlash = uriPath.indexOf('/',6)    
-      if (nextSlash != -1) {
-        val userName = uriPath.substring(6, nextSlash)
-        val webIdOption = AccessController.doPrivileged(new PrivilegedAction[Option[IRI]]() {
-            def run(): Option[IRI] = {
-              val userNode: GraphNode = userManager.getUserInSystemGraph(userName)
-              if (userNode != null) {
-                userNode.getNode match {
-                  case u: IRI => Some(u)
-                  case _ => None
-                }
-              } else {
-                None
-              }
-            }
-          }
-        )
-        webIdOption match {
-          case Some(u) => {
-            val webIdInfo = webIdGraphsService.getWebIdInfo(u)
-            addToUnion(webIdInfo.localPublicUserData)
-          }
-          case None => ;
-        }
-      }
-    }
-
-    if (!isLocal) {
-      /**
-       * As the resource might identify something other than a document we use this to find the redirect location
-       */
-      lazy val redirectLocationString = {
-        val acceptHeader = "application/rdf+xml,*/*;q.1"
-        val url = new URL(uriString)
-        val connection = url.openConnection()
-        connection match {
-          case hc : HttpURLConnection => {
-              hc.setRequestMethod("HEAD");
-              hc.setInstanceFollowRedirects(false)
-              hc.addRequestProperty("Accept",  acceptHeader)
-              hc.getResponseCode match {
-                case HttpURLConnection.HTTP_SEE_OTHER  => {
-                    val location = hc.getHeaderField("Location")
-                    if (location == null) {
-                      throw new RuntimeException("No Location Headers in 303 response")
-                    }
-                    location
-                  }
-                case _ => uriString
-              }
-            }
-          case _ => uriString
-        }
-      }
-
-      //TODO add method to WebProxy to get the graph location location
-      val graphUriString = {
-        val hashPos = uriString.indexOf('#')
-        if (hashPos != -1) {
-          uriString.substring(0, hashPos)
-        } else {
-          redirectLocationString
-        }
-      }
-      
-      addToUnion(tcManager.getGraph(new IRI(graphUriString)))
-    }
-
-    val unionGraph = new UnionGraph(mGraphs:_*);
-    new GraphNode(uriRef, unionGraph)
-  }
-
-  private var tcManager: TcManager = null;
-
-  protected def bindTcManager(tcManager: TcManager) = {
-    this.tcManager = tcManager
-  }
-
-  protected def unbindTcManager(tcManager: TcManager) = {
-    this.tcManager = null
-  }
-
-  private var platformConfig: PlatformConfig = null;
-
-  protected def bindPlatformConfig(c: PlatformConfig) = {
-    this.platformConfig = c
-  }
-
-  protected def unbindPlatformConfig(c: PlatformConfig) = {
-    this.platformConfig = null
-  }
-
-  private var cgProvider: ContentGraphProvider = null
-  protected def bindCgProvider(p: ContentGraphProvider) {
-    this.cgProvider = p
-  }
-  protected def unbindCgProvider(p: ContentGraphProvider) {
-    this.cgProvider = null
-  }
-
-  private var webIdGraphsService: WebIdGraphsService = null
-  protected def bindWebIdGraphsService(webIdGraphsService: WebIdGraphsService): Unit = {
-    this.webIdGraphsService = webIdGraphsService
-  }
-
-  protected def unbindWebIdGraphsService(webIdGraphsService: WebIdGraphsService): Unit = {
-    this.webIdGraphsService = null
-  }
-
-  private var userManager: UserManager = null
-
-  protected def bindUserManager(userManager: UserManager): Unit = {
-    this.userManager = userManager
-  }
-
-  protected def unbindUserManager(userManager: UserManager): Unit = {
-    this.userManager = null
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphprovider.content/LICENSE
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/LICENSE b/platform/graphprovider.content/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/platform/graphprovider.content/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/14575ea3/platform/graphprovider.content/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/pom.xml b/platform/graphprovider.content/pom.xml
deleted file mode 100644
index fb6be54..0000000
--- a/platform/graphprovider.content/pom.xml
+++ /dev/null
@@ -1,72 +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>platform.graphprovider.content</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform Graph Provider Content</name>
-    <description>A service that provides the content-graph</description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>permissiondescriptions</artifactId>
-            <version>0.2</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
deleted file mode 100644
index 9891444..0000000
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.platform.graphprovider.content;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.clerezza.platform.Constants;
-
-import org.osgi.service.component.ComponentContext;
-import org.apache.clerezza.commons.rdf.Graph;
-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.rdf.utils.UnionGraph;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-
-/**
- * A service providing a method to retrieve a <code>UnionGraph</code> containing
- * the ContentGraph and additional graphs.
- * 
- * Over the Configuration Admin Service additional graphs can be added
- * permanently. With the methods <code>addTemporaryAdditionGraph</code> and
- * <code>removeTemporaryAdditionGraph</code> graphs can be added temporarily.
- * Temporarily means that after restarting the org.apache.clerezza.platform.graphprovider.content
- * bundle, these graphs will no longer be returned in the <code>UnionGraph</code>.
- * 
- */
-@Component
-@Service(ContentGraphProvider.class)
-public class ContentGraphProvider {
-
-
-    /**
-     * Service property header, which contains the URIs of additional
-     * <code>Graph</code>s that are united as read-only to the ImmutableGraph
-     * returned by <code>getContentGraph</code>
-     * 
-     * @scr.property name="additions" values.name="" description="Contains
-     *               additional Graphs that are added to the content
-     *               graph for reading"
-     */
-    @Property(name = "additions", description = "Contains "
-     +               "additional Graphs that are added to the content "
-     +               "graph for reading", value = {"",""})
-    public static final String CONTENT_ADDITIONS = "additions";
-
-    @Reference
-    private TcManager tcManager;
-
-
-
-    /**
-     * The URIs of the read-only addition-<code>Graph</code>s
-     */
-    private IRI[] additions;
-
-    private ReentrantReadWriteLock configLock = new ReentrantReadWriteLock();
-
-    protected void activate(ComponentContext context) {
-        try {
-            tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
-        } catch (NoSuchEntityException nsee) {
-            tcManager.createGraph(Constants.CONTENT_GRAPH_URI);
-        }
-        String[] additionUriStrings = (String[]) context.getProperties().get(
-                CONTENT_ADDITIONS);
-        additions = new IRI[additionUriStrings.length];
-        for (int i = 0; i < additionUriStrings.length; i++) {
-            additions[i] = new IRI(additionUriStrings[i]);
-
-        }
-    }
-
-    public Graph getContentGraph() {
-        configLock.readLock().lock();
-        try {
-            Graph[] united = new Graph[additions.length + 1];
-            int i = 0;
-            united[i++] = tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
-            for (IRI uriRef : additions) {
-                united[i++] = tcManager.getGraph(uriRef);
-            }
-            return new UnionGraph(united);
-        } finally {
-            configLock.readLock().unlock();
-        }
-    }
-
-    public void addTemporaryAdditionGraph(IRI graphName) {
-        configLock.writeLock().lock();
-        try {
-            Set<IRI> additionsSet = new HashSet<IRI>(Arrays
-                    .asList(additions));
-            additionsSet.add(graphName);
-            additions = additionsSet.toArray(new IRI[additionsSet.size()]);
-        } finally {
-            configLock.writeLock().unlock();
-        }
-    }
-
-    public void removeTemporaryAdditionGraph(IRI graphName) {
-        configLock.writeLock().lock();
-        try {
-            Set<IRI> additionsSet = new HashSet<IRI>(Arrays
-                    .asList(additions));
-            additionsSet.remove(graphName);
-            additions = additionsSet.toArray(new IRI[additionsSet.size()]);
-        } finally {
-            configLock.writeLock().unlock();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/14575ea3/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
deleted file mode 100644
index a7433b4..0000000
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.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.platform.graphprovider.content;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.clerezza.permissiondescriptions.PermissionDescriptionsProvider;
-import org.apache.clerezza.permissiondescriptions.PermissionDescripton;
-import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
-
-/**
- * <code>PermissionDescriptionsProvider</code> implementation that provides
- * <code>PermissionDescripton</code>s of the <code>TcPermission</code>s used to
- * access the content graph.
- *
- * @author mir
- */
-@Component
-@Service(PermissionDescriptionsProvider.class)
-public class TcPermissionDescriptionsProvider implements PermissionDescriptionsProvider {
-
-    private static final Set<PermissionDescripton> GRAPH_ACCESS_PERMISSION_DESCRIPTIONS =
-            new HashSet<PermissionDescripton>();
-    static {
-        GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content ImmutableGraph Read Permission",
-                "Grants permission to the user to read the content graph", null, TcPermission.class,
-                "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/content.graph\" \"read\")"));
-
-        GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content ImmutableGraph Read/Write Permission",
-                "Grants permission to the user to read and write the content graph", null, TcPermission.class,
-                "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/content.graph\" \"readwrite\")"));
-
-    }
-
-    @Override
-    public Set<PermissionDescripton> getPermissionDescriptors() {
-        return GRAPH_ACCESS_PERMISSION_DESCRIPTIONS;
-    }
-}


Mime
View raw message