clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [48/51] [partial] clerezza git commit: CLEREZZA-966: started hierarchical project structure, moved platform bundles to platform, only moved RDF artifacts ported to use commons to the rdf folder.
Date Sun, 22 Mar 2015 12:11:44 GMT
http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/documentation/style/style.css
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/documentation/style/style.css b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/documentation/style/style.css
deleted file mode 100644
index ff49a4d..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/documentation/style/style.css
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-/*---------------------------------------------------------------------------
- *  Two- and three-column layout
- */
-
-#banner {
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    height: 116px;
-}
-
-#left {
-    position: absolute;
-    z-index: 2;
-    left: 8px;
-    width: 184px;
-    top: 125px;
-    bottom: 8px;
-    margin: 0px;
-    padding: 0px;
-}
-
-#right {
-    position: absolute;
-    z-index: 1;
-    right: 8px;
-    width: 184px;
-    top: 125px;
-    bottom: 8px;
-    margin: 0px;
-    padding: 0px;
-}
-
-.Content3Column {
-    position: absolute;
-    top: 125px;
-    bottom: 8px;
-    left: 208px;
-    right: 216px;
-}
-
-.Content2Column {
-    position: absolute;
-    top: 125px;
-    bottom: 8px;
-    left: 208px;
-    right: 16px;
-}
-
-#center {
-    z-index: 3;
-    margin: 0px;
-    border: none;
-    padding-bottom: 8px;
-}
-
-
-/*---------------------------------------------------------------------------
- *  Default element styles
- */
-
-body {
-    padding: 0px;
-    margin: 0px;
-    border: 0px;
-
-    font-family: helvetica, arial, sans-serif;
-    font-size: 12px;
-
-    background-color: white;
-    color: black;
-}
-
-h1, h2, h3, h4, h5, h6 {
-    margin: 0px;
-    border: 0px;
-    padding: 0px;
-    font-weight: normal;
-}
-
-a:link { color: #008DA8; }
-a:active { color: #FE5400; }
-a:hover { color: #FE5400; }
-a:visited { color: black; }
-
-iframe {
-    width:100%;
-    height: 800px;
-    border: 0px;
-}
-
-img {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-}
-
-p {
-    border: 0px;
-    padding: 0px;
-    margin: 0px;
-    margin-bottom: 10px;
-}
-
-blockquote {
-    margin-bottom: 10px;
-}
-
-td {
-    font-size: 12px;
-    padding: 2px;
-}
-
-tr.a {
-    background-color:  #e0e0e0;
-}
-tr.b {
-    background-color: #ffffff;
-}
-
-th {
-    font-size: 12px;
-    font-weight: bold;
-    white-space: nowrap;
-    padding: 2px;
-}
-
-th.Row {
-    text-align: left;
-    vertical-align: top;
-}
-
-ul, ol {
-    border: 0px;
-    padding: 0px;
-    margin-top: 0px;
-    margin-bottom: 12px;
-    margin-left: 20px;
-}
-
-
-/*---------------------------------------------------------------------------
- *  Page banner
- */
-
-#banner {
-    margin: 0px;
-    border: 0px;
-    border-bottom: 1px solid #008DA8;
-    padding: 0px;
-    background-color: #e0e0e0;
-    color: #008DA8;
-    vertical-align: bottom;
-}
-
-#banner a { text-decoration: none; }
-#banner a:visited { color: #008DA8; }
-#banner a:hover { color: #FE5400; }
-#banner a:active { color: #FE5400; }
-
-#logo {
-    position: absolute;
-    top: 5px;
-    left: 8px;
-}
-
-#versions {
-    position: absolute;
-    width: auto;
-    right: 0px;
-    top: 0px;
-    margin: 8px;
-    font-weight: normal;
-}
-
-/*---------------------------------------------------------------------------
- *  Page content
- */
-
-#content {
-    margin: 0px;
-    background-color: white;
-    color: black;
-    height: 100%;
-}
-
-#content h1 {
-    width: 100%;
-    font-size: 18px;
-    background-color: #008DA8;
-    color: white;
-    padding: 2px;
-    padding-left: 6px;
-    margin-top: 24px;
-    margin-bottom: 12px;
-}
-
-#content .FirstChild {  /* IE doesn't understand first-child pseudoelement */
-    margin-top: 0px;
-}
-
-#content a { text-decoration: underline; }
-#content a:link { color: #008DA8; }
-#content a:visited { color: #008DA8; }
-#content a:active { color: #FE5400; }
-#content a:hover { color: #FE5400; }
-
-#content h2 {
-    margin-top: 24px;
-    border-top: 1px solid #008DA8;
-    margin-bottom: 16px;
-    font-size: 15px;
-    font-weight: bold;
-    background-color:  #e0e0e0;;
-    padding: 2px;
-}
-
-#content li {
-    margin-bottom: 6px;
-}
-
-#content th {
-    background-color:  #e0e0e0;
-}
-
-#content td {
-    
-}
-
-.Source pre {
-    padding: 4px;
-    font-family: courier new, monospace;
-    font-size: 11px;
-    border: 1px solid #008DA8;
-    background-color:  #e0e0e0;
-    color: black;
-}
-
-.Source:before {
-    margin: 0px;
-    padding: 0px;
-    border: 0px;
-    font-size: inherit;
-    line-spacing: 100%;
-}
-
-.highlight {
-    background-color:  #e0e0e0;
-    border: 1px dotted #008DA8;
-    padding: 5px;
-}
-
-/* The following are for images, but can also apply to div's containing images. */
-
-#content .Float {
-    float: right;
-    margin-left: 8px;
-    margin-right: 0px;
-    margin-top: 8px;
-    margin-bottom: 8px;
-}
-
-#content .Diagram {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 8px;
-    margin-bottom: 8px;
-}
-
-
-#content .Inline {
-    display: inline;
-}
-
-.RuleOfThumb {
-    font-weight: bold;
-}
-
-/*---------------------------------------------------------------------------
- *  Side panels
- */
-
-.SidePanel {
-    background-color: white;
-    padding: 0px;
-    font-size: 11px;
-}
-
-.SidePanel h1 {
-    margin: 0px;
-    border: 0px;
-    padding: 4px;
-
-    color: #008DA8;
-
-    font-size: 12px;
-    font-weight: bold;
-}
-
-
-.SidePanel a { text-decoration: none; }
-.SidePanel a:link { color: #000000; }
-.SidePanel a:visited { color: #000000; }
-.SidePanel a:active { color: #FE5400; }
-.SidePanel a:hover { color: #FE5400; }
-
-/*---------------------------------------------------------------------------
- *  Menus
- */
-
-.MenuGroup {
-    border-left: 1px solid #A3DAE6;
-    border-top: 1px solid #A3DAE6;
-    border-bottom: 1px solid white; /* IE work-around */
-
-    margin-bottom: 8px;
-    background-color: white;
-    color: #008DA8;
-}
-
-.MenuGroup ul {
-    margin: 0px;
-    padding-left: 4px;
-    list-style-type: none;
-}
-
-.MenuGroup li {
-    padding: 2px;
-}
-
-.MenuGroup .currentLink {
-/*    background-color: #060;*/
-    background-color:  #e0e0e0;
-    color: #008DA8;
-}
-
-
-/*---------------------------------------------------------------------------
- *  News panel
- */
-
-.NewsGroup {
-    border-left: 1px solid #A3DAE6;
-    border-top: 1px solid #A3DAE6;
-    border-bottom: 1px solid white; /* IE workaround */
-    margin-bottom: 8px;
-
-    color: #008DA8;
-}
-
-.NewsItem {
-    margin: 4px;
-}
-
-.NewsDate {
-    font-weight: bold;
-    margin: 0px;
-    padding: 0px;
-}
-
-.NewsText {
-    padding: 0px;
-    margin: 0px;
-    margin-bottom: 8px;
-}
-
-.NewsText a { text-decoration: underline; }
-.NewsText a:link { color: #008DA8; }
-.NewsText a:visited { color: #008DA8; }
-.NewsText a:active { color: #FE5400; }
-.NewsText a:hover { color: #FE5400; }
-
-.NewsMore {
-    font-size: smaller;
-    margin: 4px;
-    margin-top: 8px;
-    text-align: left;
-}
-
-.NewsGroup td {
-    font-size: 12px;
-}
-
-/*---------------------------------------------------------------------------
- *  Document meta-information
- */
-
-.Meta {
-    margin-top: 64px;
-    font-size: smaller;
-    color: #008DA8;
-    text-align: right;
-}
-
-.Meta a { text-decoration: underline; }
-.Meta a:link { color: #008DA8; }
-.Meta a:visited { color: #008DA8; }
-.Meta a:active { color: #FE5400; }
-.Meta a:hover { color: #FE5400; }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/images/clerezza.png
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/images/clerezza.png b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/images/clerezza.png
deleted file mode 100644
index cb0efb0..0000000
Binary files a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/resources/images/clerezza.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/site.xml b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/site.xml
deleted file mode 100644
index 8d5a4cb..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/site.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-
-<project>
-    <body>
-        <menu name="Documentation">
-            <item name="Usage" href="documentation/usage.xhtml"/>
-        </menu>
-    </body>
-</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/sitemap.xml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/sitemap.xml b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/sitemap.xml
deleted file mode 100644
index 38be885..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/sitemap.xml
+++ /dev/null
@@ -1,28 +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.
-
--->
-
-<sitemap>
-    <section>
-        <name>Documentation</name>
-        <page>usage.xhtml</page>
-    </section>
-</sitemap>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/usage.xhtml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/usage.xhtml b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/usage.xhtml
deleted file mode 100644
index 6c22c93..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/content/usage.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us">
-	<head>
-		<title>Usage: How to use the Account Control Panel</title>
-	</head>
-	<body>
-		<h1>Usage: How to use the Account Control Panel</h1>
-		<p>Author: Tsuyoshi Ito - clerezza.org</p>
-		<p>Date: January 27, 2009</p>
-		<h2 id="list">1. List installed bundles</h2>
-		<p>
-			Each user can upload and install bundles into the platform. Users and permissions can be created via <a href="http://localhost:8282/admin/user-manager" target="_blank">http://localhost:8282/admin/user-manager</a> and <a href="http://localhost:8282/admin/role-manager" target="_blank">http://localhost:8282/admin/role-manager</a>. <br />
-			Enter the following URL: <a href="http://localhost:8282/user/admin/control-panel" target="_blank">http://localhost:8282/user/admin/control-panel</a> to list all bundles from the user "admin" (when asked to authenticate use username "admin" and password "admin). If you want to list installed bundles from another user, replace "admin" in the URL with the username of the other user.
-		</p>
-		<h2 id="install">2. Install a bundle</h2>
-		<p>
-            You can upload a bundle by clicking on the link <a href="http://localhost:8282/user/admin/control-panel/install-bundle-form">Install Bundle</a> on <a href="http://localhost:8282/user/admin/control-panel" target="_blank">http://localhost:8282/user/admin/control-panel</a>. Enter the URL of your bundle (e.g. Location: http://localhost/mybundle-1.0.jar) and click on the button "install". The uploaded and installed bundles have the same permission as you have. 
-        </p>
-		<h2 id="start">3. Start, Stop and Uninstall a bundle</h2>
-        <p>
-            A user can start, stop and  uninstall a bundle on <a href="http://localhost:8282/user/admin/control-panel" target="_blank">http://localhost:8282/user/admin/control-panel</a>, whereas "admin" can be replaced by another username. Click on the appropriate button for start , stop or uninstall a bundle.
-        </p>
-        <p>
-            That's all. Enjoy.
-        </p>
-    </body>
-</html>
-

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/templates/skin.html
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/templates/skin.html b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/templates/skin.html
deleted file mode 100644
index 4b10edb..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/site/xsite/templates/skin.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>clerezza.org - ${title}</title>
-        <link rel="stylesheet" type="text/css" href="style/style.css"/>
-        ${head}
-    </head>
-    <body>
-
-        <div id="banner">
-            <a href="http://clerezza.org/">
-              <img id="logo" src="../images/clerezza.png" alt="clerezza.org"/>
-            </a><br />
-        </div>
-
-        <div id="center" class="${centerClass}">
-            <div id="content">
-                <!-- <h1 class="FirstChild">${title}</h1> -->
-                ${body}
-                <p>Copyright (c) 2008 trialox.org (trialox AG, Switzerland)</p>
-                <br /><br />
-            </div>
-        </div>
-
-        <div class="SidePanel" id="left">
-            <#list sitemap.sections as section>
-                <div class="MenuGroup">
-                    <h1>${section.name}</h1>
-                    <ul>
-                        <#list section.entries as entry>
-                            <#if entry = page>
-                                <li class="currentLink">${entry.title}</li>
-                            <#else>
-                                <li><a href="${entry.href}">${entry.title}</a></li>
-                            </#if>
-                        </#list>
-                    </ul>
-                </div>
-            </#list>
-            <div class="MenuGroup">
-                  <h1>Project Site</h1>
-                  <ul>
-
-                              <li><a href="../index.html">Back to project site</a></li>
-                  </ul>
-              </div>
-        </div>
-
-  </body>
-</html>

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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/pom.xml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/pom.xml b/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/pom.xml
deleted file mode 100644
index 023237b..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/pom.xml
+++ /dev/null
@@ -1,67 +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>platform.accountcontrolpanel</artifactId>
-        <version>0.10</version>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.accountcontrolpanel.ontologies</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Clerezza - Platform Account Contral Panel Ontologies</name>
-    <description>
-        Ontologies of the Account Control Panel
-    </description>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>0.14</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.clerezza</groupId>
-                <artifactId>maven-ontologies-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <resourcePath>${basedir}/src/main/resources</resourcePath>
-                            <sources>
-                                <source>${basedir}/target/generated-sources/main/java</source>
-                            </sources>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <version>0.4</version>
-        </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/ontologies/controlpanel.rdf
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/ontologies/controlpanel.rdf b/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/ontologies/controlpanel.rdf
deleted file mode 100644
index e6c76a8..0000000
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.ontologies/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/ontologies/controlpanel.rdf
+++ /dev/null
@@ -1,120 +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.
-
--->
-
-<rdf:RDF
-	xml:base="http://clerezza.org/2009/03/controlpanel#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:skos="http://www.w3.org/2008/05/skos#"
->
-
-<!-- Ontology -->
-
-<owl:Ontology rdf:about="http://clerezza.org/2009/03/controlpanel#">
-	<owl:versionInfo>Revision: 0.1</owl:versionInfo>
-	<dc:title xml:lang="en">
-		Clerezza Concept Manager
-	</dc:title>
-</owl:Ontology>
-
-<!-- Classes -->
-
-<rdfs:Class rdf:about="#SettingsPage">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
-	<rdfs:label xml:lang="en">account settings Page</rdfs:label>
-	<skos:definition xml:lang="en">A web page containing a list of bundles of a user. Over the page
-		bundles can be managed.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-</rdfs:Class>
-
-<rdfs:Class rdf:about="#ProfilePage">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
-	<rdfs:label xml:lang="en">personal profile management page</rdfs:label>
-	<skos:definition xml:lang="en">A web page allowing users to change  
-	their profile.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-</rdfs:Class>
-
-<rdfs:Class rdf:about="#ContactConfirmPage">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
-	<rdfs:label xml:lang="en">ContactConfirmPage</rdfs:label>
-	<skos:definition xml:lang="en">page for confiming a new contact
-	</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-</rdfs:Class>
-
-<!-- Properties -->
-
-<rdf:Property rdf:about="#userBundlePermission">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty" />
-	<rdfs:label xml:lang="en">User Bundle Permission</rdfs:label>
-	<skos:definition xml:lang="en">Points to a boolean indicating if the user has
-		the permission to install bundles over his/her account control page, which is the subject.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-	<rdfs:domain rdf:resource="#SettingsPage" />
-	<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
-</rdf:Property>
-
-<rdf:Property rdf:about="#changePasswordPermission">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty" />
-	<rdfs:label xml:lang="en">Change Password Permission</rdfs:label>
-	<skos:definition xml:lang="en">Points to a boolean indicating if the user has
-		the permission to change the password over his/her account control page, which is the subject.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-	<rdfs:domain rdf:resource="#SettingsPage" />
-	<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
-</rdf:Property>
-
-<rdf:Property rdf:about="#changedPassword">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty" />
-	<rdfs:label xml:lang="en">change password</rdfs:label>
-	<skos:definition xml:lang="en">Points from a settings page over which an attempt was made to change the password of the user owning it
-		to a boolean indicating if an attempt succeeded.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-	<rdfs:domain rdf:resource="#SettingsPage" />
-	<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
-</rdf:Property>
-
-<rdf:Property rdf:about="#isLocalProfile">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty" />
-	<rdfs:label xml:lang="en">profile local</rdfs:label>
-	<skos:definition xml:lang="en">Points from a profile page to a boolean 
-indicating if the server considers itself as authoritative for that profile.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-	<rdfs:domain rdf:resource="#SettingsPage" />
-	<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
-</rdf:Property>
-
-<rdf:Property rdf:about="#suggestedPPDUri">
-	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty" />
-	<rdfs:label xml:lang="en">Suggested PPD URI</rdfs:label>
-	<skos:definition xml:lang="en">Points to a uri suggested for a new local 
-	personal profile document of the subject.</skos:definition>
-	<rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/03/controlpanel#" />
-	<rdfs:domain rdf:resource="#SettingsPage" />
-	<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#anyURI"/>
-</rdf:Property>
-
-</rdf:RDF>
-

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.accountcontrolpanel/pom.xml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/pom.xml b/platform.accountcontrolpanel/pom.xml
deleted file mode 100644
index a23edbd..0000000
--- a/platform.accountcontrolpanel/pom.xml
+++ /dev/null
@@ -1,41 +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>0.5</version>
-        <relativePath>../parent</relativePath>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.accountcontrolpanel</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Clerezza - Platform Account Control Panel</name>
-    <description>A web interface that provides functions to configure the account of a platform user.</description>
-    
-    <modules>
-        <module>platform.accountcontrolpanel.ontologies</module>
-        <module>platform.accountcontrolpanel.core</module>
-    </modules>
-</project>
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.concepts/README.txt
----------------------------------------------------------------------
diff --git a/platform.concepts/README.txt b/platform.concepts/README.txt
deleted file mode 100644
index 9edd812..0000000
--- a/platform.concepts/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-JAX-RS resource called GenericResourcePage can be used to retrieve a resource and its associated concepts. 
-Go to http://[your.server]/concepts/generic-resource?uri=[resource] where [resource] 
-specifies the UriRef of the resource. Furthermore there is a JAX-RS resource called ResourceTagger
- for associating concepts with resources. POST to http://[your.server]/concepts/tagger/set a form 
-with form parameter uri which specifies the UriRef of the resource and a form parameter 
-concepts which contains the UriRefs of the concepts.
-
-JAX-RS resource called ConceptManipulator can be used to add concept into the content graph
-The resource path is "/concepts/manipulator/add-concept" and the form parameters are
-pref-label, lang, and comment.
-
-On the client side there is a ConceptManipulator widget to add free concepts to the content graph
-and there is also a ConceptFinder widget to find exisiting concepts to be suggested for a specified search term.
- 
-In ConceptManipulator widget and ConceptFinder widget a developer can register a callback function
-which is called when a concept is added to the list of selected concept.
-
-

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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.concepts/platform.concepts.core/pom.xml
----------------------------------------------------------------------
diff --git a/platform.concepts/platform.concepts.core/pom.xml b/platform.concepts/platform.concepts.core/pom.xml
deleted file mode 100644
index 579930a..0000000
--- a/platform.concepts/platform.concepts.core/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>platform.concepts</artifactId>
-        <version>0.2</version>
-    </parent>
-    <groupId>org.apache.clerezza</groupId>
-    <artifactId>platform.concepts.core</artifactId>
-    <packaging>bundle</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Clerezza - Platform Concepts Core</name>
-    <description>The core part of Platform Concepts</description>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.core</artifactId>
-            <version>0.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.ontologies</artifactId>
-            <version>0.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.utils</artifactId>
-            <version>0.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.concepts.ontologies</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.graphprovider.content</artifactId>
-            <version>0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.core</artifactId>
-            <version>0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.typerendering.scalaserverpages</artifactId>
-            <version>0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>jaxrs.utils</artifactId>
-            <version>0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.config</artifactId>
-            <version>0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>platform.globalmenu.api</artifactId>
-            <version>0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>permissiondescriptions</artifactId>
-            <version>0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.clerezza</groupId>
-            <artifactId>web.fileserver</artifactId>
-            <scope>compile</scope>
-            <version>0.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-common</artifactId>
-            <version>1.2.1-incubating</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/af0d99b2/platform.concepts/platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
----------------------------------------------------------------------
diff --git a/platform.concepts/platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java b/platform.concepts/platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
deleted file mode 100644
index 25409bc..0000000
--- a/platform.concepts/platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
+++ /dev/null
@@ -1,285 +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.concepts.core;
-
-import java.util.Date;
-import java.util.Iterator;
-import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.ontologies.DC;
-import org.apache.clerezza.rdf.ontologies.OWL;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.ontologies.RDFS;
-import org.apache.clerezza.rdf.ontologies.SKOS;
-import org.apache.clerezza.rdf.utils.GraphNode;
-
-/**
- * This class manages caches of SPARQL query results against a specific EndPoint
- * and Graph.
- *
- * @author hasan
- */
-class ConceptCache {
-    private UriRef sparqlEndPoint;
-    private UriRef defaultGraph;
-    private UriRef CONCEPT_CACHE_MGRAPH = new UriRef("urn:x-localinstance:/concept.cache");
-
-    /**
-     * Constructs a {@link ConceptCache} for the specified SPARQL EndPoint and
-     * Graph.
-     *
-     * @param sparqlEndPoint
-     *        the SPARQL EndPoint used in the query.
-     * @param defaultGraph
-     *        the Graph against which the query was executed.
-     *
-     */
-    public ConceptCache(UriRef sparqlEndPoint, UriRef defaultGraph) {
-        this.sparqlEndPoint = sparqlEndPoint;
-        this.defaultGraph = defaultGraph;
-    }
-
-    /**
-     * Caches the query results available in the specified Graph under a
-     * particular search term.
-     *
-     * @param searchTerm
-     *        the term used for querying concepts.
-     * @param parsedGraph
-     *        the Graph which contains query results.
-     */
-    void cache(String searchTerm, Graph parsedGraph) {
-        MGraph conceptCacheMGraph = getConceptCacheMGraph();
-        NonLiteral conceptCacheNode = getConceptCacheNode(conceptCacheMGraph);
-        if (conceptCacheNode != null) {
-            removeCachedConcepts(searchTerm, conceptCacheNode, conceptCacheMGraph);
-        }
-        addCacheEntry(searchTerm, conceptCacheNode, conceptCacheMGraph,
-                parsedGraph);
-    }
-
-    private MGraph getConceptCacheMGraph() {
-        MGraph conceptCacheMGraph = null;
-        TcManager tcManager = TcManager.getInstance();
-        try {
-            conceptCacheMGraph = tcManager.getMGraph(CONCEPT_CACHE_MGRAPH);
-        } catch (NoSuchEntityException nsee) {
-            conceptCacheMGraph = tcManager.createMGraph(CONCEPT_CACHE_MGRAPH);
-        }
-        return conceptCacheMGraph;
-    }
-
-    private NonLiteral getConceptCacheNode(MGraph conceptCacheMGraph) {
-        Iterator<Triple> conceptCaches = conceptCacheMGraph.filter(
-                null, RDF.type, CONCEPTS.ConceptCache);
-        while (conceptCaches.hasNext()) {
-            NonLiteral conceptCacheNode = conceptCaches.next().getSubject();
-            if (!conceptCacheMGraph.filter(conceptCacheNode,
-                    CONCEPTS.sparqlEndPoint, sparqlEndPoint).hasNext()) {
-                continue;
-            }
-            if (defaultGraph != null) {
-                if (!conceptCacheMGraph.filter(conceptCacheNode,
-                        CONCEPTS.defaultGraph, defaultGraph).hasNext()) {
-                    continue;
-                }
-            }
-            return conceptCacheNode;
-        }
-        return null;
-    }
-
-    private void removeCachedConcepts(String searchTerm,
-            NonLiteral conceptCacheNode, MGraph conceptCacheMGraph) {
-        NonLiteral conceptCacheEntryNode = getConceptCacheEntryNode(
-                searchTerm, conceptCacheNode, conceptCacheMGraph);
-        if (conceptCacheEntryNode == null) {
-            return;
-        }
-        GraphNode conceptCacheEntryGraphNode = new GraphNode(
-                conceptCacheEntryNode, conceptCacheMGraph);
-        removeCachedConcepts(conceptCacheEntryGraphNode);
-        conceptCacheMGraph.remove(new TripleImpl(conceptCacheNode,
-                CONCEPTS.cacheEntry, conceptCacheEntryNode));
-    }
-
-    private NonLiteral getConceptCacheEntryNode(String searchTerm,
-            NonLiteral conceptCacheNode, MGraph conceptCacheMGraph) {
-        TypedLiteral searchLiteral = LiteralFactory.getInstance()
-                .createTypedLiteral(searchTerm);
-        Iterator<Triple> cacheEntries = conceptCacheMGraph.filter(
-                conceptCacheNode, CONCEPTS.cacheEntry, null);
-        while (cacheEntries.hasNext()) {
-            NonLiteral conceptCacheEntryNode = (NonLiteral) cacheEntries.next()
-                    .getObject();
-            if (!conceptCacheMGraph.filter(conceptCacheEntryNode,
-                    CONCEPTS.searchTerm, searchLiteral).hasNext()) {
-                continue;
-            }
-            return conceptCacheEntryNode;
-        }
-        return null;
-    }
-
-    private void removeCachedConcepts(GraphNode conceptCacheEntryGraphNode) {
-        Iterator<Resource> searchResults =
-                conceptCacheEntryGraphNode.getObjects(CONCEPTS.searchResult);
-        while (searchResults.hasNext()) {
-            Resource concept = searchResults.next();
-            GraphNode conceptGraphNode = new GraphNode(concept,
-                    conceptCacheEntryGraphNode.getGraph());
-            conceptGraphNode.deleteProperties(OWL.sameAs);
-            conceptGraphNode.deleteProperties(RDFS.comment);
-            conceptGraphNode.deleteProperties(SKOS.prefLabel);
-            conceptGraphNode.deleteProperties(RDF.type);
-        }
-        conceptCacheEntryGraphNode.deleteProperties(CONCEPTS.searchResult);
-        conceptCacheEntryGraphNode.deleteProperties(DC.date);
-        conceptCacheEntryGraphNode.deleteProperties(CONCEPTS.searchTerm);
-        conceptCacheEntryGraphNode.deleteProperties(RDF.type);
-    }
-
-    private void addCacheEntry(String searchTerm, NonLiteral conceptCacheNode,
-            MGraph conceptCacheMGraph, Graph parsedGraph) {
-        GraphNode conceptCacheGraphNode = null;
-        if (conceptCacheNode == null) {
-            conceptCacheGraphNode = addConceptCacheNode(conceptCacheMGraph);
-        } else {
-            conceptCacheGraphNode = new GraphNode(conceptCacheNode,
-                    conceptCacheMGraph);
-        }
-        GraphNode conceptCacheEntryGraphNode = new GraphNode(new BNode(),
-                conceptCacheMGraph);
-        conceptCacheGraphNode.addProperty(CONCEPTS.cacheEntry,
-                conceptCacheEntryGraphNode.getNode());
-        conceptCacheEntryGraphNode.addProperty(RDF.type, CONCEPTS.SearchTerm);
-        conceptCacheEntryGraphNode.addProperty(CONCEPTS.searchTerm,
-                LiteralFactory.getInstance().createTypedLiteral(searchTerm));
-        conceptCacheEntryGraphNode.addProperty(DC.date,
-                LiteralFactory.getInstance().createTypedLiteral(new Date()));
-
-        Iterator<Triple> concepts = parsedGraph.filter(null, RDF.type, SKOS.Concept);
-        while (concepts.hasNext()) {
-            conceptCacheEntryGraphNode.addProperty(CONCEPTS.searchResult,
-                    concepts.next().getSubject());
-        }
-        conceptCacheMGraph.addAll(parsedGraph);
-    }
-
-    private GraphNode addConceptCacheNode(MGraph conceptCacheMGraph) {
-        GraphNode conceptCacheGraphNode = new GraphNode(new BNode(),
-                conceptCacheMGraph);
-        conceptCacheGraphNode.addProperty(RDF.type, CONCEPTS.ConceptCache);
-        conceptCacheGraphNode.addProperty(CONCEPTS.sparqlEndPoint,
-                sparqlEndPoint);
-        if (defaultGraph != null) {
-            conceptCacheGraphNode.addProperty(CONCEPTS.defaultGraph,
-                    defaultGraph);
-        }
-        return     conceptCacheGraphNode;
-    }
-
-    /**
-     * Retrieves concepts from the cache stored under the specified search term.
-     * Cache entries are invalid if they are older than the specified date.
-     *
-     * @param searchTerm
-     *        the search term under which the concepts are cached.
-     * @param acceptableOldestCachingDate
-     *        the Date before which a cache entry is considered invalid.
-     * @return
-     *        an {@link MGraph} containing the valid cached concepts.
-     */
-    MGraph retrieve(String searchTerm, Date acceptableOldestCachingDate) {
-        MGraph conceptCacheMGraph = getConceptCacheMGraph();
-
-        NonLiteral conceptCacheNode = getConceptCacheNode(conceptCacheMGraph);
-        if (conceptCacheNode == null) {
-            return null;
-        }
-        NonLiteral conceptCacheEntryNode = getConceptCacheEntryNode(searchTerm,
-                conceptCacheNode, conceptCacheMGraph);
-        if (conceptCacheEntryNode == null) {
-            return null;
-        }
-        GraphNode conceptCacheEntryGraphNode = new GraphNode(
-                conceptCacheEntryNode, conceptCacheMGraph);
-        Date cachingDate = getCachingDate(conceptCacheEntryGraphNode);
-        if (cachingDate == null || cachingDate.before(acceptableOldestCachingDate)) {
-            removeCachedConcepts(conceptCacheEntryGraphNode);
-            conceptCacheMGraph.remove(new TripleImpl(conceptCacheNode,
-                    CONCEPTS.cacheEntry, conceptCacheEntryNode));
-            return null;
-        }
-        return getCachedConcepts(conceptCacheEntryGraphNode);
-    }
-
-    private Date getCachingDate(GraphNode conceptCacheEntryGraphNode) {
-        Iterator<Literal> cachingDates = conceptCacheEntryGraphNode.getLiterals(
-                DC.date);
-        if (cachingDates.hasNext()) {
-            return LiteralFactory.getInstance().createObject(Date.class,
-                    (TypedLiteral) cachingDates.next());
-        }
-        return null;
-    }
-
-    private MGraph getCachedConcepts(GraphNode conceptCacheEntryGraphNode) {
-        MGraph resultMGraph = new SimpleMGraph();
-        MGraph conceptCacheMGraph = (MGraph) conceptCacheEntryGraphNode.getGraph();
-        NonLiteral conceptCacheNode = (NonLiteral) conceptCacheEntryGraphNode.getNode();
-        Iterator<Triple> triples = conceptCacheMGraph.filter(
-                conceptCacheNode, CONCEPTS.searchResult, null);
-        while (triples.hasNext()) {
-            UriRef concept = (UriRef) triples.next().getObject();
-            GraphNode graphNode = new GraphNode(concept, conceptCacheMGraph);
-            resultMGraph.add(new TripleImpl(concept, RDF.type, SKOS.Concept));
-
-            Iterator<Literal> prefLabelStatements = graphNode.getLiterals(SKOS.prefLabel);
-            while (prefLabelStatements.hasNext()) {
-                resultMGraph.add(new TripleImpl(concept, SKOS.prefLabel,
-                        prefLabelStatements.next()));
-            }
-            Iterator<Literal> commentStatements = graphNode.getLiterals(RDFS.comment);
-            while (commentStatements.hasNext()) {
-                resultMGraph.add(new TripleImpl(concept, RDFS.comment,
-                        commentStatements.next()));
-            }
-            Iterator<UriRef> sameAsStatements = graphNode.getUriRefObjects(OWL.sameAs);
-            while (sameAsStatements.hasNext()) {
-                resultMGraph.add(new TripleImpl(concept, OWL.sameAs,
-                        sameAsStatements.next()));
-            }
-        }
-        return resultMGraph;
-    }
-}


Mime
View raw message