Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/gc/LoggingGCMonitor.java =================================================================== --- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/gc/LoggingGCMonitor.java (revision 1802477) +++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/gc/LoggingGCMonitor.java (working copy) @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.jackrabbit.oak.segment.compaction; +package org.apache.jackrabbit.oak.spi.gc; -import org.apache.jackrabbit.oak.spi.gc.GCMonitor; import org.slf4j.Logger; /** Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java (revision 1802477) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java (nonexistent) @@ -1,75 +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. - */ - -package org.apache.jackrabbit.oak.segment.compaction; - -import org.apache.jackrabbit.oak.spi.gc.GCMonitor; -import org.slf4j.Logger; - -/** - * This {@code GCMonitor} implementation logs all calls to its - * {@link #info(String, Object...)}, {@link #warn(String, Object...)}, - * {@link #error(String, Exception)} and {@link #skipped(String, Object...)} - * methods at the respective levels using the logger instance passed to the - * constructor. - */ -public class LoggingGCMonitor implements GCMonitor { - private final Logger log; - - /** - * New instance logging to {@code log} - * @param log - */ - public LoggingGCMonitor(Logger log) { - this.log = log; - } - - @Override - public void info(String message, Object... arguments) { - log.info(message, arguments); - } - - @Override - public void warn(String message, Object... arguments) { - log.warn(message, arguments); - } - - @Override - public void error(String message, Exception exception) { - log.error(message, exception); - } - - @Override - public void skipped(String reason, Object... arguments) { - log.info(reason, arguments); - } - - @Override - public void compacted() { - } - - @Override - public void cleaned(long reclaimedSize, long currentSize) { - } - - @Override - public void updateStatus(String status) { - - } -} Property changes on: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/LoggingGCMonitor.java ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (revision 1802477) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (working copy) @@ -43,12 +43,12 @@ import org.apache.jackrabbit.oak.segment.RecordCache; import org.apache.jackrabbit.oak.segment.SegmentNotFoundExceptionListener; import org.apache.jackrabbit.oak.segment.WriterCacheManager; -import org.apache.jackrabbit.oak.segment.compaction.LoggingGCMonitor; import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions; import org.apache.jackrabbit.oak.segment.file.tar.IOMonitor; import org.apache.jackrabbit.oak.segment.file.tar.IOMonitorAdapter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.gc.GCMonitor; +import org.apache.jackrabbit.oak.spi.gc.LoggingGCMonitor; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory;