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/develop Commit: 1aa3a8198d618ea9d25f3518b64b5b6dc2f2dcc1 Parents: 69c112d Author: Sebastian Schaffert <[email protected]> Authored: Mon Apr 8 17:56:00 2013 +0200 Committer: Sebastian Schaffert <[email protected]> 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"/>
