Author: chetanm
Date: Thu May 21 16:15:38 2015
New Revision: 1680918
URL: http://svn.apache.org/r1680918
Log:
Fix the corrupted xml which probably got checked in with conflicts in
http://svn.apache.org/r1680711
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/resources/logback-test.xml
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/resources/logback-test.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/resources/logback-test.xml?rev=1680918&r1=1680917&r2=1680918&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/resources/logback-test.xml
(original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/resources/logback-test.xml
Thu May 21 16:15:38 2015
@@ -1,48 +1,38 @@
- <!--
- 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.
- -->
+<!--
+ 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">
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L)
%msg%n</pattern>
+ <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L)
%msg%n</pattern>
</encoder>
-</appender>
+ </appender>
-<appender name="file" class="ch.qos.logback.core.FileAppender">
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
<file>target/unit-tests.log</file>
<encoder>
- <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L)
%msg%n</pattern>
+ <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L)
%msg%n</pattern>
</encoder>
-</appender>
+ </appender>
-<<<<<<< HEAD
- <root level="INFO">
- <!--
- <appender-ref ref="console"/>
- -->
- <appender-ref ref="file"/>
- </root>
-=======
-<root level="INFO">
+ <root level="INFO">
<!--
<appender-ref ref="console"/>
-->
<appender-ref ref="file"/>
-</root>
-
->>>>>>> 7941858... OAK-2897 Regression - lookupOnValidate does not work
+ </root>
</configuration>
