marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [1/3] marmotta git commit: MARMOTTA-616: removed^Cll traces of 'database.mode' unused configuration
Date Tue, 15 Sep 2015 09:50:25 GMT
Repository: marmotta
Updated Branches:
  refs/heads/MARMOTTA-584 710d98a4f -> ad1333de1


MARMOTTA-616: removed^Cll traces of 'database.mode' unused configuration


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ab2d47a3
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ab2d47a3
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ab2d47a3

Branch: refs/heads/MARMOTTA-584
Commit: ab2d47a30e51cfd897cd87c96d5e2736d9c17482
Parents: 4adec76
Author: Sergio Fernández <wikier@apache.org>
Authored: Mon Sep 14 19:16:59 2015 +0200
Committer: Sergio Fernández <wikier@apache.org>
Committed: Mon Sep 14 19:16:59 2015 +0200

----------------------------------------------------------------------
 .../src/main/resources/config-defaults.properties             | 7 -------
 .../src/main/resources/config-descriptions.properties         | 4 ----
 .../core/services/config/ConfigurationServiceImpl.java        | 3 +--
 3 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/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 fe1f4ea..bf0d36a 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
@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-
 ###############################################################################
 # KiWi database configuration
 ###############################################################################
@@ -32,13 +31,9 @@ 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.triples.batchcommit = true
@@ -68,7 +63,6 @@ database.postgres.url = jdbc:postgresql://localhost:5432/lmf?prepareThreshold=3
 database.mysql.driver = com.mysql.jdbc.Driver
 database.mysql.url = jdbc:mysql://localhost:3306/lmf?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
 
-
 caching.literal.size = 100000
 caching.uri.size     = 500000
 caching.bnode.size   = 10000
@@ -82,4 +76,3 @@ clustering.address = 228.6.7.8
 clustering.port    = 46655
 clustering.backend = GUAVA
 
-

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/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 8fb658b..ea7aebd 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
@@ -31,9 +31,6 @@ 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
 
@@ -54,7 +51,6 @@ database.fulltext.enabled.type = java.lang.Boolean
 database.fulltext.languages.description = list of languages supported by fulltext search;
a fulltext index will be created for each language (PostgreSQL only)
 database.fulltext.languages.type = java.util.List
 
-
 caching.literal.size.description = size of literal lookup cache
 caching.literal.size.type = java.lang.Integer(10|0|*)
 caching.uri.size.description     = size of URI resource lookup cache

http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
index 52003e2..ed7b294 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
@@ -378,8 +378,7 @@ public class ConfigurationServiceImpl implements ConfigurationService
{
             if (db_type.equals("h2")) {
                 config.setProperty("database.url", "jdbc:h2:" + getHome() + "/db/marmotta;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10");
                 config.setProperty("database.user", "sa");
-                config.setProperty("database.password", "sa");
-                config.setProperty("database.mode", "create");
+                config.setProperty("database.password", "sa");;
             }
             config.setProperty("kiwi.setup.database", true);
         }


Mime
View raw message