You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/04/08 12:51:28 UTC
[1/8] git commit: changes css style structure
Updated Branches:
refs/heads/master d5055d6bc -> 85f427cf5
Updated Tags: refs/tags/3.0.0-incubating [created] e14e32178
refs/tags/check-license-notice [created] 95840d26c
changes css style structure
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c7d85fc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c7d85fc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c7d85fc7
Branch: refs/heads/master
Commit: c7d85fc7fcd8ca4b02f7d455e42de1ed61159b23
Parents: a6ebcb9
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 10:24:58 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 10:24:58 2013 +0200
----------------------------------------------------------------------
.../services/templating/TemplatingServiceImpl.java | 4 +-
.../src/main/resources/config-defaults.properties | 2 +-
.../main/resources/config-descriptions.properties | 4 +-
.../src/main/resources/templates/404.ftl | 11 +-
.../src/main/resources/templates/admin.ftl | 7 +-
.../src/main/resources/templates/admin_old.ftl | 88 -----
.../src/main/resources/templates/rdfhtml.ftl | 6 +-
.../src/main/resources/web/public/style/404.css | 44 ---
.../main/resources/web/public/style/blue/404.css | 43 +++
.../main/resources/web/public/style/blue/code.css | 51 +++
.../resources/web/public/style/blue/javadoc.css | 112 ++++++
.../resources/web/public/style/blue/rdfhtml.css | 41 +++
.../web/public/style/blue/sgvizler.chart.css | 53 +++
.../main/resources/web/public/style/blue/style.css | 279 +++++++++++++++
.../src/main/resources/web/public/style/code.css | 51 ---
.../main/resources/web/public/style/javadoc.css | 112 ------
.../main/resources/web/public/style/rdfhtml.css | 40 --
.../resources/web/public/style/scheme/blue.css | 126 -------
.../resources/web/public/style/scheme/dark.css | 165 ---------
.../resources/web/public/style/sgvizler.chart.css | 53 ---
.../src/main/resources/web/public/style/style.css | 226 ------------
.../main/resources/web/public/style/white/404.css | 44 +++
.../main/resources/web/public/style/white/code.css | 51 +++
.../resources/web/public/style/white/javadoc.css | 112 ++++++
.../resources/web/public/style/white/rdfhtml.css | 40 ++
.../web/public/style/white/sgvizler.chart.css | 53 +++
.../resources/web/public/style/white/style.css | 226 ++++++++++++
27 files changed, 1118 insertions(+), 926 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
----------------------------------------------------------------------
diff --git 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
index 01aa8db..6234c49 100644
--- 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
@@ -59,7 +59,7 @@ public class TemplatingServiceImpl implements TemplatingService {
private static final String TEMPLATE_STRING = "admin.ftl";
private static final String DEFAULT_REST_PATH = "/doc/rest/";
private static final String DEFAULT_REST_FILE = "overview-summary.html";
- private static final String DEFAULT_STYLE = "screen";
+ private static final String DEFAULT_STYLE = "blue";
private static final String DEFAULT_TITLE_FOR_WEBSERVICES = "webservices";
private static final String DEFAULT_PROJECT = "marmotta";
@@ -121,7 +121,7 @@ public class TemplatingServiceImpl implements TemplatingService {
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);
try {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties
index 5c8ee00..ca6211c 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -60,7 +60,7 @@ kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png
kiwi.pages.project.custom.footer = Your Footer powered by <a href="http://marmotta.incubator.apache.org/">Apache Marmotta</a>.
# supported styles
-kiwi.pages.style = blue
+kiwi.pages.style_path = core/public/style/blue/
# allow the following origins for JavaScript webservice access (sets Access-Control-Allow-Origin header)
kiwi.allow_origin = *
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/config-descriptions.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-descriptions.properties b/platform/marmotta-core/src/main/resources/config-descriptions.properties
index 4fa6adf..6704eb5 100644
--- a/platform/marmotta-core/src/main/resources/config-descriptions.properties
+++ b/platform/marmotta-core/src/main/resources/config-descriptions.properties
@@ -47,8 +47,8 @@ kiwi.pages.startup.type = java.lang.String
kiwi.pages.project.description = Project for logo and footer
kiwi.pages.project.type = java.lang.Enum("marmotta"|"custom")
-kiwi.pages.style.description = stylesheet to use for LMF Admin page
-kiwi.pages.style.type = java.lang.Enum("blue"|"dark"|"white")
+kiwi.pages.style_path.description = path to stylesheets for LMF Admin page
+kiwi.pages.style.type = java.lang.String
kiwi.allow_origin.description = allow the following origins for JavaScript webservice access (sets Access-Control-Allow-Origin header); \
you can use the wildcard * to allow all origins
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/templates/404.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/404.ftl b/platform/marmotta-core/src/main/resources/templates/404.ftl
index a81d1ba..9775fe1 100644
--- a/platform/marmotta-core/src/main/resources/templates/404.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/404.ftl
@@ -23,15 +23,12 @@
<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
<head>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}" />
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>404 Not Found - Marmotta Linked Data Explorer</title>
<script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js" type="text/javascript" ></script>
- <link href="${SERVER_URL}core/public/style/style.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/dark.css" title="dark" rel="alternate stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/rdfhtml.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/404.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}/style.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}/rdfhtml.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}/404.css" rel="stylesheet" type="text/css" />
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 6be7d6b..a211682 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -25,11 +25,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}" />
- <link href="${SERVER_URL}core/public/style/javadoc.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/style.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/dark.css" title="dark" rel="alternate stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}javadoc.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}core/public/img/icon/lmf.ico" rel="SHORTCUT ICON">
<script type="text/javascript">
var _BASIC_URL = "${BASIC_URL}";
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/templates/admin_old.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin_old.ftl b/platform/marmotta-core/src/main/resources/templates/admin_old.ftl
deleted file mode 100644
index e658565..0000000
--- a/platform/marmotta-core/src/main/resources/templates/admin_old.ftl
+++ /dev/null
@@ -1,88 +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>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}">
- <link href="${SERVER_URL}core/public/style/javadoc.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/style1.css" title="screen" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/style2.css" title="beamer" rel="alternate stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/img/icon-small.ico" rel="SHORTCUT ICON">
- <script type="text/javascript">
- var _BASIC_URL = "${BASIC_URL}";
- //use _SERVER_URL for webservice calls
- var _SERVER_URL = "${SERVER_URL}";
- </script>
- <script type="text/javascript" src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
- <script type="text/javascript" src="${SERVER_URL}core/public/js/widgets/current-user.js"></script>
- <script type="text/javascript">
- $(function() {
- new LMF.currentUserWidget(_SERVER_URL, document.getElementById("login_logout")).init();
- });
- </script>
- ${HEAD}
- <title>LMF - The Linked Media Server</title>
- <style type="text/css">
- #login_logout {
- float: right;
- margin: 5px;
- }
- </style>
- </head>
- <body>
- <a id="top-link" href="${SERVER_URL}">TOPLINK</a>
- <div id="wrapper">
- <div id="header">
- <div id="logo">
- <a href="${SERVER_URL}"><img src="${SERVER_URL}core/public/img/lmf-white.png" /></a>
- </div>
- <div id="header_text">
- <h1>${CURRENT_MODULE} - ${CURRENT_TITLE}</h1>
- <div id="topnav">
- <div id="login_logout"></div>
- </div>
- </div>
- </div>
- <div class="clear"></div>
- <div id="left">
- <#list MODULE_MENU as menu>
- <h1>${menu.properties["title"]}</h1>
- <#list menu.submenu as submenu>
- <a href="${submenu.properties["path"]}"
- <#if submenu.properties["active"]> class="active" </#if>
- >${submenu.properties["title"]}</a>
- </#list>
- </#list>
- </div>
- <div id="center">
- ${CONTENT}
- </div>
- <div class="clear"></div>
- <div id="footer">
- <span>
- <a href="http://lmf.googlecode.com">LMF</a>
- is a project of
- <a href="http://www.newmedialab.at/">SNML-TNG</a>
- </span>
- </div>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
index 0c00297..1327e5b 100644
--- a/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/rdfhtml.ftl
@@ -25,10 +25,8 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta http-equiv="Default-Style" content="${DEFAULT_STYLE}">
<script type="text/javascript" src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
- <link href="${SERVER_URL}core/public/style/style.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/scheme/dark.css" title="dark" rel="alternate stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/style/rdfhtml.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
+ <link href="${SERVER_URL}${DEFAULT_STYLE}rdfhtml.css" rel="stylesheet" type="text/css" />
<script>
$(document).ready(function(){
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/404.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/404.css b/platform/marmotta-core/src/main/resources/web/public/style/404.css
deleted file mode 100644
index 9d3b62a..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/404.css
+++ /dev/null
@@ -1,44 +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.
- */
-
-div#header h1, div#center {
- width: auto;
- min-height: 400px;
- margin: 0;
-}
-
-div#center {
- padding: 2em 30% 2em 30%;
-}
-
-div#center {
- float: none;
- vertical-align: middle;
- padding: 2em 30% 5em 30%;
-}
-
-div#center > * {
- margin-top: 2em;
- font-size: 1.6em;
-}
-
-div#center > p > a > img {
- vertical-align: text-top;
- margin-left: 0.15em;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/404.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/404.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/404.css
new file mode 100644
index 0000000..fc35268
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/404.css
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+div#header h1, div#center {
+ width: auto;
+ min-height: 400px;
+ margin: 0;
+}
+
+div#center {
+ padding: 2em 30% 2em 30%;
+}
+
+div#center {
+ float: none;
+ vertical-align: middle;
+ padding: 2em 30% 5em 30%;
+}
+
+div#center > * {
+ margin-top: 2em;
+ font-size: 1.6em;
+}
+
+div#center > p > a > img {
+ vertical-align: text-top;
+ margin-left: 0.15em;
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/code.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/code.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/code.css
new file mode 100644
index 0000000..6310672
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/code.css
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+/* Code Style */
+
+pre.prettyprint {
+ color: #000;
+ white-space: normal !important;
+}
+
+pre.prettyprint .com {
+ color: #3f7f5f;
+}
+
+pre.prettyprint .lit {
+ color: #0000c0;
+}
+
+pre.prettyprint .str {
+ color: #2a00ff;
+}
+
+pre.prettyprint .typ {
+ color: #0000c0
+}
+
+pre.prettyprint .kwd {
+ color: #7f0055;
+}
+
+pre.prettyprint .pln {
+ color: #000;
+}
+
+pre.prettyprint .pun {
+ color: #444;
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/javadoc.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/javadoc.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/javadoc.css
new file mode 100644
index 0000000..1ee7e97
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/javadoc.css
@@ -0,0 +1,112 @@
+/**
+ * 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.
+ */
+.javadoc a {
+ color: #0B61A4;
+}
+.javadoc table.info {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+.javadoc table.info .TableCaption {
+ text-align: left;
+ background: #339de2;
+ font-weight: bold;
+ padding: 0.5em 1em;
+ border-top: thin solid black;
+ border-left: thin solid black;
+ border-right: thin solid black;
+ color:white;
+}
+
+.javadoc table.info th,
+.javadoc table.info td {
+ padding: 0.5em 1em;
+ border: thin solid black;
+}
+
+.javadoc table.info .TableHeader {
+ font-size: smaller;
+ text-align: center;
+ font-weight: bold;
+}
+
+.javadoc table.menu {
+ width: 100%;
+}
+
+.javadoc table.menu col {
+ width: 50%;
+}
+
+.javadoc span.comment {
+ color: gray;
+}
+
+.javadoc td.NavBarCell1 {
+ background-color: #CCCCCC;
+}
+
+.javadoc td.NavBarCell1 table {
+ padding: 0.3em 0.8em;
+ border-collapse: separate;
+}
+
+.javadoc td.NavBarCell1 table th.selected,
+.javadoc td.NavBarCell1 table a {
+ font-weight: bold;
+}
+
+.javadoc td.NavBarCell1 table th {
+ padding: 0.1em 0.3em;
+ background-color: transparent;
+ border: none;
+}
+
+.javadoc td.NavBarCell1 table th.selected {
+ background: #0B61A4;
+ color: white;
+}
+
+.javadoc .NavBarCell3 {
+ text-transform: uppercase;
+ font-size: small;
+}
+
+.javadoc .deep-resource {
+ font-size: smaller;
+}
+
+.javadoc table.examples {
+ width: 100%;
+}
+
+.javadoc table.examples td {
+ width: 50%;
+ vertical-align: top;
+}
+
+.javadoc .footer {
+ font-style: italic;
+ font-size: smaller;
+ color: gray;
+}
+
+.javadoc {
+ font-size:85%;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/rdfhtml.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/rdfhtml.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/rdfhtml.css
new file mode 100644
index 0000000..e35af18
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/rdfhtml.css
@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+p#rawrdf {
+ text-align: right;
+ font-size: 0.90em;
+ margin: 2em 1em 2em auto;
+}
+
+div#top_serialisation_links {
+ float: right;
+ margin-right: 5px;
+ margin-top: 61px;
+}
+
+div#top_serialisation_links a {
+ text-decoration: none;
+ font-size: 12px;
+ color: black;
+}
+
+#table_buttons {
+ margin-bottom: 10px;
+}
+
+@import "blue.css";
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/sgvizler.chart.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/sgvizler.chart.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/sgvizler.chart.css
new file mode 100644
index 0000000..e7cf008
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/sgvizler.chart.css
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+/*** sMap ***/
+
+div.sgvizler-sMap{
+ padding: 0;
+ margin: 0;
+ font-family: sans-serif;
+}
+div.sgvizler-sMap h1, div.sgvizler-sMap p{
+ font-size: 11pt;
+ margin: 2px 0 1px 0;
+}
+div.sgvizler-sMap p.text{
+ font-family: serif;
+}
+div.sgvizler-sMap div.img{
+ float: right;
+ padding: 10px;
+}
+
+/*** pForce ***/
+
+circle.node {
+ stroke: #999;
+ stroke-width: 0.5px;
+}
+
+line.link {
+ stroke: #999;
+ stroke-opacity: .6;
+}
+
+.nodetext {
+ pointer-events: none;
+ font: 10px sans-serif;
+ color: black;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
new file mode 100644
index 0000000..f5b5724
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
@@ -0,0 +1,279 @@
+/**
+ * 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;
+ background-color: #f0f0f0;
+}
+
+a {
+ color: #004ea4;
+}
+
+a:visited {
+ color: #004ea4;
+}
+
+#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;
+ background-color: white;
+ border-color: white;
+ box-shadow: 0px 0px 8px #555;
+}
+
+#content h1 {
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 3px;
+ background-color: #0B61A4;
+ border-color: #0B61A4;
+ color: white;
+}
+
+#content h2 {
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 3px;
+ background-color: white;
+ border-color: #0B61A4;
+ color: #0B61A4;
+}
+
+#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;
+ background-color: white;
+ border-color: black;
+}
+
+#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;
+ border-color: gray;
+}
+
+#footer_line span{
+ margin-top: 15px;
+ display: block;
+ padding-bottom: 10px;
+ color:#666;
+}
+
+.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;
+ border-color: white;
+ background-color: white;
+ box-shadow: 0px 0px 8px #555;
+}
+
+ul#menu li.menu_item {
+ list-style: none;
+ display: list-item;
+}
+
+ul#menu div.menu_heading {
+ padding: 5px 4px 5px 10px;
+ font-weight: bold;
+ background-color: #0B61A4;
+ color: white;
+}
+
+ul.submenu {
+ margin: 0;
+ padding: 2px 0 10px 0;
+}
+
+ul.submenu li {
+ list-style: none;
+ margin: 0;
+ line-height: 1.3;
+}
+
+ul.submenu li:hover {
+ background-color: #f0f0f0;
+}
+
+ul.submenu li.active {
+ background-color: #339de2;
+}
+
+ul.submenu li.active a {
+ color: white;
+}
+
+ul.submenu a {
+ text-decoration: none;
+ display: block;
+ padding: 0.2em 10px;
+ color: black;
+}
+
+/* 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;
+ background-color: #0B61A4;
+ color: #FFFFFF;
+ border-color:#333;
+}
+
+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;
+ background-color: #339de2;
+ color: white;
+}
+
+table.simple_table tr td{
+ font-size: 13px;
+ padding: 2px 5px;
+ text-align: left;
+ border-width: 1px;
+ border-style: solid;
+ color: black;
+ border-color: #333;
+}
+
+table.simple_table tr {
+ background-color: white;
+}
+
+table.simple_table tr.even {
+ background-color: #EFF9FF;
+}
+
+dl dt {
+ font-weight: bold;
+ position: relative;
+ top: 1em;
+ width: 12em;
+ text-align: right;
+ color: #0B61A4;
+}
+
+dd {
+ margin: 0 0 0 13em;
+ padding: 0 0 0 0.5em;
+}
+
+@import "blue.css";
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/code.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/code.css b/platform/marmotta-core/src/main/resources/web/public/style/code.css
deleted file mode 100644
index 6310672..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/code.css
+++ /dev/null
@@ -1,51 +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.
- */
-/* Code Style */
-
-pre.prettyprint {
- color: #000;
- white-space: normal !important;
-}
-
-pre.prettyprint .com {
- color: #3f7f5f;
-}
-
-pre.prettyprint .lit {
- color: #0000c0;
-}
-
-pre.prettyprint .str {
- color: #2a00ff;
-}
-
-pre.prettyprint .typ {
- color: #0000c0
-}
-
-pre.prettyprint .kwd {
- color: #7f0055;
-}
-
-pre.prettyprint .pln {
- color: #000;
-}
-
-pre.prettyprint .pun {
- color: #444;
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/javadoc.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/javadoc.css b/platform/marmotta-core/src/main/resources/web/public/style/javadoc.css
deleted file mode 100644
index 1ee7e97..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/javadoc.css
+++ /dev/null
@@ -1,112 +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.
- */
-.javadoc a {
- color: #0B61A4;
-}
-.javadoc table.info {
- width: 100%;
- border-collapse: collapse;
-}
-
-.javadoc table.info .TableCaption {
- text-align: left;
- background: #339de2;
- font-weight: bold;
- padding: 0.5em 1em;
- border-top: thin solid black;
- border-left: thin solid black;
- border-right: thin solid black;
- color:white;
-}
-
-.javadoc table.info th,
-.javadoc table.info td {
- padding: 0.5em 1em;
- border: thin solid black;
-}
-
-.javadoc table.info .TableHeader {
- font-size: smaller;
- text-align: center;
- font-weight: bold;
-}
-
-.javadoc table.menu {
- width: 100%;
-}
-
-.javadoc table.menu col {
- width: 50%;
-}
-
-.javadoc span.comment {
- color: gray;
-}
-
-.javadoc td.NavBarCell1 {
- background-color: #CCCCCC;
-}
-
-.javadoc td.NavBarCell1 table {
- padding: 0.3em 0.8em;
- border-collapse: separate;
-}
-
-.javadoc td.NavBarCell1 table th.selected,
-.javadoc td.NavBarCell1 table a {
- font-weight: bold;
-}
-
-.javadoc td.NavBarCell1 table th {
- padding: 0.1em 0.3em;
- background-color: transparent;
- border: none;
-}
-
-.javadoc td.NavBarCell1 table th.selected {
- background: #0B61A4;
- color: white;
-}
-
-.javadoc .NavBarCell3 {
- text-transform: uppercase;
- font-size: small;
-}
-
-.javadoc .deep-resource {
- font-size: smaller;
-}
-
-.javadoc table.examples {
- width: 100%;
-}
-
-.javadoc table.examples td {
- width: 50%;
- vertical-align: top;
-}
-
-.javadoc .footer {
- font-style: italic;
- font-size: smaller;
- color: gray;
-}
-
-.javadoc {
- font-size:85%;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css b/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
deleted file mode 100644
index 65ef3c4..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
+++ /dev/null
@@ -1,40 +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.
- */
-
-p#rawrdf {
- text-align: right;
- font-size: 0.90em;
- margin: 2em 1em 2em auto;
-}
-
-div#top_serialisation_links {
- float: right;
- margin-right: 5px;
- margin-top: 61px;
-}
-
-div#top_serialisation_links a {
- text-decoration: none;
- font-size: 12px;
- color: black;
-}
-
-#table_buttons {
- margin-bottom: 10px;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/scheme/blue.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/scheme/blue.css b/platform/marmotta-core/src/main/resources/web/public/style/scheme/blue.css
deleted file mode 100644
index f458ed4..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/scheme/blue.css
+++ /dev/null
@@ -1,126 +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.
- */
-/* just a test, how color management could work */
-html,body {
- background-color: #f0f0f0;
-}
-
-a {
- color: #004ea4;
-}
-
-a:visited {
- color: #004ea4;
-}
-
-#content {
- background-color: white;
- border-color: white;
- box-shadow: 0px 0px 8px #555;
-}
-
-#content h1 {
- background-color: #0B61A4;
- border-color: #0B61A4;
- color: white;
-}
-
-#content h1 a {
- color: white;
-}
-
-#content h2 {
- background-color: white;
- border-color: #0B61A4;
- color: #0B61A4;
-}
-
-#content pre {
- background-color: white;
- border-color: black;
-}
-
-#footer_line {
- border-color: gray;
-}
-
-#footer_line span{
- color:#666;
-}
-
-ul#menu {
- border-color: white;
- background-color: white;
- box-shadow: 0px 0px 8px #555;
-}
-
-ul#menu div.menu_heading {
- background-color: #0B61A4;
- color: white;
-}
-
-ul.submenu li:hover {
- background-color: #f0f0f0;
-}
-
-ul.submenu li.active {
- background-color: #339de2;
-}
-
-ul.submenu a {
- color: black;
-}
-
-ul.submenu li.active a {
- color: white;
-}
-
-table.simple_table tr.title td,
-table.simple_table th {
- background-color: #0B61A4;
- color: #FFFFFF;
- border-color:#333;
-}
-
-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 {
- background-color: #339de2;
- color: white;
-}
-
-table.simple_table tr td{
- color: black;
- border-color: #333;
-}
-
-table.simple_table tr {
- background-color: white;
-}
-
-table.simple_table tr.even {
- background-color: #EFF9FF;
-}
-
-dl dt {
- color: #0B61A4;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css b/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
deleted file mode 100644
index a02a10c..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
+++ /dev/null
@@ -1,165 +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.
- */
-
-/* main */
-html,body {
- background-color: #4d4d4d;
- color: #b5b5b5;
-}
-
-a {
- color: #6dcff5;
-}
-
-a:visited {
- color: #6dcff5;
-}
-
-#content {
- background-color: #2c2c2c;
- border-color: #b5b5b5;
- box-shadow: 0px 0px 8px black;
-}
-
-#content h1 {
- background-color: #2c2c2c;
- border-color: #b5b5b5;
- color: #b5b5b5;
-}
-
-#content h1 a {
- color: #b5b5b5;
-}
-
-#content h2 a {
- color: #6dcff5;
-}
-
-#content h2 {
- background-color: #b5b5b5;
- border-color: #2c2c2c;
- color: #2c2c2c;
-}
-
-#content pre {
- background-color: #2c2c2c;
- border-color: #b5b5b5;
-}
-
-#footer_line {
- border-color: #2c2c2c;
-}
-
-#footer_line span {
- color:#b5b5b5;
-}
-
-ul#menu {
- border-color: #b5b5b5;
- background-color: #4d4d4d;
- box-shadow: 0px 0px 8px black;
-}
-
-ul#menu div.menu_heading {
- background-color: #b5b5b5;
- color: #2c2c2c;
-}
-
-ul.submenu {
- background-color: #2c2c2c;
-}
-
-ul.submenu li:hover {
- background-color: #2c2c2c;
-}
-
-ul.submenu li.active {
- background-color: #6dcff5;
-}
-
-ul.submenu a {
- color: #b5b5b5;
-}
-
-ul.submenu li.active a {
- color: #2c2c2c;
-}
-
-table.simple_table tr.title td,
-table.simple_table th {
- background-color: #2c2c2c;
- color: #6dcff5;
- border-color:#b5b5b5;
-}
-
-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 {
- background-color: #b5b5b5;
- color: #2c2c2c;
-}
-
-table.simple_table tr td {
- color: #b5b5b5;
- border-color: #b5b5b5;
-}
-
-table.simple_table tr {
- background-color: #4d4d4d;
-}
-
-table.simple_table tr.even {
- background-color: #2c2c2c;
-}
-
-div#top_serialisation_links a {
- color: #6dcff5;
-}
-
-div#tab-raw-triples h2 {
- background-color: #4d4d4d;
-}
-
-table#add-new-prefix tr td {
- color: #4d4d4d;
-}
-
-table.config_datatable td {
- border-color: gray !important;
-}
-
-table.config_datatable td.config_tdtitle span {
- color: #b5b5b5;
-}
-
-table#security_rules tr.cls-PERMISSION td, table#security_rules tr.cls-RESTRICTION td {
- color: #2c2c2c;
- border-color: #2c2c2c;
-}
-
-.CodeMirror-scroll {
- background-color: #f7f7f7;
-}
-
-dl dt {
- color: #6dcff5;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/sgvizler.chart.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/sgvizler.chart.css b/platform/marmotta-core/src/main/resources/web/public/style/sgvizler.chart.css
deleted file mode 100644
index e7cf008..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/sgvizler.chart.css
+++ /dev/null
@@ -1,53 +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.
- */
-/*** sMap ***/
-
-div.sgvizler-sMap{
- padding: 0;
- margin: 0;
- font-family: sans-serif;
-}
-div.sgvizler-sMap h1, div.sgvizler-sMap p{
- font-size: 11pt;
- margin: 2px 0 1px 0;
-}
-div.sgvizler-sMap p.text{
- font-family: serif;
-}
-div.sgvizler-sMap div.img{
- float: right;
- padding: 10px;
-}
-
-/*** pForce ***/
-
-circle.node {
- stroke: #999;
- stroke-width: 0.5px;
-}
-
-line.link {
- stroke: #999;
- stroke-opacity: .6;
-}
-
-.nodetext {
- pointer-events: none;
- font: 10px sans-serif;
- color: black;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/style.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/style.css b/platform/marmotta-core/src/main/resources/web/public/style/style.css
deleted file mode 100644
index 8ce81a3..0000000
--- a/platform/marmotta-core/src/main/resources/web/public/style/style.css
+++ /dev/null
@@ -1,226 +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.
- */
-/* 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;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/404.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/404.css b/platform/marmotta-core/src/main/resources/web/public/style/white/404.css
new file mode 100644
index 0000000..9d3b62a
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/404.css
@@ -0,0 +1,44 @@
+/**
+ * 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.
+ */
+
+div#header h1, div#center {
+ width: auto;
+ min-height: 400px;
+ margin: 0;
+}
+
+div#center {
+ padding: 2em 30% 2em 30%;
+}
+
+div#center {
+ float: none;
+ vertical-align: middle;
+ padding: 2em 30% 5em 30%;
+}
+
+div#center > * {
+ margin-top: 2em;
+ font-size: 1.6em;
+}
+
+div#center > p > a > img {
+ vertical-align: text-top;
+ margin-left: 0.15em;
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/code.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/code.css b/platform/marmotta-core/src/main/resources/web/public/style/white/code.css
new file mode 100644
index 0000000..6310672
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/code.css
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+/* Code Style */
+
+pre.prettyprint {
+ color: #000;
+ white-space: normal !important;
+}
+
+pre.prettyprint .com {
+ color: #3f7f5f;
+}
+
+pre.prettyprint .lit {
+ color: #0000c0;
+}
+
+pre.prettyprint .str {
+ color: #2a00ff;
+}
+
+pre.prettyprint .typ {
+ color: #0000c0
+}
+
+pre.prettyprint .kwd {
+ color: #7f0055;
+}
+
+pre.prettyprint .pln {
+ color: #000;
+}
+
+pre.prettyprint .pun {
+ color: #444;
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/javadoc.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/javadoc.css b/platform/marmotta-core/src/main/resources/web/public/style/white/javadoc.css
new file mode 100644
index 0000000..1ee7e97
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/javadoc.css
@@ -0,0 +1,112 @@
+/**
+ * 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.
+ */
+.javadoc a {
+ color: #0B61A4;
+}
+.javadoc table.info {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+.javadoc table.info .TableCaption {
+ text-align: left;
+ background: #339de2;
+ font-weight: bold;
+ padding: 0.5em 1em;
+ border-top: thin solid black;
+ border-left: thin solid black;
+ border-right: thin solid black;
+ color:white;
+}
+
+.javadoc table.info th,
+.javadoc table.info td {
+ padding: 0.5em 1em;
+ border: thin solid black;
+}
+
+.javadoc table.info .TableHeader {
+ font-size: smaller;
+ text-align: center;
+ font-weight: bold;
+}
+
+.javadoc table.menu {
+ width: 100%;
+}
+
+.javadoc table.menu col {
+ width: 50%;
+}
+
+.javadoc span.comment {
+ color: gray;
+}
+
+.javadoc td.NavBarCell1 {
+ background-color: #CCCCCC;
+}
+
+.javadoc td.NavBarCell1 table {
+ padding: 0.3em 0.8em;
+ border-collapse: separate;
+}
+
+.javadoc td.NavBarCell1 table th.selected,
+.javadoc td.NavBarCell1 table a {
+ font-weight: bold;
+}
+
+.javadoc td.NavBarCell1 table th {
+ padding: 0.1em 0.3em;
+ background-color: transparent;
+ border: none;
+}
+
+.javadoc td.NavBarCell1 table th.selected {
+ background: #0B61A4;
+ color: white;
+}
+
+.javadoc .NavBarCell3 {
+ text-transform: uppercase;
+ font-size: small;
+}
+
+.javadoc .deep-resource {
+ font-size: smaller;
+}
+
+.javadoc table.examples {
+ width: 100%;
+}
+
+.javadoc table.examples td {
+ width: 50%;
+ vertical-align: top;
+}
+
+.javadoc .footer {
+ font-style: italic;
+ font-size: smaller;
+ color: gray;
+}
+
+.javadoc {
+ font-size:85%;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/rdfhtml.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/rdfhtml.css b/platform/marmotta-core/src/main/resources/web/public/style/white/rdfhtml.css
new file mode 100644
index 0000000..65ef3c4
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/rdfhtml.css
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+p#rawrdf {
+ text-align: right;
+ font-size: 0.90em;
+ margin: 2em 1em 2em auto;
+}
+
+div#top_serialisation_links {
+ float: right;
+ margin-right: 5px;
+ margin-top: 61px;
+}
+
+div#top_serialisation_links a {
+ text-decoration: none;
+ font-size: 12px;
+ color: black;
+}
+
+#table_buttons {
+ margin-bottom: 10px;
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/sgvizler.chart.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/sgvizler.chart.css b/platform/marmotta-core/src/main/resources/web/public/style/white/sgvizler.chart.css
new file mode 100644
index 0000000..e7cf008
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/sgvizler.chart.css
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+/*** sMap ***/
+
+div.sgvizler-sMap{
+ padding: 0;
+ margin: 0;
+ font-family: sans-serif;
+}
+div.sgvizler-sMap h1, div.sgvizler-sMap p{
+ font-size: 11pt;
+ margin: 2px 0 1px 0;
+}
+div.sgvizler-sMap p.text{
+ font-family: serif;
+}
+div.sgvizler-sMap div.img{
+ float: right;
+ padding: 10px;
+}
+
+/*** pForce ***/
+
+circle.node {
+ stroke: #999;
+ stroke-width: 0.5px;
+}
+
+line.link {
+ stroke: #999;
+ stroke-opacity: .6;
+}
+
+.nodetext {
+ pointer-events: none;
+ font: 10px sans-serif;
+ color: black;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7d85fc7/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
----------------------------------------------------------------------
diff --git 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
new file mode 100644
index 0000000..49f8166
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
@@ -0,0 +1,226 @@
+/**
+ * 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;
+}
+
[4/8] git commit: sgvizler bugfix
Posted by tk...@apache.org.
sgvizler bugfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/fc74e3c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/fc74e3c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/fc74e3c9
Branch: refs/heads/master
Commit: fc74e3c9956029371467609abd7fe6c9613865e1
Parents: f9de6f3
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 11:27:41 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 11:27:41 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/templates/admin.ftl | 3 +++
.../src/main/resources/web/admin/dataview.html | 2 ++
.../resources/web/admin/js/lib/sgvizler.pack.js | 4 +++-
3 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index a211682..6b8e84f 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -32,6 +32,9 @@
var _BASIC_URL = "${BASIC_URL}";
//use _SERVER_URL for webservice calls
var _SERVER_URL = "${SERVER_URL}";
+
+ var _CURRENT_STYLE = "${DEFAULT_STYLE}";
+
</script>
<#if USER_MODULE_IS_ACTIVE>
<link href="${SERVER_URL}user/admin/style/style.css" rel="stylesheet" type="text/css">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/platform/marmotta-core/src/main/resources/web/admin/dataview.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/dataview.html b/platform/marmotta-core/src/main/resources/web/admin/dataview.html
index 1420e94..eec7574 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/dataview.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/dataview.html
@@ -38,6 +38,8 @@
sgvizler.option.libfolder = "js/lib/";
+ sgvizler.option.stylepath = _SERVER_URL + _CURRENT_STYLE;
+
sgvizler.option.query.endpoint = SERVER_URL+"sparql/select";
sgvizler.option.query.endpoint_output = 'json';
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js b/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
index a1c4d93..b847cc2 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
+++ b/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
@@ -53,7 +53,7 @@
}
// load stylesheet
- $('head').append('<link rel="stylesheet" href="../../../core/public/style/sgvizler.chart.css" type="text/css" />');
+ $('head').append('<link rel="stylesheet" href="'+this.option.stylepath+'sgvizler.chart.css" type="text/css" />');
},
drawFormQuery: function () {
@@ -103,6 +103,8 @@
homefolder: "",
libfolder: "/lib/",
+ stylepath:"",
+
//// Prefixes included in queries:
namespace: {
'rdf' : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
[2/8] git commit: fixes cors problems
Posted by tk...@apache.org.
fixes cors problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6029baec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6029baec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6029baec
Branch: refs/heads/master
Commit: 6029baec9e10bca9dbca317092505122cc922e8d
Parents: c7d85fc
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 10:26:26 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 10:26:26 2013 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/web.xml | 3 +-
.../platform/core/filters/MarmottaCorsFilter.java | 100 +++++++++++++
.../marmotta/platform/core/util/CorsHandler.java | 90 ++++++++++++
.../platform/core/test/cors/CorsFilterTest.java | 111 +++++++++++++++
.../sparql/webservices/SparqlWebService.java | 3 +-
5 files changed, 305 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6029baec/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
index 2f53049..1e417bf 100644
--- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
@@ -60,6 +60,7 @@
</filter-mapping>
<!-- handle OPTIONS requests -->
+ <!--
<filter>
<filter-name>MarmottaOptionsFilter</filter-name>
<filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class>
@@ -68,7 +69,7 @@
<filter-name>MarmottaOptionsFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+ -->
<!-- Serve static resources from file system and from .jar files of the respective modules -->
<filter>
<filter-name>MarmottaResourceFilter</filter-name>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6029baec/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
new file mode 100644
index 0000000..8828135
--- /dev/null
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
@@ -0,0 +1,100 @@
+/*
+ * 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.marmotta.platform.core.filters;
+
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.modules.MarmottaHttpFilter;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.util.CorsHandler;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ...
+ * <p/>
+ * Author: Thomas Kurz (tkurz@apache.org)
+ */
+@ApplicationScoped
+public class MarmottaCorsFilter implements MarmottaHttpFilter {
+
+ public static Map<String,Object> options;
+
+ @Inject
+ ConfigurationService configurationService;
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ initializeOptions();
+ }
+
+ public void configChanged(@Observes ConfigurationChangedEvent event) {
+ if (event.getKeys().contains("kiwi.allow_origin")
+ || event.getKeys().contains("kiwi.allow_methods")) {
+ initializeOptions();
+ }
+ }
+
+ private void initializeOptions() {
+ options = new HashMap<String,Object>();
+ options.put("Access-Control-Allow-Origin",configurationService.getStringConfiguration("kiwi.allow_origin","*"));
+ options.put("Access-Control-Allow-Methods", configurationService.getStringConfiguration("kiwi.allow_methods","POST, PUT, GET, DELETE, HEAD"));
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ if(response instanceof HttpServletResponse) {
+ HttpServletResponse resp = (HttpServletResponse)response;
+ HttpServletRequest req = (HttpServletRequest)request;
+
+ String origin = req.getHeader("Origin");
+
+ if(origin != null) {
+ CorsHandler.run(req,resp,options);
+ }
+
+ if(req.getMethod().equalsIgnoreCase("OPTIONS")) {
+ resp.setStatus(200);
+ }
+ }
+ chain.doFilter(request,response);
+ }
+
+ @Override
+ public void destroy() {
+ //
+ }
+
+ @Override
+ public String getPattern() {
+ return "^/.*";
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6029baec/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
new file mode 100644
index 0000000..abd6b61
--- /dev/null
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
@@ -0,0 +1,90 @@
+/*
+ * 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.marmotta.platform.core.util;
+
+import org.apache.commons.lang.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ...
+ * <p/>
+ * Author: Thomas Kurz (tkurz@apache.org)
+ */
+public class CorsHandler {
+
+ private static final String[] CORS_HEADERS= {
+ "Access-Control-Allow-Origin",
+ "Access-Control-Expose-Headers",
+ "Access-Control-Max-Age",
+ "Access-Control-Allow-Credentials",
+ "Access-Control-Allow-Methods",
+ "Access-Control-Allow-Headers"};
+
+ /**
+ * This method sets the response headers for CORS request. The options may contain following fields:
+ * <ul>
+ * <li>
+ * "Access-Control-Allow-Origin" : List<String> | "*"
+ * </li>
+ * <li>
+ * "Access-Control-Expose-Headers" : List<String>
+ * </li>
+ * <li>
+ * "Access-Control-Max-Age" : long
+ * </li>
+ * <li>
+ * "Access-Control-Allow-Credentials" : boolean
+ * </li>
+ * <li>
+ * "Access-Control-Allow-Methods" : List<String>
+ * </li>
+ * <li>
+ * "Access-Control-Allow-Headers" : List<String>
+ * </li>
+ * </ul>
+ * @param request the HTTP servlet request
+ * @param response the HTTP servlet response
+ * @param options the options
+ */
+ public static void run(HttpServletRequest request, HttpServletResponse response, Map<String,Object> options) {
+
+ //remove all existing cors headers
+ for(String header : CORS_HEADERS) {
+ response.setHeader(header,null);
+ }
+
+ //add headers from options
+ for(String key : options.keySet()) {
+ response.addHeader(key,buildHeader(options.get(key)));
+ }
+
+ }
+
+ private static String buildHeader(Object value) {
+ if(value instanceof List) {
+ return StringUtils.join((List)value,",");
+ }
+ return value.toString();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6029baec/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
new file mode 100644
index 0000000..52390fe
--- /dev/null
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.marmotta.platform.core.test.cors;
+
+import com.google.common.collect.Lists;
+import com.jayway.restassured.RestAssured;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
+import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import static com.jayway.restassured.RestAssured.given;
+
+/**
+ * ...
+ * <p/>
+ * Author: Thomas Kurz (tkurz@apache.org)
+ */
+public class CorsFilterTest {
+
+ private static JettyMarmotta marmotta;
+ private static ConfigurationService configurationService;
+
+ @BeforeClass
+ public static void setUp() {
+ marmotta = new JettyMarmotta("/marmotta", ConfigurationWebService.class);
+ configurationService = marmotta.getService(ConfigurationService.class);
+
+ RestAssured.baseURI = "http://localhost";
+ RestAssured.port = marmotta.getPort();
+ RestAssured.basePath = marmotta.getContext();
+
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ marmotta.shutdown();
+ }
+
+ /**
+ * Sparql Service should use the basic cors functionality
+ */
+ @Test
+ public void testCorsRequestOnSparqlService() throws UnsupportedEncodingException {
+
+ //options request
+ given().header("Origin", "http://otherhost.com").
+ expect().statusCode(200).
+ expect().header("Access-Control-Allow-Origin", "*").
+ expect().header("Access-Control-Allow-Methods","POST, PUT, GET, DELETE, HEAD").
+ when().options("/config/list");
+
+ //change configuration and retry
+ configurationService.setConfiguration("Access-Control-Allow-Origin","http://otherhost.com");
+
+ given().header("Origin", "http://otherhost.com").
+ expect().statusCode(200).
+ expect().header("Access-Control-Allow-Origin", "http://otherhost.com").
+ expect().header("Access-Control-Allow-Methods","POST, PUT, GET, DELETE, HEAD").
+ when().options("/config/list");
+
+ //get request
+ given().header("Origin", "http://otherhost.com").
+ given().header("Content-Type","application/json").
+ given().content("[\"test\"]").
+ expect().statusCode(200).
+ expect().header("Access-Control-Allow-Origin", "http://otherhost.com").
+ expect().header("Access-Control-Allow-Methods","POST, PUT, GET, DELETE, HEAD").
+ when().post("/config/data/key");
+
+ }
+
+ /**
+ * resource Service should overwrite the basic cors functionality
+ */
+ @Test
+ public void testCorsRequestOnResourceService() {
+ //change configuration
+ configurationService.setConfiguration("Access-Control-Allow-Origin","http://my.host.com");
+
+ //options request
+ given().header("Origin", "http://otherhost.com").
+ expect().statusCode(201).
+ expect().header("Access-Control-Allow-Origin", "*").
+ expect().header("Access-Control-Allow-Methods","POST, PUT, GET, DELETE, HEAD").
+ when().post("/resource/123");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6029baec/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index f15f6df..b6d520e 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -185,7 +185,7 @@ public class SparqlWebService {
*
* @param reqHeaders
* @return responde
- */
+
@OPTIONS
@Path(UPDATE)
public Response optionsResourceRemote(@HeaderParam("Access-Control-Request-Headers") String reqHeaders) {
@@ -200,6 +200,7 @@ public class SparqlWebService {
.build();
}
+ */
/**
* Execute a SPARQL 1.1 tuple query on the LMF triple store using the query passed as form parameter to the
[5/8] git commit: deleted some files only used for testing
Posted by tk...@apache.org.
deleted some files only used for testing
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c8d07165
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c8d07165
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c8d07165
Branch: refs/heads/master
Commit: c8d071656a257093b99d0f5ead64fb20db654fa1
Parents: fc74e3c
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 11:50:58 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 11:50:58 2013 +0200
----------------------------------------------------------------------
.../platform/core/filters/MarmottaCorsFilter.java | 100 ---------------
.../marmotta/platform/core/util/CorsHandler.java | 90 -------------
2 files changed, 0 insertions(+), 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c8d07165/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
deleted file mode 100644
index 8828135..0000000
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/MarmottaCorsFilter.java
+++ /dev/null
@@ -1,100 +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.marmotta.platform.core.filters;
-
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
-import org.apache.marmotta.platform.core.api.modules.MarmottaHttpFilter;
-import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
-import org.apache.marmotta.platform.core.util.CorsHandler;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * ...
- * <p/>
- * Author: Thomas Kurz (tkurz@apache.org)
- */
-@ApplicationScoped
-public class MarmottaCorsFilter implements MarmottaHttpFilter {
-
- public static Map<String,Object> options;
-
- @Inject
- ConfigurationService configurationService;
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- initializeOptions();
- }
-
- public void configChanged(@Observes ConfigurationChangedEvent event) {
- if (event.getKeys().contains("kiwi.allow_origin")
- || event.getKeys().contains("kiwi.allow_methods")) {
- initializeOptions();
- }
- }
-
- private void initializeOptions() {
- options = new HashMap<String,Object>();
- options.put("Access-Control-Allow-Origin",configurationService.getStringConfiguration("kiwi.allow_origin","*"));
- options.put("Access-Control-Allow-Methods", configurationService.getStringConfiguration("kiwi.allow_methods","POST, PUT, GET, DELETE, HEAD"));
- }
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- if(response instanceof HttpServletResponse) {
- HttpServletResponse resp = (HttpServletResponse)response;
- HttpServletRequest req = (HttpServletRequest)request;
-
- String origin = req.getHeader("Origin");
-
- if(origin != null) {
- CorsHandler.run(req,resp,options);
- }
-
- if(req.getMethod().equalsIgnoreCase("OPTIONS")) {
- resp.setStatus(200);
- }
- }
- chain.doFilter(request,response);
- }
-
- @Override
- public void destroy() {
- //
- }
-
- @Override
- public String getPattern() {
- return "^/.*";
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c8d07165/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
deleted file mode 100644
index abd6b61..0000000
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CorsHandler.java
+++ /dev/null
@@ -1,90 +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.marmotta.platform.core.util;
-
-import org.apache.commons.lang.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ...
- * <p/>
- * Author: Thomas Kurz (tkurz@apache.org)
- */
-public class CorsHandler {
-
- private static final String[] CORS_HEADERS= {
- "Access-Control-Allow-Origin",
- "Access-Control-Expose-Headers",
- "Access-Control-Max-Age",
- "Access-Control-Allow-Credentials",
- "Access-Control-Allow-Methods",
- "Access-Control-Allow-Headers"};
-
- /**
- * This method sets the response headers for CORS request. The options may contain following fields:
- * <ul>
- * <li>
- * "Access-Control-Allow-Origin" : List<String> | "*"
- * </li>
- * <li>
- * "Access-Control-Expose-Headers" : List<String>
- * </li>
- * <li>
- * "Access-Control-Max-Age" : long
- * </li>
- * <li>
- * "Access-Control-Allow-Credentials" : boolean
- * </li>
- * <li>
- * "Access-Control-Allow-Methods" : List<String>
- * </li>
- * <li>
- * "Access-Control-Allow-Headers" : List<String>
- * </li>
- * </ul>
- * @param request the HTTP servlet request
- * @param response the HTTP servlet response
- * @param options the options
- */
- public static void run(HttpServletRequest request, HttpServletResponse response, Map<String,Object> options) {
-
- //remove all existing cors headers
- for(String header : CORS_HEADERS) {
- response.setHeader(header,null);
- }
-
- //add headers from options
- for(String key : options.keySet()) {
- response.addHeader(key,buildHeader(options.get(key)));
- }
-
- }
-
- private static String buildHeader(Object value) {
- if(value instanceof List) {
- return StringUtils.join((List)value,",");
- }
- return value.toString();
- }
-
-}
[6/8] git commit: component does not work at the moment
Posted by tk...@apache.org.
component does not work at the moment
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8fbf37d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8fbf37d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8fbf37d6
Branch: refs/heads/master
Commit: 8fbf37d67034288234f21bed43b858c60a5aa805
Parents: c8d0716
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 11:52:43 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 11:52:43 2013 +0200
----------------------------------------------------------------------
.../platform/core/test/cors/CorsFilterTest.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8fbf37d6/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
index 52390fe..09e9ba2 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/cors/CorsFilterTest.java
@@ -39,7 +39,7 @@ import static com.jayway.restassured.RestAssured.given;
* Author: Thomas Kurz (tkurz@apache.org)
*/
public class CorsFilterTest {
-
+ /*
private static JettyMarmotta marmotta;
private static ConfigurationService configurationService;
@@ -58,10 +58,12 @@ public class CorsFilterTest {
public static void tearDown() {
marmotta.shutdown();
}
+ */
/**
* Sparql Service should use the basic cors functionality
*/
+ /*
@Test
public void testCorsRequestOnSparqlService() throws UnsupportedEncodingException {
@@ -91,10 +93,11 @@ public class CorsFilterTest {
when().post("/config/data/key");
}
-
+ */
/**
* resource Service should overwrite the basic cors functionality
*/
+ /*
@Test
public void testCorsRequestOnResourceService() {
//change configuration
@@ -107,5 +110,5 @@ public class CorsFilterTest {
expect().header("Access-Control-Allow-Methods","POST, PUT, GET, DELETE, HEAD").
when().post("/resource/123");
}
-
+ */
}
[3/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by tk...@apache.org.
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/master
Commit: f9de6f31105195da3c7a1ff57e7d9cd906b76cc8
Parents: 6029bae 560fca4
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 11:27:06 2013 +0200
Committer: tkurz <tk...@apache.org>
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;
+}
+
[7/8] git commit: add active status to module menu items
Posted by tk...@apache.org.
add active status to module menu items
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d134dfee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d134dfee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d134dfee
Branch: refs/heads/master
Commit: d134dfee3f4f58d2ce5d154f99f40854dabf6f93
Parents: 8fbf37d
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 12:49:20 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 12:49:20 2013 +0200
----------------------------------------------------------------------
.../services/templating/TemplatingServiceImpl.java | 3 +++
.../src/main/resources/templates/admin.ftl | 10 ++++++++--
.../main/resources/web/public/style/blue/style.css | 7 ++++++-
.../resources/web/public/style/white/style.css | 6 ++++++
4 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
----------------------------------------------------------------------
diff --git 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
index d7ba882..5e4fcb5 100644
--- 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
@@ -254,9 +254,11 @@ public class TemplatingServiceImpl implements TemplatingService {
if(path.startsWith((String)menuItem.getProperties().get("baseurl"))) {
module = (String)menuItem.getProperties().get("title");
}
+ menuItem.getProperties().put("active",false);
for(MenuItem submenu : menuItem.getSubmenu()) {
if(submenu.getProperties().get("path").equals(path)) {
submenu.getProperties().put("active",true);
+ menuItem.getProperties().put("active",true);
module = (String)menuItem.getProperties().get("title");
active = true;
} else {
@@ -271,6 +273,7 @@ public class TemplatingServiceImpl implements TemplatingService {
for(MenuItem submenu : menuItem.getSubmenu()) {
if(submenu.getProperties().get("title").equals(DEFAULT_TITLE_FOR_WEBSERVICES)) {
submenu.getProperties().put("active",true);
+ menuItem.getProperties().put("active",true);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 6b8e84f..7d8d7a1 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -66,8 +66,14 @@
<div id="left">
<ul id="menu">
<#list MODULE_MENU as menu>
- <li class="menu_item">
- <div class="menu_heading">${menu.properties["title"]}</div>
+ <li
+ <#if menu.properties["active"]>
+ class="menu_item active"
+ <#else>
+ class="menu_item"
+ </#if>
+ >
+ <div class="menu_heading"><a href="${menu.submenu[0].properties["path"]}">${menu.properties["title"]}</a></div>
<ul class="submenu">
<#list menu.submenu as submenu>
<li
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
index f5b5724..5918683 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css
@@ -179,9 +179,14 @@ ul#menu li.menu_item {
ul#menu div.menu_heading {
padding: 5px 4px 5px 10px;
- font-weight: bold;
background-color: #0B61A4;
+
+}
+
+ul#menu div.menu_heading a {
color: white;
+ font-weight: bold;
+ text-decoration: none;
}
ul.submenu {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/web/public/style/white/style.css
----------------------------------------------------------------------
diff --git 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
index d787917..11d4781 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
@@ -158,6 +158,12 @@ ul#menu div.menu_heading {
font-weight: bold;
}
+ul#menu div.menu_heading a {
+ color: black;
+ font-weight: bold;
+ text-decoration: none;
+}
+
ul.submenu {
margin: 0;
padding: 2px 0 10px 0;
[8/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by tk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/85f427cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/85f427cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/85f427cf
Branch: refs/heads/master
Commit: 85f427cf5518b4dd7d690f232aaf51a5b567f953
Parents: d134dfe d5055d6
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 12:51:13 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 12:51:13 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/installer/LICENSE.txt | 35 +
.../src/main/resources/installer/NOTICE.txt | 28 +
launchers/marmotta-webapp/LICENSE.txt | 2862 +++++++++++++++
launchers/marmotta-webapp/NOTICE.txt | 317 ++-
launchers/marmotta-webapp/pom.xml | 2 +-
.../src/main/doc/LICENSE.txt | 750 +++--
.../src/main/doc/NOTICE.txt | 220 +-
license-mappings.xml | 43 +-
8 files changed, 3756 insertions(+), 501 deletions(-)
----------------------------------------------------------------------