You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/03/17 09:54:51 UTC
[07/11] git commit: more lmf cleanup
more lmf cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1ca8577c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1ca8577c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1ca8577c
Branch: refs/heads/MARMOTTA-450
Commit: 1ca8577c61d77a0c3cede911f7423a73bf277592
Parents: 0550b39
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Mar 12 16:56:15 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Mar 12 16:56:15 2014 +0100
----------------------------------------------------------------------
.../main/resources/config-defaults.properties | 26 +++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1ca8577c/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 ba80bbf..8d7ae29 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -17,7 +17,7 @@
#
###############################################################################
-# LMF core configuration
+# Core configuration
###############################################################################
# KiWi home directory (for configuration files etc)
@@ -32,16 +32,16 @@ kiwi.host = http://localhost:8080/
#the path of the KiWi installation, e.g. /, /marmotta, /LMF or /KiWi
kiwi.path = /
-# true if the LMF system host configuration has been set up, do not change
+# true if the system host configuration has been set up, do not change
kiwi.setup.host = false
-# true if the LMF system database configuration has been set up, do not change
+# true if the system database configuration has been set up, do not change
kiwi.setup.database = false
# kiwi startup page
kiwi.pages.startup = core/admin/about.html
-# lmf default style
+# default style
kiwi.pages.project = marmotta
# marmotta logo
@@ -50,10 +50,10 @@ kiwi.pages.project.marmotta.logo = core/public/img/logo/marmotta-logo.png
# marmotta footer
kiwi.pages.project.marmotta.footer = Copyright © 2013-2014 The Apache Software Foundation, Licensed under the <a href\="\#">Apache License, Version 2.0.</a><br>Apache, Marmotta, the Apache feather and Marmotta logos are trademarks of The Apache Software Foundation.
-# lmf logo
+# custom logo
kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png
-# lmf footer
+# custom footer
kiwi.pages.project.custom.footer = Your Footer powered by <a href="http://marmotta.apache.org/">Apache Marmotta</a>.
# supported styles
@@ -66,17 +66,14 @@ debug.enabled = false
# according to HTTP
linkeddata.redirect.status = 303
-
# determines whether to issue a redirect for PUT requests; if set to true, the resource service will return
# a redirect to the actual content or metadata location for the resource, resulting in a second request to be issued
# by the browser; if set to false, the resource service directly processes the content/metadata upload
linkeddata.redirect.put = false
-
# default rel value for resource interaction with HTTP (MUST be 'meta' or 'content')
linkeddata.mime.rel.default = meta
-
# sort menu entries by weight instead of alphabet
templating.sort_by_weight = true
@@ -122,7 +119,6 @@ logging.file.debug.keep = 30
# Content Readers and Writers (in case a resource is requested with ;rel=content
###############################################################################
-
# a reader/writer for content stored in the file system; by default, this is applied to all resources that have
# a file:/ URI. It is disabled by default, because it potentially allows reading/writing all files in the file system
# to only enable reading but disable writing, remove the content.filesystem.writer property
@@ -131,12 +127,12 @@ content.filesystem.writer=org.apache.marmotta.platform.core.services.content.Fil
content.filesystem.pattern=(${marmotta.home}/resources|${kiwi.context}resource/|urn:).*
#content.filesystem.pattern=file:/tmp/.*
content.filesystem.enabled=true
-# if enabled allow only access to resources stored in the LMF work directory
+# if enabled allow only access to resources stored in the work directory
content.filesystem.secure=true
# a reader for content stored on a remote HTTP server; by default, this is applied to all resources that are not in
-# the context of the LMF web application; enabled by default, because it is a safe operation
+# the context of the web application; enabled by default, because it is a safe operation
content.http.reader=org.apache.marmotta.platform.core.services.content.HTTPContentReader
content.http.pattern=(?!${kiwi.context}resource)http://.*
content.http.enabled=false
@@ -157,7 +153,7 @@ resources.servercache.enabled = false
###############################################################################
-# LMF importer configuration
+# Importer configuration
###############################################################################
# generate KiWi title and text content for each imported resource in the RDF importer
@@ -167,14 +163,14 @@ importer.generate_descriptions = false
importer.batchsize = 50
###############################################################################
-# LMF Statistics Module
+# Statistics Module
###############################################################################
# whether collecting statistics about the execution should be enabled on start or not
statistics.enabled = true
###############################################################################
-# LMF Default Prefixes
+# Default Prefixes
###############################################################################
# prefixes mappings