Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Conflicts:
platform/marmotta-core/src/main/resources/templates/404.ftl
platform/marmotta-core/src/main/resources/templates/admin.ftl
platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f9de6f31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f9de6f31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f9de6f31
Branch: refs/heads/develop
Commit: f9de6f31105195da3c7a1ff57e7d9cd906b76cc8
Parents: 6029bae 560fca4
Author: tkurz <[email protected]>
Authored: Mon Apr 8 11:27:06 2013 +0200
Committer: tkurz <[email protected]>
Committed: Mon Apr 8 11:27:06 2013 +0200
----------------------------------------------------------------------
LICENSE.txt | 602 +++-
NOTICE.txt | 130 +-
build/scripts/check_signatures_and_digests.sh | 62 +
client/marmotta-client-js/pom.xml | 3 +-
.../src/main/resources/installer/LICENSE.txt | 2749 ++++++++++++---
.../src/main/resources/installer/NOTICE.txt | 575 +---
.../kiwi/persistence/KiWiGarbageCollector.java | 15 +-
.../marmotta/kiwi/persistence/KiWiPersistence.java | 20 +
.../apache/marmotta/kiwi/test/PersistenceTest.java | 74 +
.../versioning/test/VersioningPersistenceTest.java | 29 +-
.../ldclient/test/youtube/TestYoutubeProvider.java | 13 +
.../ldpath/parser/DefaultConfiguration.java | 4 +-
parent/pom.xml | 6 +
.../platform/core/rio/RDFHtmlWriterImpl.java | 1 +
.../core/services/content/ContentServiceImpl.java | 35 +-
.../services/content/FileSystemContentReader.java | 31 +-
.../core/services/content/HTTPContentReader.java | 27 +-
.../platform/core/services/prefix/PrefixCC.java | 6 +-
.../services/templating/TemplatingServiceImpl.java | 3 +-
.../resource/ResourceWebServiceHelper.java | 1 +
.../main/resources/web/public/js/lib/strftime.js | 4 +-
.../resources/web/public/style/white/style.css | 1 +
.../platform/core/test/prefix/PrefixCCTest.java | 95 +
.../src/main/resources/web/cm/LICENSE | 23 +
.../src/main/resources/web/cm/codemirror.css | 37 +-
.../src/main/resources/web/cm/codemirror.js | 37 +-
.../src/main/resources/web/cm/ldpath.js | 36 +-
.../src/main/resources/web/cm/simple-hint.css | 34 +-
.../src/main/resources/web/cm/simple-hint.js | 36 +-
platform/marmotta-sparql/pom.xml | 54 +
.../platform/sparql/api/sparql/SparqlService.java | 45 +-
.../sparql/services/sparql/SparqlServiceImpl.java | 126 +-
.../services/sparql/SparqlWritersHelper.java | 95 +
.../web/admin/editor/flint_sparql_editor.html | 50 +-
.../resources/web/admin/editor/sparql/css/docs.css | 35 +-
.../resources/web/admin/editor/sparql/css/font.js | 2 +
.../web/admin/editor/sparql/css/sparqlcolors.css | 35 +-
.../web/admin/editor/sparql/flint-editor.js | 34 +-
.../web/admin/editor/sparql/init-local.js | 35 +-
.../web/admin/editor/sparql/init-openuplabs.js | 35 +-
.../web/admin/editor/sparql/init-sparqlservice.js | 35 +-
.../web/admin/editor/sparql/lib/codemirror.css | 35 +-
.../web/admin/editor/sparql/lib/codemirror.js | 37 +-
.../web/admin/editor/sparql/lib/overlay.js | 43 +-
.../web/admin/editor/sparql/lib/runmode.js | 36 +-
.../web/admin/editor/sparql/sparqlParser.js | 33 +-
.../web/admin/editor/sparql/sparqlmode.js | 33 +-
.../web/admin/editor/sparql/sparqlmode_ll1.js | 33 +-
.../src/main/resources/web/admin/snorql/NOTICE | 5 +
.../main/resources/web/admin/snorql/namespaces.js | 2 +
.../main/resources/web/admin/snorql/prototype.js | 19 +-
.../web/admin/snorql/scriptaculous/builder.js | 17 -
.../web/admin/snorql/scriptaculous/controls.js | 17 -
.../web/admin/snorql/scriptaculous/dragdrop.js | 22 +-
.../web/admin/snorql/scriptaculous/effects.js | 22 +-
.../admin/snorql/scriptaculous/scriptaculous.js | 24 +-
.../web/admin/snorql/scriptaculous/slider.js | 22 +-
.../web/admin/snorql/scriptaculous/sound.js | 22 +-
.../web/admin/snorql/scriptaculous/unittest.js | 24 +-
.../main/resources/web/admin/snorql/snorql.html | 1 +
.../src/main/resources/web/admin/snorql/snorql.js | 2 +
.../src/main/resources/web/admin/snorql/sparql.js | 17 -
.../src/main/resources/web/admin/snorql/style.css | 2 +
.../src/main/resources/web/cm/LICENSE.txt | 23 +
.../src/main/resources/web/cm/codemirror.css | 34 +-
.../src/main/resources/web/cm/codemirror.js | 37 +-
.../src/main/resources/web/cm/simple-hint.css | 35 +-
.../src/main/resources/web/cm/simple-hint.js | 37 +-
.../src/main/resources/web/cm/sparql.js | 37 +-
.../sparql/webservices/SparqlWebServiceTest.java | 53 +
.../marmotta-sparql/src/test/resources/foaf.rdf | 63 +
pom.xml | 25 +-
72 files changed, 4416 insertions(+), 1666 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f9de6f31/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
----------------------------------------------------------------------
diff --cc
platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
index 6234c49,09f0e2e..d7ba882
---
a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
+++
b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
@@@ -121,9 -121,9 +121,9 @@@ public class TemplatingServiceImpl impl
datamodel.put("USER_MODULE_IS_ACTIVE",
moduleService.listModules().contains("Users"));
//end hack!!!
datamodel.put("MODULE_MENU",menu.menuItems);
- datamodel.put("DEFAULT_STYLE",
configurationService.getStringConfiguration("kiwi.pages.style", DEFAULT_STYLE));
+ datamodel.put("DEFAULT_STYLE",
configurationService.getStringConfiguration("kiwi.pages.style_path",
DEFAULT_STYLE));
datamodel.put("CURRENT_TITLE", getNameFromPath(path));
- datamodel.put("CURRENT_MODULE",module);
+ datamodel.put("CURRENT_MODULE", module);
try {
String s = new String(bytes);
Matcher m = PATTERN.matcher(s);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f9de6f31/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
----------------------------------------------------------------------
diff --cc
platform/marmotta-core/src/main/resources/web/public/style/white/style.css
index 49f8166,0000000..d787917
mode 100644,000000..100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
@@@ -1,226 -1,0 +1,227 @@@
+/**
+ * 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.
+ */
++
+/* main */
+html,body {
+ margin:0;
+ padding:0;
+ height:100%;
+ font-size: 10pt;
+ font-family: Arial,Helvetica,FreeSans,sans-serif;
+}
+
+#wrapper {
+ margin: 0 auto;
+ padding: 0 1.25em;
+}
+#header {
+ height: 80px;
+ width: 100%;
+}
+
+a#logo {
+ float: left;
+ margin-top: 8px;
+ margin-left: 5px;
+}
+
+a#logo img {
+ height: 70px;
+}
+
+#header h1 {
+ margin: 9px 10px;
+ left: 20%;
+ top: 52px;
+ z-index: 2;
+ position: absolute;
+ font-size: 13px;
+}
+
+#left {
+ width:20%;
+ float: left;
+}
+#center {
+ float:right;
+ width: 80%;
+}
+#content {
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 10px;
+}
+
+#content h1 {
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 3px;
+}
+
+#content h2 {
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 3px;
+}
+
+#content h3 {
+ padding: 3px;
+ text-decoration: underline;
+}
+
+#content h4 {
+ padding: 3px;
+ text-decoration: underline;
+}
+
+#content p {
+ padding: 3px;
+}
+
+#content pre {
+ border-width: 1px;
+ border-style: dotted;
+ overflow: auto;
+ padding: 3px;
+ white-space: pre-wrap;
+}
+
+#content .tt {
+ font-family: monospace;
+}
+
+#content li {
+ line-height: 1.5;
+}
+
+#footer {
+ width:100%;
+}
+
+#footer_line {
+ border-top-width: 1px;
+ border-top-style: solid;
+ width:100%;
+ margin-top:15px;
+ text-align: center;
+}
+
+#footer_line span{
+ margin-top: 15px;
+ display: block;
+ padding-bottom: 10px;
+}
+
+.clear {
+ clear: both;
+}
+
+/* admin menu */
+ul#menu {
+ margin: 0 30px 0 0;
+ padding: 0;
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ overflow: hidden;
+}
+
+ul#menu li.menu_item {
+ list-style: none;
+ display: list-item;
+}
+
+ul#menu div.menu_heading {
+ padding: 5px 4px 5px 10px;
+ font-weight: bold;
+}
+
+ul.submenu {
+ margin: 0;
+ padding: 2px 0 10px 0;
+}
+
+ul.submenu li {
+ list-style: none;
+ margin: 0;
+ line-height: 1.3;
+}
+
+
+ul.submenu li.active {
+ font-weight: bold;
+}
+
+ul.submenu a {
+ text-decoration: none;
+ display: block;
+ padding: 0.2em 10px;
+}
+
+/* tables */
+table.simple_table {
+ border-collapse: collapse;
+ width: 100%;
+}
+
+table.simple_table tr.title td,
+table.simple_table th {
+ border-width: 1px;
+ border-style: solid;
+ font-size: 15px;
+ padding: 2px 7px;
+ text-align: left;
+}
+
+table.simple_table tr.subtitle td,
+table.simple_table tr.subtitle th,
+table.simple_table th.subtitle,
+table.simple_table tr.subheading td,
+table.simple_table tr.subheading th,
+table.simple_table th.subheading {
+ padding: 2px 5px;
+}
+
+table.simple_table tr td{
+ font-size: 13px;
+ padding: 2px 5px;
+ text-align: left;
+ border-width: 1px;
+ border-style: solid;
+}
+
+dl dt {
+ font-weight: bold;
+ position: relative;
+ top: 1em;
+ width: 12em;
+ text-align: right;
+}
+
+dd {
+ margin: 0 0 0 13em;
+ padding: 0 0 0 0.5em;
+}
+
