You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/04/19 09:56:02 UTC

[1/2] marmotta git commit: MARMOTTA-634: added the right content

Repository: marmotta
Updated Branches:
  refs/heads/develop 3e90926ea -> ff559ea4f


MARMOTTA-634: added the right content


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

Branch: refs/heads/develop
Commit: aab258e6d2f9149ca40fb66912a8a2ce6613f51d
Parents: 3e90926
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Apr 19 09:55:24 2016 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Apr 19 09:55:24 2016 +0200

----------------------------------------------------------------------
 .../src/main/resources/web/admin/about.html     | 41 ++++++--------------
 1 file changed, 12 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/aab258e6/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html
index c6ad6bb..dc8bfa5 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/about.html
@@ -20,41 +20,24 @@
 <html>
 <head>
     <!--###BEGIN_HEAD###-->
-    <title>Core Module</title>
+    <title>Storage Backend: KiWi</title>
     <!--###END_HEAD###-->
 </head>
 <body>
 <!--###BEGIN_CONTENT###-->
-<h1>Apache Marmotta</h1>
-<h2>
-    An Open Platform for Linked Data
-</h2>
-<p>The goal of Apache Marmotta is to provide an open implementation of a Linked Data Platform that can be used, extended, and deployed easily by organizations who want to publish Linked Data or build custom applications on Linked Data.</p>
-<p>You can find more information about the project and the supported features on <a href="http://marmotta.apache.org/">http://marmotta.apache.org</a>.</p>
-<h2>
-    Links to common features
-</h2>
-<p>You can find all installed features on the module list on the right side. To get a quick access to common functionalities, we listed some links:</p>
-<ul>
-    <li><a href="../../core/admin/import.html">Import your data:</a> RDF and non-RDF formats are supported.</li>
-    <li><a href="../../sparql/admin/squebi.html">SPARQL your data:</a> full SPARQL 1.1 support including querying and updates.</li>
-    <li><a href="configuration.html">Configure your database:</a> Marmotta comes with h2 embedded; configure your own database to handle bigger data.</li>
-    <li><a href="dataview.html">Control your data:</a> the dataview gives an overview on the current data in the system. (Attention: there might be problems with the visualisation if big data sets).</li>
-    <li><a href="../../user/admin/users.html">Manage your user accounts:</a> the user module allows creating and managing user accounts.</li>
-    <li><a href="tasks.html">Inspect your tasks:</a> check the status of the running tasks.</li>
-</ul>
+<h1>Storage Backend: KiWi</h1>
 
-<h2>Marmotta Modules</h2>
-<p>Apache Marmotta provides some modules:</p>
+<p>
+  This module allows to use the <a href="http://marmotta.apache.org/kiwi">KiWi Triplestore</a>
+  as storage backend for <a href="../../core/admin/about.html">Apache Marmotta</a>.
+</p>
+
+<h2>Options</h2>
+<p>The KiWi backend for Apache Marmotta provides the follwing options:</p>
 <dl>
-    <dt><a href="../../core/admin/about.html">Core</a></dt> <dd>provides the core RDF and Linked Data Platform capabilities.</dd>
-    <dt><a href="../../sparql/admin/about.html">SPARQL</a></dt> <dd>offers query capabilities for the triplestore.</dd>
-    <dt><a href="../../ldpath/admin/about.html">LDPath Querying</a></dt> <dd>provides support for LDPath within the platform.</dd>
-    <dt><a href="../../cache/admin/about.html">Linked Data Caching</a></dt> <dd>provides transparent mechanism to cache Web resources.</dd>
-    <dt><a href="../../reasoner/admin/about.html">Reasoner</a></dt> <dd>adds a rule-based reasoner to the triple store.</dd>
-    <dt><a href="../../security/admin/about.html">Security</a></dt> <dd>implements security mechanism.</dd>
-    <dt><a href="../../user/me.html">User</a></dt> <dd>provides the user management features.</dd>
-    <dt><a href="../../versioning/admin/about.html">Versioning</a></dt> <dd>offers versioning services on top of the triple store.</dd>
+    <dt><a href="configuration.html">Configuration</a></dt> <dd>configure the options offered</dd>
+    <dt><a href="database.html">Database</a></dt> <dd>configure the database</dd>
+    <dt><a href="console.html">Console</a></dt> <dd>manage Marmotta database</dd>
 </dl>
 <!--###END_CONTENT###-->
 </body>


[2/2] marmotta git commit: MARMOTTA-634: fixed cosmetics

Posted by wi...@apache.org.
MARMOTTA-634: fixed cosmetics


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

Branch: refs/heads/develop
Commit: ff559ea4f1ff1b2217d2796c263d2e33e2bb4bd0
Parents: aab258e
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Apr 19 09:55:48 2016 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Apr 19 09:55:48 2016 +0200

----------------------------------------------------------------------
 .../src/main/resources/web/admin/configuration.html           | 7 ++-----
 .../src/main/resources/web/admin/console.html                 | 2 +-
 .../src/main/resources/web/admin/database.html                | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/ff559ea4/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/configuration.html
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/configuration.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/configuration.html
index 3957686..0b36d1c 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/configuration.html
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/configuration.html
@@ -16,11 +16,8 @@
   -->
 <html>
 <head>
-<title>Storage Backend: BigData</title>
-<script type="text/javascript">
-	var _SERVER_URL = "http://localhost:8080/LMF/";
-</script>
 <!--###BEGIN_HEAD###-->
+  <title>KiWi Configuration</title>
     <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
     <script type="text/javascript" src="../../core/public/js/widgets/configurator/configurator.js"></script>
     <link rel="stylesheet" href="style.css" />
@@ -49,4 +46,4 @@
   </div>
   <!--###END_CONTENT###-->
 </body>
-</html>
\ No newline at end of file
+</html>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ff559ea4/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
index 39b541d..5d32d33 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
@@ -20,7 +20,7 @@
 <html>
 <head>
     <!--###BEGIN_HEAD###-->
-    <title>Core Module</title>
+    <title>KiWi Console</title>
     <!--###END_HEAD###-->
 </head>
 <body>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ff559ea4/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/database.html
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/database.html b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/database.html
index afa5287..aab3e05 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/database.html
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/database.html
@@ -17,7 +17,7 @@
 <html>
 <head>
 <!--###BEGIN_HEAD###-->
-    <title>Core Module Configuration</title>
+    <title>KiWi Database</title>
     <link type="text/css" rel="stylesheet" href="../../../../../../../marmotta-core/src/main/resources/web/public/js/widgets/configurator/style.css">
     <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
     <script type="text/javascript" src="js/widgets/database.js"></script>