Updated Branches:
  refs/heads/master 7a5f16534 -> 65db32558

test logging fixes (remove duplicate logback.xml)


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

Branch: refs/heads/master
Commit: 65db325583bfbb5cd33c45a9d49737878cfbe309
Parents: 7a5f165
Author: Sebastian Schaffert <[email protected]>
Authored: Mon Apr 8 18:07:36 2013 +0200
Committer: Sebastian Schaffert <[email protected]>
Committed: Mon Apr 8 18:07:36 2013 +0200

----------------------------------------------------------------------
 .../src/test/resources/logback.xml                 |    6 ++--
 .../ldclient-core/src/test/resources/logback.xml   |    6 ++--
 .../src/test/resources/logback.xml                 |   27 ---------------
 .../src/test/resources/logback.xml                 |   27 ---------------
 .../src/test/resources/logback.xml                 |   27 ---------------
 .../src/test/resources/logback.xml                 |   27 ---------------
 .../src/test/resources/logback.xml                 |   27 ---------------
 7 files changed, 6 insertions(+), 141 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/65db3255/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml 
b/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml
+++ b/libraries/kiwi/kiwi-transactions/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/65db3255/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
index 5b0617d..f20016d 100644
--- a/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-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/65db3255/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git 
a/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- 
a/libraries/ldclient/ldclient-provider-facebook/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/65db3255/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git 
a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- 
a/libraries/ldclient/ldclient-provider-mediawiki/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/65db3255/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git 
a/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- a/libraries/ldclient/ldclient-provider-rdf/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/65db3255/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git 
a/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- a/libraries/ldclient/ldclient-provider-vimeo/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/65db3255/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git 
a/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml 
b/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
deleted file mode 100644
index 5b0617d..0000000
--- 
a/libraries/ldclient/ldclient-provider-youtube/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

Reply via email to