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/04/08 17:56:16 UTC
[1/3] git commit: added indexes to speed up garbage collection
Updated Branches:
refs/heads/master 7b7869edf -> 0825b6828
added indexes to speed up garbage collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/69c112d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/69c112d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/69c112d3
Branch: refs/heads/master
Commit: 69c112d32e87ecf360ce08c01020678be29a8d20
Parents: b5872e2
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Apr 8 17:35:13 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Apr 8 17:35:13 2013 +0200
----------------------------------------------------------------------
.../persistence/h2/create_versioning_tables.sql | 2 ++
.../kiwi/persistence/h2/drop_versioning_tables.sql | 2 ++
.../persistence/mysql/create_versioning_tables.sql | 2 ++
.../persistence/mysql/drop_versioning_tables.sql | 2 ++
.../persistence/pgsql/create_versioning_tables.sql | 2 ++
.../persistence/pgsql/drop_versioning_tables.sql | 2 ++
6 files changed, 12 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_versioning_tables.sql
index bfb450a..9d584f0 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_versioning_tables.sql
@@ -34,7 +34,9 @@ CREATE TABLE versions_removed (
);
CREATE INDEX idx_versions_added ON versions_added(version_id);
+CREATE INDEX idx_versions_added_tid ON versions_added(triple_id);
CREATE INDEX idx_versions_removed ON versions_removed(version_id);
+CREATE INDEX idx_versions_removed_tid ON versions_removed(triple_id);
CREATE INDEX idx_versions_created ON versions(createdAt);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_versioning_tables.sql
index f86fe6a..a3416ee 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_versioning_tables.sql
@@ -14,6 +14,8 @@
-- limitations under the License.
DROP INDEX IF EXISTS idx_versions_added;
DROP INDEX IF EXISTS idx_versions_removed;
+DROP INDEX IF EXISTS idx_versions_added_tid;
+DROP INDEX IF EXISTS idx_versions_removed_tid;
DROP INDEX IF EXISTS idx_versions_created;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_versioning_tables.sql
index 9792c21..80a4d82 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/create_versioning_tables.sql
@@ -40,6 +40,8 @@ CREATE TABLE versions_removed (
);
CREATE INDEX idx_versions_added ON versions_added(version_id);
+CREATE INDEX idx_versions_added_tid ON versions_added(triple_id);
CREATE INDEX idx_versions_removed ON versions_removed(version_id);
+CREATE INDEX idx_versions_removed_tid ON versions_removed(triple_id);
CREATE INDEX idx_versions_created ON versions(createdAt);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/drop_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/drop_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/drop_versioning_tables.sql
index 4b9537e..c7b40cf 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/drop_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/drop_versioning_tables.sql
@@ -13,7 +13,9 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
DROP INDEX idx_versions_added on versions_added;
+DROP INDEX idx_versions_added_tid on versions_added;
DROP INDEX idx_versions_removed on versions_removed;
+DROP INDEX idx_versions_removed_tid on versions_removed;
DROP INDEX idx_versions_created on versions;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_versioning_tables.sql
index af8a19c..69f65ec 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/create_versioning_tables.sql
@@ -34,6 +34,8 @@ CREATE TABLE versions_removed (
);
CREATE INDEX idx_versions_added ON versions_added(version_id);
+CREATE INDEX idx_versions_added_tid ON versions_added(triple_id);
CREATE INDEX idx_versions_removed ON versions_removed(version_id);
+CREATE INDEX idx_versions_removed_tid ON versions_removed(triple_id);
CREATE INDEX idx_versions_created ON versions(createdAt);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69c112d3/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/drop_versioning_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/drop_versioning_tables.sql b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/drop_versioning_tables.sql
index b6f60ec..961b906 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/drop_versioning_tables.sql
+++ b/libraries/kiwi/kiwi-versioning/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/drop_versioning_tables.sql
@@ -14,6 +14,8 @@
-- limitations under the License.
DROP INDEX idx_versions_added;
DROP INDEX idx_versions_removed;
+DROP INDEX idx_versions_added_tid;
+DROP INDEX idx_versions_removed_tid;
DROP INDEX idx_versions_created;
DROP TABLE IF EXISTS versions_added;
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by ss...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0825b682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0825b682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0825b682
Branch: refs/heads/master
Commit: 0825b682872590bd65a46e2578ceaab3dd281e4f
Parents: 1aa3a81 7b7869e
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Apr 8 17:56:06 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Apr 8 17:56:06 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/logback.xml | 47 +-
.../src/main/webapp/WEB-INF/jetty-web.xml | 48 +-
.../src/main/webapp/search/test_luke.html | 44 -
.../src/main/webapp/skosjs-extension/test.html | 35 -
.../src/main/webapp/solr/admin/_info.jsp | 121 ---
.../src/main/webapp/solr/admin/action.jsp | 90 --
.../src/main/webapp/solr/admin/analysis.jsp | 505 -----------
.../src/main/webapp/solr/admin/analysis.xsl | 179 ----
.../src/main/webapp/solr/admin/dataimport.jsp | 56 --
.../src/main/webapp/solr/admin/debug.jsp | 109 ---
.../main/webapp/solr/admin/distributiondump.jsp | 156 ----
.../src/main/webapp/solr/admin/form.jsp | 140 ---
.../src/main/webapp/solr/admin/get-file.jsp | 73 --
.../src/main/webapp/solr/admin/get-properties.jsp | 27 -
.../src/main/webapp/solr/admin/header.jsp | 47 -
.../src/main/webapp/solr/admin/index.jsp | 162 ----
.../src/main/webapp/solr/admin/meta.xsl | 34 -
.../src/main/webapp/solr/admin/ping.jsp | 50 --
.../src/main/webapp/solr/admin/ping.xsl | 71 --
.../src/main/webapp/solr/admin/raw-schema.jsp | 39 -
.../src/main/webapp/solr/admin/registry.jsp | 109 ---
.../src/main/webapp/solr/admin/registry.xsl | 321 -------
.../main/webapp/solr/admin/replication/header.jsp | 92 --
.../main/webapp/solr/admin/replication/index.jsp | 382 --------
.../src/main/webapp/solr/admin/schema.jsp | 677 ---------------
.../src/main/webapp/solr/admin/solr-admin.css | 214 -----
.../src/main/webapp/solr/admin/solr_small.png | Bin 7926 -> 0 bytes
.../src/main/webapp/solr/admin/stats.jsp | 94 --
.../src/main/webapp/solr/admin/stats.xsl | 220 -----
.../src/main/webapp/solr/admin/tabular.xsl | 141 ---
.../src/main/webapp/solr/admin/threaddump.jsp | 111 ---
.../src/main/webapp/solr/admin/threaddump.xsl | 103 ---
.../src/main/webapp/solr/index.jsp | 64 --
.../src/test/resources/META-INF/beans.xml | 30 +-
.../test/resources/META-INF/test-persistence.xml | 30 +-
.../src/test/resources/WEB-INF/test-web.xml | 30 +-
.../src/test/resources/arquillian.xml | 30 +-
.../src/test/resources/ehcache.xml | 32 +-
.../src/test/resources/jndi.properties | 2 -
.../src/test/resources/logback.xml | 30 +-
.../src/test/resources/test-config.properties | 4 +-
.../org/apache/marmotta/client/test/demo-data.foaf | 28 +-
.../commons/sesame/model/LiteralCommonsTest.java | 15 -
.../commons/sesame/model/ResourceUtilsTest.java | 15 -
.../marmotta/commons/sesame/model/demo-data.foaf | 30 +-
.../commons/sesame/rio/ical/TestICalParser.java | 21 +-
.../commons/sesame/rio/rss/TestAtomParser.java | 21 +-
.../commons/sesame/rio/rss/TestRSSParser.java | 21 +-
.../commons/sesame/rio/vcard/TestVCardParser.java | 15 -
.../Start Apache Marmotta.app/Contents/Info.plist | 29 +-
.../Stop Apache Marmotta.app/Contents/Info.plist | 29 +-
launchers/marmotta-webapp/pom.xml | 1 -
.../src/test/resources/META-INF/beans.xml | 30 +-
.../test/resources/META-INF/test-persistence.xml | 30 +-
.../src/test/resources/WEB-INF/test-web.xml | 30 +-
.../src/test/resources/arquillian.xml | 29 +-
.../marmotta-webapp/src/test/resources/ehcache.xml | 32 +-
.../src/test/resources/jndi.properties | 2 -
.../marmotta-webapp/src/test/resources/logback.xml | 30 +-
.../src/test/resources/test-config.properties | 4 +-
.../org/apache/marmotta/kiwi/test/demo-data.foaf | 29 +-
.../apache/marmotta/kiwi/test/srfg-ontology.rdf | 32 +-
.../marmotta/kiwi/versioning/test/version-base.rdf | 31 +-
.../kiwi/versioning/test/version-update1.rdf | 31 +-
.../kiwi/versioning/test/version-update2.rdf | 31 +-
.../marmotta/ldpath/backend/file/ParserTest.java | 15 -
.../marmotta/ldpath/backend/file/PathTest.java | 15 -
.../marmotta/ldpath/backend/file/demo-data.foaf | 30 +-
parent/pom.xml | 9 +-
.../src/test/resources/META-INF/beans.xml | 30 +-
.../src/test/resources/ehcache-db.xml | 32 +-
.../src/test/resources/ehcache-lmf.xml | 32 +-
.../src/test/resources/logback-testing.xml | 30 +-
.../marmotta-core/src/test/resources/logback.xml | 30 +-
.../platform/core/test/sesame/demo-data.foaf | 30 +-
.../marmotta-sparql/src/test/resources/foaf.rdf | 18 +-
76 files changed, 492 insertions(+), 5094 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: fixed some warnings and log messages in the test
output
Posted by ss...@apache.org.
fixed some warnings and log messages in the test output
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1aa3a819
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1aa3a819
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1aa3a819
Branch: refs/heads/master
Commit: 1aa3a8198d618ea9d25f3518b64b5b6dc2f2dcc1
Parents: 69c112d
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Apr 8 17:56:00 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Apr 8 17:56:00 2013 +0200
----------------------------------------------------------------------
.../kiwi/reasoner/engine/ReasoningEngine.java | 4 +-
.../kiwi/persistence/h2/drop_reasoner_tables.sql | 10 +++---
.../kiwi-reasoner/src/test/resources/logback.xml | 27 ---------------
.../marmotta/kiwi/persistence/KiWiDialect.java | 6 +++-
.../marmotta/kiwi/persistence/KiWiPersistence.java | 2 +-
.../src/test/resources/logback.xml | 6 ++--
.../kiwi-versioning/src/test/resources/logback.xml | 27 ---------------
.../src/test/resources/logback.xml | 6 ++--
.../src/test/resources/logback.xml | 6 ++--
.../ldcache-core/src/test/resources/logback.xml | 6 ++--
.../src/test/resources/logback.xml | 6 ++--
.../src/test/resources/logback.xml | 6 ++--
12 files changed, 31 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index c089a98..dd42ae5 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -189,7 +189,7 @@ public class ReasoningEngine implements TransactionListener {
public void notifyAddRule(Rule rule) {
startTask("Addition of rule " + rule.getName(), TASK_GROUP);
- log.info("processing new rule: {}", rule);
+ log.debug("processing new rule: {}", rule);
try {
updateTaskStatus("processing new rule ...");
@@ -360,7 +360,7 @@ public class ReasoningEngine implements TransactionListener {
long start2 = System.currentTimeMillis();
updateTaskStatus("reasoning over " + newTriples.size() + " new triples");
processRules(newTriples);
- log.info("REASONER: reasoning for {} new triples took {} ms overall",newTriples.size(),System.currentTimeMillis()-start2);
+ log.debug("REASONER: reasoning for {} new triples took {} ms overall",newTriples.size(),System.currentTimeMillis()-start2);
}
if(data.getRemovedTriples().size() > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-reasoner/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_reasoner_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_reasoner_tables.sql b/libraries/kiwi/kiwi-reasoner/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_reasoner_tables.sql
index 96cbf71..64ea8ab 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_reasoner_tables.sql
+++ b/libraries/kiwi/kiwi-reasoner/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/drop_reasoner_tables.sql
@@ -12,11 +12,11 @@
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
-DROP INDEX idx_justification_triple;
-DROP INDEX idx_just_supp_rules_just;
-DROP INDEX idx_just_supp_rules_rule;
-DROP INDEX idx_just_supp_triples_just;
-DROP INDEX idx_just_supp_triples_triple;
+DROP INDEX IF EXISTS idx_justification_triple;
+DROP INDEX IF EXISTS idx_just_supp_rules_just;
+DROP INDEX IF EXISTS idx_just_supp_rules_rule;
+DROP INDEX IF EXISTS idx_just_supp_triples_just;
+DROP INDEX IF EXISTS idx_just_supp_triples_triple;
DROP TABLE IF EXISTS reasoner_just_supp_rules;
DROP TABLE IF EXISTS reasoner_just_supp_triples;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml b/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- a/libraries/kiwi/kiwi-reasoner/src/test/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
- </appender>
- <root level="${root-level:-INFO}">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiDialect.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiDialect.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiDialect.java
index 9cd130e..e3650bb 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiDialect.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiDialect.java
@@ -119,7 +119,11 @@ public abstract class KiWiDialect {
log.warn("upgrade script {} -> {} not found or not readable!", i-1, i);
}
}
- return builder.toString();
+ if(builder.length() > 0) {
+ return builder.toString();
+ } else {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
index 3df970d..225c0d4 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
@@ -196,7 +196,7 @@ public class KiWiPersistence {
int version = connection.getDatabaseVersion();
String updateScript = dialect.getMigrationScript(version,scriptName);
- if(updateScript != null) {
+ if(updateScript != null && updateScript.length() > 0) {
log.info("upgrading existing KiWi database from version {} to version {}", version, dialect.getVersion());
ScriptRunner runner = new ScriptRunner(connection.getJDBCConnection(), false, false);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml b/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
+++ b/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml b/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- a/libraries/kiwi/kiwi-versioning/src/test/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
- </appender>
- <root level="${root-level:-INFO}">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml b/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aa3a819/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
@@ -17,9 +17,9 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>%d [%thread] %level %logger - %m%n</Pattern>
- </layout>
+ <encoder>
+ <pattern>%d [%thread] %level %logger - %m%n</pattern>
+ </encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>