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 2013/11/08 17:59:02 UTC
git commit: bug fixes, dependency version updates (Weld and RestEasy)
Updated Branches:
refs/heads/develop eea9f0944 -> 83e42e292
bug fixes, dependency version updates (Weld and RestEasy)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/83e42e29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/83e42e29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/83e42e29
Branch: refs/heads/develop
Commit: 83e42e2924fe5d1b16476b6d72efec6d551f02f7
Parents: eea9f09
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Nov 8 17:58:57 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Nov 8 17:58:57 2013 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +--
.../backend/kiwi/KiWiStoreProvider.java | 1 +
.../resources/config-descriptions.properties | 2 +-
.../main/resources/config-defaults.properties | 49 --------------------
.../resources/config-descriptions.properties | 36 --------------
5 files changed, 5 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83e42e29/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3216b28..7f9af3d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,8 +38,8 @@
<properties>
<sesame.version>2.7.7</sesame.version>
<junit.version>4.11</junit.version>
- <weld.version>2.0.SP1</weld.version>
- <weld.core.version>2.0.4.Final</weld.core.version>
+ <weld.version>2.1.Final</weld.version>
+ <weld.core.version>2.1.0.Final</weld.core.version>
<rest.assured.version>1.7.1</rest.assured.version>
<hamcrest.version>1.3</hamcrest.version>
<tempus.fugit.version>1.1</tempus.fugit.version>
@@ -50,7 +50,7 @@
<postgresql.version>9.2-1003-jdbc4</postgresql.version>
<mysql.version>5.1.21</mysql.version>
<jetty.version>9.0.3.v20130506</jetty.version>
- <resteasy.version>3.0.4.Final</resteasy.version>
+ <resteasy.version>3.0.5.Final</resteasy.version>
</properties>
<prerequisites>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83e42e29/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java b/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java
index 578ba78..00bbbd8 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java
+++ b/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java
@@ -146,6 +146,7 @@ public class KiWiStoreProvider implements StoreProvider {
}
public void configurationChanged(@Observes ConfigurationChangedEvent e) {
+ log.info("configuration changed: {}", e.getKeys());
if(e.containsChangedKey(SPARQL_STRATEGY) ||
e.containsChangedKey(DATACENTER_ID) ||
e.containsChangedKey(FULLTEXT_ENABLED) ||
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83e42e29/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
index 8673886..49c53a2 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
@@ -20,7 +20,7 @@
###############################################################################
database.type.description = the database type (h2, postgres or mysql)
-database.type.type = java.lang.Enum("h2"|"postgres"|"mysql"|"oracle")
+database.type.type = java.lang.Enum("h2"|"postgres"|"mysql")
database.url.description = the URL to access the database
database.url.type = java.net.URL
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83e42e29/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 a7296f2..809c696 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -136,55 +136,6 @@ resources.browsercache.seconds = 3600
# enable/disable server-side caching of static resources
resources.servercache.enabled = false
-###############################################################################
-# LMF database configuration
-###############################################################################
-
-# the database type (h2, postgres or mysql)
-database.type = h2
-
-# the URL to access the database
-database.url =
-
-# the database user
-database.user =
-
-# the database password
-database.password =
-
-# the database mode (create, update or validate)
-database.mode =
-
-# report slow queries in the log (not thread safe)
-database.debug.slowqueries = false
-
-
-# turn on batch commits for database transactions (EXPERIMENTAL); if supported by the database backend, this can
-# lead to considerable performance improvements
-database.batchcommit = true
-
-# the maximum size of a batch before it is committed to the database; only applicable if batchcommit is enabled
-database.batchsize = 10000
-
-# generator to use for creating database IDs; possible values are uuid-time, uuid-random, sequence, memory, snowflake
-database.generator = snowflake
-
-# 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
-
-# Hibernate-specific configuration for PostgreSQL
-database.postgres.driver = org.postgresql.Driver
-database.postgres.url = jdbc:postgresql://localhost:5432/lmf?prepareThreshold=3
-
-# Hibernate-specific configuration for MySQL
-database.mysql.driver = com.mysql.jdbc.Driver
-database.mysql.url = jdbc:mysql://localhost:3306/lmf?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-
-# Hibernate-specific configuration for Oracle
-database.oracle.url = jdbc:oracle:thin:@//localhost:1521/XE
-database.oracle.driver = oracle.jdbc.OracleDriver
-
###############################################################################
# LMF importer configuration
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83e42e29/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 639376c..213fb6c 100644
--- a/platform/marmotta-core/src/main/resources/config-descriptions.properties
+++ b/platform/marmotta-core/src/main/resources/config-descriptions.properties
@@ -141,42 +141,6 @@ resources.servercache.enabled.description = enable/disable server-side caching o
resources.servercache.enabled.type = java.lang.Boolean
###############################################################################
-# Marmotta database configuration
-###############################################################################
-
-database.type.description = the database type (h2, postgres or mysql)
-database.type.type = java.lang.Enum("h2"|"postgres"|"mysql"|"oracle")
-
-database.url.description = the URL to access the database
-database.url.type = java.net.URL
-
-database.user.description = the database user
-database.user.type = java.lang.String
-
-database.password.description = the database password
-database.password.type = java.lang.String("password")
-
-database.mode.description = the database mode (create, update, validate or off)
-database.mode.type = java.lang.Enum("create"|"update"|"validate"|"off")
-
-database.debug.slowqueries.description = enable reporting of slow database queries (produces additional overhead and is not thread safe)
-database.debug.slowqueries.type = java.lang.Boolean
-
-database.batchcommit.description = turn on batch commits for database transactions (EXPERIMENTAL); if supported by the \
- database backend, this can lead to considerable performance improvements
-database.batchcommit.type = java.lang.Boolean
-
-database.batchsize.description = the maximum size of a batch before it is committed to the database; only applicable if \
- batchcommit is enabled
-database.batchsize.type = java.lang.Integer(10|0|*)
-
-database.generator.description = generator for creating database identifiers; uuid-time creates unique identifiers based \
- on time and machine, uuid-random creates random identifiers, sequence uses a database sequence, memory loads a database \
- sequence and increments in-memory (fast but requires exclusive database access), snowflake uses the Twitter Snowflake \
- algorithm (fast and reliable)
-database.generator.type = java.lang.Enum("uuid-time"|"uuid-random"|"sequence"|"memory"|"snowflake")
-
-###############################################################################
# Marmotta importer configuration
###############################################################################