Repository: marmotta Updated Branches: refs/heads/develop 0ddf43952 -> 0f78b5e24
MARMOTTA-579: Do not use hard-coded path for /tmp, use java system property instead. Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/147d5a2c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/147d5a2c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/147d5a2c Branch: refs/heads/develop Commit: 147d5a2c07583bda9f03df387d3a7e9473ff60b5 Parents: 0ddf439 Author: Jakob Frank <[email protected]> Authored: Mon Dec 15 11:36:15 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Mon Dec 15 11:36:15 2014 +0100 ---------------------------------------------------------------------- .../archetype-resources/src/test/resources/test-config.properties | 2 +- .../marmotta-webapp/src/test/resources/test-config.properties | 2 +- .../src/main/resources/config-defaults.properties | 2 +- .../marmotta-core/src/main/resources/config-defaults.properties | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/147d5a2c/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties index abe01db..c43ffd3 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties @@ -24,7 +24,7 @@ ${symbol_pound} KiWi version kiwi.version = 1.99.1 ${symbol_pound} KiWi home directory (for configuration files etc) -kiwi.home = /tmp/kiwi-test +kiwi.home = ${symbol_dollar}{sys:java.io.tmpdir}${symbol_dollar}{sys:file.separator}kiwi-test ${symbol_pound} directory where KiWi stores the triple index for SPARQL queries (using Sesame) sesame.home = ${symbol_dollar}{kiwi.home}/triples http://git-wip-us.apache.org/repos/asf/marmotta/blob/147d5a2c/launchers/marmotta-webapp/src/test/resources/test-config.properties ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/test/resources/test-config.properties b/launchers/marmotta-webapp/src/test/resources/test-config.properties index da1a4a3..b412157 100644 --- a/launchers/marmotta-webapp/src/test/resources/test-config.properties +++ b/launchers/marmotta-webapp/src/test/resources/test-config.properties @@ -21,7 +21,7 @@ kiwi.version = 1.99.1 # KiWi home directory (for configuration files etc) -kiwi.home = /tmp/kiwi-test +kiwi.home = ${sys:java.io.tmpdir}${sys:file.separator}kiwi-test # directory where KiWi stores the triple index for SPARQL queries (using Sesame) sesame.home = ${kiwi.home}/triples http://git-wip-us.apache.org/repos/asf/marmotta/blob/147d5a2c/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties index 0e33673..fe1f4ea 100644 --- a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties +++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties @@ -58,7 +58,7 @@ database.fulltext.languages = en,de # Hibernate-specific configuration for H2 database.h2.driver = org.h2.Driver -database.h2.url = jdbc:h2:/tmp/kiwi/db/kiwi;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10 +database.h2.url = jdbc:h2:${sys:java.io.tmpdir}${sys:file.separator}kiwi/db/kiwi;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10 # Hibernate-specific configuration for PostgreSQL database.postgres.driver = org.postgresql.Driver http://git-wip-us.apache.org/repos/asf/marmotta/blob/147d5a2c/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 3073c5b..4bc8374 100644 --- a/platform/marmotta-core/src/main/resources/config-defaults.properties +++ b/platform/marmotta-core/src/main/resources/config-defaults.properties @@ -21,7 +21,7 @@ ############################################################################### # KiWi home directory (for configuration files etc) -marmotta.home = /tmp/marmotta +marmotta.home = ${sys:java.io.tmpdir}${sys:file.separator}marmotta # base URI of this KiWi installation; used for constructing resource URIs kiwi.context = http://localhost:8080/ @@ -125,7 +125,6 @@ logging.file.debug.keep = 30 content.filesystem.reader=org.apache.marmotta.platform.core.services.content.FileSystemContentReader content.filesystem.writer=org.apache.marmotta.platform.core.services.content.FileSystemContentWriter content.filesystem.pattern=(${pattern.quote:marmotta.home}/resources|${pattern.quote:kiwi.context}resource/|urn:).* -#content.filesystem.pattern=file:/tmp/.* content.filesystem.enabled=true # if enabled allow only access to resources stored in the work directory content.filesystem.secure=true
