You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/02/28 08:40:38 UTC
[1/2] git commit: renaming some old stuff
renaming some old stuff
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/31bd1ae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/31bd1ae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/31bd1ae7
Branch: refs/heads/master
Commit: 31bd1ae7e3a846d37cf15073512b19fac997a8e7
Parents: f72ba36
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 28 08:32:22 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 28 08:32:22 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/config-defaults.properties | 12 ++++++------
.../main/resources/config-descriptions.properties | 5 ++---
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/31bd1ae7/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 df1baf6..dd45cc8 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -21,19 +21,19 @@
###############################################################################
# KiWi home directory (for configuration files etc)
-marmotta.home = /tmp/lmf
+marmotta.home = /tmp/marmotta
# directory where KiWi stores the search index for SOLR search
solr.home = /tmp/lmf/solr
# base URI of this KiWi installation; used for constructing resource URIs
-kiwi.context = http://localhost:8080/LMF/
+kiwi.context = http://localhost:8080/
# base URL of the KiWi installation; used for accessing additional web services like SOLR and H2
-kiwi.host = http://localhost:8080/LMF/
+kiwi.host = http://localhost:8080/
-#the path of the KiWi installation, e.g. /LMF or /KiWi
-kiwi.path = /LMF
+#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
kiwi.setup.host = false
@@ -51,7 +51,7 @@ kiwi.pages.project = marmotta
kiwi.pages.project.marmotta.logo = core/public/img/logo/marmotta-logo.png
# marmotta footer
-kiwi.pages.project.marmotta.footer = Copyright © 2013 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.
+kiwi.pages.project.marmotta.footer = Copyright © 2013 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
kiwi.pages.project.custom.logo = core/public/img/logo/custom-logo.png
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/31bd1ae7/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 31f1fe4..4fa6adf 100644
--- a/platform/marmotta-core/src/main/resources/config-descriptions.properties
+++ b/platform/marmotta-core/src/main/resources/config-descriptions.properties
@@ -20,7 +20,7 @@
# LMF core configuration
###############################################################################
-marmotta.home.description = KiWi home directory (for configuration files etc)
+marmotta.home.description = home directory (for configuration files etc)
marmotta.home.type = java.lang.String
solr.home.description = directory where KiWi stores the search index for SOLR search
@@ -141,8 +141,7 @@ content.http.enabled.type = java.lang.Boolean
# Resource Filter configuration
###############################################################################
-resources.browsercache.enabled.description = enable/disable browser caching of static resources; if enabled, the \
- KiWiResourceFilter will set appropriate Expires: headers in the response
+resources.browsercache.enabled.description = enable/disable browser caching of static resources; if enabled, the KiWiResourceFilter will set appropriate Expires\: headers in the response
resources.browsercache.enabled.type = java.lang.Boolean
resources.browsercache.seconds.description = ow many seconds should the Expires-header set for expiration of static resources?