GitHub/cyberduck
1
0
Fork 0
mirror of https://github.com/iterate-ch/cyberduck.git synced 2026-05-26 19:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to log4j2.

Browse Source
This commit is contained in:
Yves Langisch
2021-12-28 09:30:40 +01:00
committed by David Kocher
parent ac32f12a05
commit 60ae863e05
691 changed files with 2213 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
azure/src/main/java/ch/cyberduck/core/azure/AzureCopyFeature.java
+3 -2
View File
@@ -29,7 +29,8 @@ import ch.cyberduck.core.io.StreamListener;
import ch.cyberduck.core.preferences.HostPreferences;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.net.URI;
import java.net.URISyntaxException;
@@ -41,7 +42,7 @@ import com.microsoft.azure.storage.blob.BlobRequestOptions;
import com.microsoft.azure.storage.blob.CloudBlob;
public class AzureCopyFeature implements Copy {
private static final Logger log = Logger.getLogger(AzureCopyFeature.class);
private static final Logger log = LogManager.getLogger(AzureCopyFeature.class);
private final AzureSession session;
azure/src/main/java/ch/cyberduck/core/azure/AzureReadFeature.java
+3 -2
View File
@@ -33,7 +33,8 @@ import org.apache.commons.io.input.NullInputStream;
import org.apache.commons.io.input.ProxyInputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.InputStream;
@@ -48,7 +49,7 @@ import com.microsoft.azure.storage.blob.CloudBlob;
import com.microsoft.azure.storage.core.SR;
public class AzureReadFeature implements Read {
private static final Logger log = Logger.getLogger(AzureReadFeature.class);
private static final Logger log = LogManager.getLogger(AzureReadFeature.class);
private final AzureSession session;
azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java
+3 -2
View File
@@ -58,7 +58,8 @@ import ch.cyberduck.core.threading.CancelCallback;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHeaders;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.HttpsURLConnection;
@@ -77,7 +78,7 @@ import com.microsoft.azure.storage.StorageEvent;
import com.microsoft.azure.storage.blob.CloudBlobClient;
public class AzureSession extends SSLSession<CloudBlobClient> {
private static final Logger log = Logger.getLogger(AzureSession.class);
private static final Logger log = LogManager.getLogger(AzureSession.class);
private final OperationContext context
= new OperationContext();
azure/src/main/java/ch/cyberduck/core/azure/AzureWriteFeature.java
+3 -2
View File
@@ -41,7 +41,8 @@ import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.http.HttpHeaders;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import java.io.IOException;
@@ -60,7 +61,7 @@ import com.microsoft.azure.storage.blob.CloudBlockBlob;
import com.microsoft.azure.storage.core.SR;
public class AzureWriteFeature extends AppendWriteFeature<Void> implements Write<Void> {
private static final Logger log = Logger.getLogger(AzureWriteFeature.class);
private static final Logger log = LogManager.getLogger(AzureWriteFeature.class);
private final AzureSession session;
private final OperationContext context;
backblaze/src/main/java/ch/cyberduck/core/b2/B2AuthorizedUrlProvider.java
+3 -2
View File
@@ -28,7 +28,8 @@ import ch.cyberduck.core.exception.BackgroundException;
import ch.cyberduck.core.features.PromptUrlProvider;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.net.URI;
@@ -39,7 +40,7 @@ import java.util.TimeZone;
import synapticloop.b2.exception.B2ApiException;
public class B2AuthorizedUrlProvider implements PromptUrlProvider<Void, Void> {
private static final Logger log = Logger.getLogger(B2AuthorizedUrlProvider.class);
private static final Logger log = LogManager.getLogger(B2AuthorizedUrlProvider.class);
private final PathContainerService containerService
= new B2PathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2DeleteFeature.java
+3 -2
View File
@@ -25,7 +25,8 @@ import ch.cyberduck.core.exception.NotfoundException;
import ch.cyberduck.core.features.Delete;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.Map;
@@ -33,7 +34,7 @@ import java.util.Map;
import synapticloop.b2.exception.B2ApiException;
public class B2DeleteFeature implements Delete {
private static final Logger log = Logger.getLogger(B2DeleteFeature.class);
private static final Logger log = LogManager.getLogger(B2DeleteFeature.class);
private final PathContainerService containerService
= new B2PathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2ErrorResponseInterceptor.java
+3 -2
View File
@@ -28,14 +28,15 @@ import org.apache.http.client.HttpResponseException;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import synapticloop.b2.exception.B2ApiException;
public class B2ErrorResponseInterceptor extends DisabledServiceUnavailableRetryStrategy implements HttpRequestInterceptor {
private static final Logger log = Logger.getLogger(B2ErrorResponseInterceptor.class);
private static final Logger log = LogManager.getLogger(B2ErrorResponseInterceptor.class);
private static final int MAX_RETRIES = 1;
backblaze/src/main/java/ch/cyberduck/core/b2/B2ExceptionMappingService.java
+3 -2
View File
@@ -27,14 +27,15 @@ import ch.cyberduck.core.http.DefaultHttpResponseExceptionMappingService;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpResponseException;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.time.Duration;
import synapticloop.b2.exception.B2ApiException;
public class B2ExceptionMappingService extends AbstractExceptionMappingService<B2ApiException> {
private static final Logger log = Logger.getLogger(B2ExceptionMappingService.class);
private static final Logger log = LogManager.getLogger(B2ExceptionMappingService.class);
private final B2VersionIdProvider fileid;
backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeCopyFeature.java
+3 -2
View File
@@ -35,7 +35,8 @@ import ch.cyberduck.core.threading.ThreadPoolFactory;
import ch.cyberduck.core.transfer.TransferStatus;
import ch.cyberduck.core.worker.DefaultExceptionMappingService;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.ArrayList;
@@ -54,7 +55,7 @@ import static ch.cyberduck.core.b2.B2LargeUploadService.X_BZ_INFO_LARGE_FILE_SHA
import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
public class B2LargeCopyFeature implements Copy {
private static final Logger log = Logger.getLogger(B2LargeCopyFeature.class);
private static final Logger log = LogManager.getLogger(B2LargeCopyFeature.class);
private final PathContainerService containerService
= new B2PathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadPartService.java
+3 -2
View File
@@ -22,7 +22,8 @@ import ch.cyberduck.core.PathContainerService;
import ch.cyberduck.core.exception.BackgroundException;
import org.apache.commons.codec.binary.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,7 +39,7 @@ import synapticloop.b2.response.B2ListPartsResponse;
import synapticloop.b2.response.B2UploadPartResponse;
public class B2LargeUploadPartService {
private static final Logger log = Logger.getLogger(B2LargeUploadPartService.class);
private static final Logger log = LogManager.getLogger(B2LargeUploadPartService.class);
private final PathContainerService containerService
= new B2PathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadService.java
+3 -2
View File
@@ -38,7 +38,8 @@ import ch.cyberduck.core.transfer.SegmentRetryCallable;
import ch.cyberduck.core.transfer.TransferStatus;
import ch.cyberduck.core.worker.DefaultExceptionMappingService;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.security.MessageDigest;
@@ -59,7 +60,7 @@ import synapticloop.b2.response.BaseB2Response;
import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
public class B2LargeUploadService extends HttpUploadFeature<BaseB2Response, MessageDigest> {
private static final Logger log = Logger.getLogger(B2LargeUploadService.class);
private static final Logger log = LogManager.getLogger(B2LargeUploadService.class);
/**
* The maximum allowed parts in a multipart upload.
backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeature.java
+3 -2
View File
@@ -34,7 +34,8 @@ import ch.cyberduck.core.threading.DefaultRetryCallable;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -56,7 +57,7 @@ import synapticloop.b2.response.B2UploadPartResponse;
import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
public class B2LargeUploadWriteFeature implements MultipartWrite<B2StartLargeFileResponse> {
private static final Logger log = Logger.getLogger(B2LargeUploadWriteFeature.class);
private static final Logger log = LogManager.getLogger(B2LargeUploadWriteFeature.class);
private final PathContainerService containerService
= new B2PathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2ObjectListService.java
+3 -2
View File
@@ -31,7 +31,8 @@ import ch.cyberduck.core.io.Checksum;
import ch.cyberduck.core.preferences.HostPreferences;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.EnumSet;
@@ -47,7 +48,7 @@ import synapticloop.b2.response.B2ListFilesResponse;
import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
public class B2ObjectListService implements ListService {
private static final Logger log = Logger.getLogger(B2ObjectListService.class);
private static final Logger log = LogManager.getLogger(B2ObjectListService.class);
private final PathContainerService containerService
= new DefaultPathContainerService();
backblaze/src/main/java/ch/cyberduck/core/b2/B2SingleUploadService.java
+3 -2
View File
@@ -24,7 +24,8 @@ import ch.cyberduck.core.io.Checksum;
import ch.cyberduck.core.preferences.HostPreferences;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.InputStream;
@@ -36,7 +37,7 @@ import synapticloop.b2.response.B2FileResponse;
import synapticloop.b2.response.BaseB2Response;
public class B2SingleUploadService extends HttpUploadFeature<BaseB2Response, MessageDigest> {
private static final Logger log = Logger.getLogger(B2SingleUploadService.class);
private static final Logger log = LogManager.getLogger(B2SingleUploadService.class);
private final B2Session session;
private Write<BaseB2Response> writer;
backblaze/src/main/java/ch/cyberduck/core/b2/B2ThresholdCopyFeature.java
+3 -2
View File
@@ -23,10 +23,11 @@ import ch.cyberduck.core.io.StreamListener;
import ch.cyberduck.core.preferences.HostPreferences;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class B2ThresholdCopyFeature implements Copy {
private static final Logger log = Logger.getLogger(B2ThresholdCopyFeature.class);
private static final Logger log = LogManager.getLogger(B2ThresholdCopyFeature.class);
private final B2Session session;
private final B2VersionIdProvider fileid;
backblaze/src/main/java/ch/cyberduck/core/b2/B2ThresholdUploadService.java
+3 -2
View File
@@ -26,12 +26,13 @@ import ch.cyberduck.core.io.StreamListener;
import ch.cyberduck.core.preferences.HostPreferences;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import synapticloop.b2.response.BaseB2Response;
public class B2ThresholdUploadService implements Upload<BaseB2Response> {
private static final Logger log = Logger.getLogger(B2ThresholdUploadService.class);
private static final Logger log = LogManager.getLogger(B2ThresholdUploadService.class);
private final B2Session session;
private final B2VersionIdProvider fileid;
backblaze/src/main/java/ch/cyberduck/core/b2/B2VersionIdProvider.java
+3 -2
View File
@@ -27,7 +27,8 @@ import ch.cyberduck.core.features.VersionIdProvider;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
@@ -37,7 +38,7 @@ import synapticloop.b2.response.B2FileInfoResponse;
import synapticloop.b2.response.B2ListFilesResponse;
public class B2VersionIdProvider implements VersionIdProvider {
private static final Logger log = Logger.getLogger(B2VersionIdProvider.class);
private static final Logger log = LogManager.getLogger(B2VersionIdProvider.class);
private final PathContainerService containerService = new B2PathContainerService();
private final B2Session session;
backblaze/src/main/java/ch/cyberduck/core/b2/B2WriteFeature.java
+3 -2
View File
@@ -32,7 +32,8 @@ import ch.cyberduck.core.io.HashAlgorithm;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.HashMap;
@@ -50,7 +51,7 @@ import synapticloop.b2.response.BaseB2Response;
import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
public class B2WriteFeature extends AbstractHttpWriteFeature<BaseB2Response> implements Write<BaseB2Response> {
private static final Logger log = Logger.getLogger(B2WriteFeature.class);
private static final Logger log = LogManager.getLogger(B2WriteFeature.class);
private final PathContainerService containerService
= new B2PathContainerService();
binding/src/main/java/ch/cyberduck/binding/AlertController.java
+3 -2
View File
@@ -26,14 +26,15 @@ import ch.cyberduck.core.ProviderHelpServiceFactory;
import ch.cyberduck.core.local.BrowserLauncherFactory;
import ch.cyberduck.ui.InputValidator;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import org.rococoa.Rococoa;
import org.rococoa.cocoa.CGFloat;
import org.rococoa.cocoa.foundation.NSRect;
public abstract class AlertController extends SheetController implements SheetCallback, InputValidator {
private static final Logger log = Logger.getLogger(AlertController.class);
private static final Logger log = LogManager.getLogger(AlertController.class);
protected static final int SUBVIEWS_VERTICAL_SPACE = 4;
binding/src/main/java/ch/cyberduck/binding/BundleController.java
+3 -2
View File
@@ -31,10 +31,11 @@ import ch.cyberduck.core.Factory;
import ch.cyberduck.core.FactoryException;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public abstract class BundleController extends ProxyController {
private static final Logger log = Logger.getLogger(BundleController.class);
private static final Logger log = LogManager.getLogger(BundleController.class);
public static final NSMutableParagraphStyle PARAGRAPH_STYLE_LEFT_ALIGNMENT_TRUNCATE_MIDDLE;
public static final NSMutableParagraphStyle PARAGRAPH_STYLE_LEFT_ALIGNMENT_TRUNCATE_TAIL;
binding/src/main/java/ch/cyberduck/binding/ListDataSource.java
+3 -2
View File
@@ -26,13 +26,14 @@ import ch.cyberduck.binding.foundation.NSIndexSet;
import ch.cyberduck.binding.foundation.NSObject;
import ch.cyberduck.binding.foundation.NSURL;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSInteger;
import org.rococoa.cocoa.foundation.NSPoint;
import org.rococoa.cocoa.foundation.NSUInteger;
public abstract class ListDataSource extends ProxyController implements NSTableView.DataSource, NSDraggingSource {
private static final Logger log = Logger.getLogger(ListDataSource.class);
private static final Logger log = LogManager.getLogger(ListDataSource.class);
@Override
public void tableView_setObjectValue_forTableColumn_row(NSTableView view, NSObject value, NSTableColumn tableColumn, NSInteger row) {
binding/src/main/java/ch/cyberduck/binding/OutlineDataSource.java
+3 -2
View File
@@ -25,13 +25,14 @@ import ch.cyberduck.binding.foundation.NSArray;
import ch.cyberduck.binding.foundation.NSObject;
import ch.cyberduck.binding.foundation.NSURL;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSInteger;
import org.rococoa.cocoa.foundation.NSPoint;
import org.rococoa.cocoa.foundation.NSUInteger;
public abstract class OutlineDataSource extends ProxyController implements NSOutlineView.DataSource, NSDraggingSource {
private static final Logger log = Logger.getLogger(OutlineDataSource.class);
private static final Logger log = LogManager.getLogger(OutlineDataSource.class);
@Override
public void outlineView_setObjectValue_forTableColumn_byItem(final NSOutlineView outlineView, NSObject value,
binding/src/main/java/ch/cyberduck/binding/Proxy.java
+3 -2
View File
@@ -4,13 +4,14 @@ import ch.cyberduck.binding.foundation.NSNotificationCenter;
import ch.cyberduck.binding.foundation.NSObject;
import ch.cyberduck.binding.foundation.NSThread;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import org.rococoa.ID;
import org.rococoa.Rococoa;
public class Proxy {
private static final Logger log = Logger.getLogger(Proxy.class);
private static final Logger log = LogManager.getLogger(Proxy.class);
/**
* You need to keep a reference to the returned value for as long as it is
binding/src/main/java/ch/cyberduck/binding/ProxyController.java
+3 -2
View File
@@ -18,11 +18,12 @@ package ch.cyberduck.binding;
import ch.cyberduck.core.AbstractController;
import ch.cyberduck.core.threading.MainAction;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ID;
public class ProxyController extends AbstractController {
private static final Logger log = Logger.getLogger(ProxyController.class);
private static final Logger log = LogManager.getLogger(ProxyController.class);
private final Proxy proxy = new Proxy(this);
binding/src/main/java/ch/cyberduck/binding/SheetController.java
+3 -2
View File
@@ -22,11 +22,12 @@ import ch.cyberduck.binding.application.NSButton;
import ch.cyberduck.binding.application.SheetCallback;
import ch.cyberduck.ui.InputValidator;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ID;
public abstract class SheetController extends WindowController implements SheetCallback, InputValidator {
private static final Logger log = Logger.getLogger(SheetController.class);
private static final Logger log = LogManager.getLogger(SheetController.class);
private final NSApplication application = NSApplication.sharedApplication();
binding/src/main/java/ch/cyberduck/binding/SheetInvoker.java
+3 -2
View File
@@ -21,7 +21,8 @@ import ch.cyberduck.binding.application.SheetCallback;
import ch.cyberduck.binding.foundation.NSThread;
import ch.cyberduck.core.threading.DefaultMainAction;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import org.rococoa.ID;
@@ -32,7 +33,7 @@ import java.util.concurrent.CountDownLatch;
import com.google.common.util.concurrent.Uninterruptibles;
public class SheetInvoker extends ProxyController {
private static final Logger log = Logger.getLogger(SheetInvoker.class);
private static final Logger log = LogManager.getLogger(SheetInvoker.class);
/**
* Keep a reference to the sheet to protect it from being deallocated as a weak reference before the callback from
binding/src/main/java/ch/cyberduck/binding/ToolbarWindowController.java
+3 -2
View File
@@ -30,7 +30,8 @@ import ch.cyberduck.binding.foundation.NSObject;
import ch.cyberduck.core.preferences.Preferences;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import org.rococoa.Rococoa;
import org.rococoa.cocoa.foundation.NSPoint;
@@ -47,7 +48,7 @@ import java.util.Objects;
* A window controller with a toolbar populated from a tabbed view.
*/
public abstract class ToolbarWindowController extends WindowController implements NSToolbar.Delegate, NSTabView.Delegate {
private static final Logger log = Logger.getLogger(ToolbarWindowController.class);
private static final Logger log = LogManager.getLogger(ToolbarWindowController.class);
private final Preferences preferences = PreferencesFactory.get();
binding/src/main/java/ch/cyberduck/binding/WindowController.java
+3 -2
View File
@@ -30,7 +30,8 @@ import ch.cyberduck.core.LocaleFactory;
import ch.cyberduck.core.ProviderHelpServiceFactory;
import ch.cyberduck.core.local.BrowserLauncherFactory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import org.rococoa.ID;
import org.rococoa.cocoa.foundation.NSPoint;
@@ -40,7 +41,7 @@ import java.util.HashSet;
import java.util.Set;
public abstract class WindowController extends BundleController implements NSWindow.Delegate {
private static final Logger log = Logger.getLogger(WindowController.class);
private static final Logger log = LogManager.getLogger(WindowController.class);
protected static final String DEFAULT = LocaleFactory.localizedString("Default");
binding/src/main/java/ch/cyberduck/binding/application/AlertSheetReturnCodeMapper.java
+3 -2
View File
@@ -17,10 +17,11 @@ package ch.cyberduck.binding.application;
* Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch
*/
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public final class AlertSheetReturnCodeMapper {
private static final Logger log = Logger.getLogger(AlertSheetReturnCodeMapper.class);
private static final Logger log = LogManager.getLogger(AlertSheetReturnCodeMapper.class);
/**
* Translate return codes from sheet selection
binding/src/main/java/ch/cyberduck/binding/application/NSApplication.java
+3 -2
View File
@@ -25,7 +25,8 @@ import ch.cyberduck.binding.foundation.NSDictionary;
import ch.cyberduck.binding.foundation.NSNotification;
import ch.cyberduck.binding.foundation.NSObject;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ID;
import org.rococoa.ObjCClass;
import org.rococoa.Rococoa;
@@ -36,7 +37,7 @@ import org.rococoa.cocoa.foundation.NSUInteger;
public abstract class NSApplication extends NSObject {
private static final _Class CLASS = Rococoa.createClass("NSApplication", _Class.class); //$NON-NLS-1$
private static final Logger log = Logger.getLogger(NSApplication.class);
private static final Logger log = LogManager.getLogger(NSApplication.class);
public interface Delegate {
/**
bonjour/src/main/java/ch/cyberduck/core/bonjour/AbstractRendezvous.java
+3 -2
View File
@@ -29,7 +29,8 @@ import ch.cyberduck.core.Scheme;
import ch.cyberduck.core.UserDateFormatterFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Collections;
import java.util.Date;
@@ -40,7 +41,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public abstract class AbstractRendezvous implements Rendezvous {
private static final Logger log = Logger.getLogger(AbstractRendezvous.class);
private static final Logger log = LogManager.getLogger(AbstractRendezvous.class);
/**
* sftp-ssh
bonjour/src/main/java/ch/cyberduck/core/bonjour/LimitedRendezvousListener.java
+3 -2
View File
@@ -21,7 +21,8 @@ import ch.cyberduck.core.Host;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.concurrent.TimedSemaphore;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -29,7 +30,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
public class LimitedRendezvousListener implements RendezvousListener {
private static final Logger log = Logger.getLogger(LimitedRendezvousListener.class);
private static final Logger log = LogManager.getLogger(LimitedRendezvousListener.class);
/**
* Rate limit for notifications
bonjour/src/main/java/ch/cyberduck/core/bonjour/RendezvousResponder.java
+3 -2
View File
@@ -29,13 +29,14 @@ import ch.cyberduck.core.ProtocolFactory;
import ch.cyberduck.core.threading.ActionOperationBatcher;
import ch.cyberduck.core.threading.ActionOperationBatcherFactory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public final class RendezvousResponder extends AbstractRendezvous implements BrowseListener, ResolveListener {
private static final Logger log = Logger.getLogger(RendezvousResponder.class);
private static final Logger log = LogManager.getLogger(RendezvousResponder.class);
private final Map<String, DNSSDService> browsers;
box/src/main/java/ch/cyberduck/core/box/BoxChunkedWriteFeature.java
+3 -2
View File
@@ -33,12 +33,13 @@ import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
public class BoxChunkedWriteFeature extends AbstractHttpWriteFeature<BoxUploadHelper.BoxUploadResponse> {
private static final Logger log = Logger.getLogger(BoxChunkedWriteFeature.class);
private static final Logger log = LogManager.getLogger(BoxChunkedWriteFeature.class);
private final BoxSession session;
private final BoxApiClient client;
box/src/main/java/ch/cyberduck/core/box/BoxFileidProvider.java
+3 -2
View File
@@ -25,10 +25,11 @@ import ch.cyberduck.core.features.FileIdProvider;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class BoxFileidProvider implements FileIdProvider {
private static final Logger log = Logger.getLogger(BoxFileidProvider.class);
private static final Logger log = LogManager.getLogger(BoxFileidProvider.class);
public static final String ROOT = "0";
box/src/main/java/ch/cyberduck/core/box/BoxLargeUploadService.java
+3 -2
View File
@@ -36,7 +36,8 @@ import ch.cyberduck.core.threading.ThreadPoolFactory;
import ch.cyberduck.core.transfer.SegmentRetryCallable;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.security.MessageDigest;
import java.util.ArrayList;
@@ -48,7 +49,7 @@ import java.util.concurrent.Future;
import java.util.stream.Collectors;
public class BoxLargeUploadService extends HttpUploadFeature<BoxUploadHelper.BoxUploadResponse, MessageDigest> {
private static final Logger log = Logger.getLogger(BoxLargeUploadService.class);
private static final Logger log = LogManager.getLogger(BoxLargeUploadService.class);
public static final String UPLOAD_SESSION_ID = "uploadSessionId";
public static final String OVERALL_LENGTH = "overall-length";
box/src/main/java/ch/cyberduck/core/box/BoxListService.java
+3 -2
View File
@@ -30,7 +30,8 @@ import ch.cyberduck.core.exception.BackgroundException;
import ch.cyberduck.core.preferences.HostPreferences;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.EnumSet;
import java.util.Map;
@@ -38,7 +39,7 @@ import java.util.Map;
import com.fasterxml.jackson.core.JsonProcessingException;
public class BoxListService implements ListService {
private static final Logger log = Logger.getLogger(BoxListService.class);
private static final Logger log = LogManager.getLogger(BoxListService.class);
private final BoxSession session;
private final BoxFileidProvider fileid;
box/src/main/java/ch/cyberduck/core/box/BoxMultipartWriteFeature.java
+3 -2
View File
@@ -36,7 +36,8 @@ import org.apache.http.HttpHeaders;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -49,7 +50,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
public class BoxMultipartWriteFeature implements Write<Files> {
private static final Logger log = Logger.getLogger(BoxMultipartWriteFeature.class);
private static final Logger log = LogManager.getLogger(BoxMultipartWriteFeature.class);
private final BoxSession session;
private final BoxFileidProvider fileid;
box/src/main/java/ch/cyberduck/core/box/BoxReadFeature.java
+3 -2
View File
@@ -27,13 +27,14 @@ import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.http.HttpHeaders;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.InputStream;
public class BoxReadFeature implements Read {
private static final Logger log = Logger.getLogger(BoxReadFeature.class);
private static final Logger log = LogManager.getLogger(BoxReadFeature.class);
private final BoxSession session;
private final BoxFileidProvider fileid;
box/src/main/java/ch/cyberduck/core/box/BoxSession.java
+3 -2
View File
@@ -47,13 +47,14 @@ import ch.cyberduck.core.threading.CancelCallback;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.Collections;
public class BoxSession extends HttpSession<CloseableHttpClient> {
private static final Logger log = Logger.getLogger(BoxSession.class);
private static final Logger log = LogManager.getLogger(BoxSession.class);
private final BoxFileidProvider fileid = new BoxFileidProvider(this);
box/src/main/java/ch/cyberduck/core/box/BoxUploadHelper.java
+3 -2
View File
@@ -41,7 +41,8 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -49,7 +50,7 @@ import java.util.List;
import java.util.Objects;
public class BoxUploadHelper {
private static final Logger log = Logger.getLogger(BoxUploadHelper.class);
private static final Logger log = LogManager.getLogger(BoxUploadHelper.class);
private final BoxSession session;
private final BoxFileidProvider fileid;
box/src/main/java/ch/cyberduck/core/box/BoxWriteFeature.java
+3 -2
View File
@@ -40,14 +40,15 @@ import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
public class BoxWriteFeature extends AbstractHttpWriteFeature<BoxUploadHelper.BoxUploadResponse> {
private static final Logger log = Logger.getLogger(BoxWriteFeature.class);
private static final Logger log = LogManager.getLogger(BoxWriteFeature.class);
private final BoxSession session;
private final BoxFileidProvider fileid;
brick/src/main/java/ch/cyberduck/core/brick/BrickCopyFeature.java
+3 -2
View File
@@ -28,12 +28,13 @@ import ch.cyberduck.core.io.StreamListener;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Collections;
public class BrickCopyFeature extends BrickFileMigrationFeature implements Copy {
private static final Logger log = Logger.getLogger(BrickCopyFeature.class);
private static final Logger log = LogManager.getLogger(BrickCopyFeature.class);
private final BrickSession session;
brick/src/main/java/ch/cyberduck/core/brick/BrickExceptionMappingService.java
+3 -2
View File
@@ -26,7 +26,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpResponseException;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.StringReader;
@@ -39,7 +40,7 @@ import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
public class BrickExceptionMappingService extends AbstractExceptionMappingService<ApiException> {
private static final Logger log = Logger.getLogger(BrickExceptionMappingService.class);
private static final Logger log = LogManager.getLogger(BrickExceptionMappingService.class);
@Override
public BackgroundException map(final ApiException failure) {
brick/src/main/java/ch/cyberduck/core/brick/BrickFileMigrationFeature.java
+3 -2
View File
@@ -23,7 +23,8 @@ import ch.cyberduck.core.preferences.Preferences;
import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.threading.ScheduledThreadPool;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -32,7 +33,7 @@ import java.util.concurrent.atomic.AtomicReference;
import com.google.common.util.concurrent.Uninterruptibles;
public class BrickFileMigrationFeature {
private static final Logger log = Logger.getLogger(BrickFileMigrationFeature.class);
private static final Logger log = LogManager.getLogger(BrickFileMigrationFeature.class);
private final Preferences preferences = PreferencesFactory.get();
brick/src/main/java/ch/cyberduck/core/brick/BrickMoveFeature.java
+3 -2
View File
@@ -29,12 +29,13 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Collections;
public class BrickMoveFeature extends BrickFileMigrationFeature implements Move {
private static final Logger log = Logger.getLogger(BrickMoveFeature.class);
private static final Logger log = LogManager.getLogger(BrickMoveFeature.class);
private final BrickSession session;
private final Preferences preferences = PreferencesFactory.get();
brick/src/main/java/ch/cyberduck/core/brick/BrickMultipartWriteFeature.java
+3 -2
View File
@@ -36,7 +36,8 @@ import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import java.io.ByteArrayInputStream;
@@ -49,7 +50,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
public class BrickMultipartWriteFeature implements MultipartWrite<Void> {
private static final Logger log = Logger.getLogger(BrickMultipartWriteFeature.class);
private static final Logger log = LogManager.getLogger(BrickMultipartWriteFeature.class);
private final BrickSession session;
private final Integer partsize;
brick/src/main/java/ch/cyberduck/core/brick/BrickPairingFeature.java
+3 -2
View File
@@ -49,12 +49,13 @@ import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
public class BrickPairingFeature implements Pairing {
private static final Logger log = Logger.getLogger(BrickPairingFeature.class);
private static final Logger log = LogManager.getLogger(BrickPairingFeature.class);
private final HostPasswordStore store = PasswordStoreFactory.get();
brick/src/main/java/ch/cyberduck/core/brick/BrickPairingSchedulerFeature.java
+3 -2
View File
@@ -37,7 +37,8 @@ import org.apache.http.HttpStatus;
import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.AbstractResponseHandler;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -52,7 +53,7 @@ import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
public class BrickPairingSchedulerFeature {
private static final Logger log = Logger.getLogger(BrickPairingSchedulerFeature.class);
private static final Logger log = LogManager.getLogger(BrickPairingSchedulerFeature.class);
private final BrickSession session;
private final String token;
brick/src/main/java/ch/cyberduck/core/brick/BrickReadFeature.java
+3 -2
View File
@@ -36,13 +36,14 @@ import org.apache.http.client.HttpResponseException;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.message.BasicHeader;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.InputStream;
public class BrickReadFeature implements Read {
private static final Logger log = Logger.getLogger(BrickReadFeature.class);
private static final Logger log = LogManager.getLogger(BrickReadFeature.class);
private final BrickSession session;
brick/src/main/java/ch/cyberduck/core/brick/BrickSession.java
+3 -2
View File
@@ -46,7 +46,8 @@ import ch.cyberduck.core.threading.CancelCallback;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.net.InetAddress;
@@ -55,7 +56,7 @@ import java.text.MessageFormat;
import java.util.concurrent.CountDownLatch;
public class BrickSession extends HttpSession<CloseableHttpClient> {
private static final Logger log = Logger.getLogger(BrickSession.class);
private static final Logger log = LogManager.getLogger(BrickSession.class);
private BrickUnauthorizedRetryStrategy retryHandler;
brick/src/main/java/ch/cyberduck/core/brick/BrickUnauthorizedRetryStrategy.java
+3 -2
View File
@@ -34,13 +34,14 @@ import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.protocol.HttpContext;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.concurrent.Semaphore;
public class BrickUnauthorizedRetryStrategy extends DisabledServiceUnavailableRetryStrategy implements HttpRequestInterceptor {
private static final Logger log = Logger.getLogger(BrickUnauthorizedRetryStrategy.class);
private static final Logger log = LogManager.getLogger(BrickUnauthorizedRetryStrategy.class);
private static final int MAX_RETRIES = 1;
brick/src/main/java/ch/cyberduck/core/brick/BrickUploadFeature.java
+3 -2
View File
@@ -41,7 +41,8 @@ import ch.cyberduck.core.transfer.SegmentRetryCallable;
import ch.cyberduck.core.transfer.TransferStatus;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;
import java.security.MessageDigest;
@@ -53,7 +54,7 @@ import java.util.concurrent.Future;
import java.util.stream.Collectors;
public class BrickUploadFeature extends HttpUploadFeature<Void, MessageDigest> {
private static final Logger log = Logger.getLogger(BrickUploadFeature.class);
private static final Logger log = LogManager.getLogger(BrickUploadFeature.class);
/**
* The maximum allowed parts in a multipart upload.
brick/src/main/java/ch/cyberduck/core/brick/BrickWriteFeature.java
+3 -2
View File
@@ -44,7 +44,8 @@ import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.util.EntityUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.text.MessageFormat;
@@ -52,7 +53,7 @@ import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
public class BrickWriteFeature extends AbstractHttpWriteFeature<Void> {
private static final Logger log = Logger.getLogger(BrickWriteFeature.class);
private static final Logger log = LogManager.getLogger(BrickWriteFeature.class);
private final BrickSession session;
cli/src/main/java/ch/cyberduck/cli/ClasspathResourcesFinder.java
+3 -2
View File
@@ -19,14 +19,15 @@ import ch.cyberduck.core.Local;
import ch.cyberduck.core.LocalFactory;
import ch.cyberduck.core.preferences.ApplicationResourcesFinder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.net.URI;
public class ClasspathResourcesFinder implements ApplicationResourcesFinder {
private static final Logger log = Logger.getLogger(ClasspathResourcesFinder.class);
private static final Logger log = LogManager.getLogger(ClasspathResourcesFinder.class);
@Override
public Local find() {
cli/src/main/java/ch/cyberduck/cli/CommandLineUriParser.java
+3 -2
View File
@@ -25,10 +25,11 @@ import ch.cyberduck.core.ProtocolFactory;
import ch.cyberduck.core.exception.HostParserException;
import org.apache.commons.cli.CommandLine;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class CommandLineUriParser {
private static final Logger log = Logger.getLogger(CommandLineUriParser.class);
private static final Logger log = LogManager.getLogger(CommandLineUriParser.class);
private final CommandLine input;
private final ProtocolFactory factory;
cli/src/main/java/ch/cyberduck/cli/DownloadGlobFilter.java
+3 -2
View File
@@ -20,13 +20,14 @@ package ch.cyberduck.cli;
import ch.cyberduck.core.Path;
import ch.cyberduck.core.filter.DownloadDuplicateFilter;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Objects;
import java.util.regex.Pattern;
public class DownloadGlobFilter extends DownloadDuplicateFilter {
private static final Logger log = Logger.getLogger(DownloadGlobFilter.class);
private static final Logger log = LogManager.getLogger(DownloadGlobFilter.class);
private final Pattern pattern;
cli/src/main/java/ch/cyberduck/cli/GlobTransferItemFinder.java
+3 -2
View File
@@ -29,7 +29,8 @@ import ch.cyberduck.core.transfer.TransferItem;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.nio.file.FileSystems;
import java.nio.file.InvalidPathException;
@@ -40,7 +41,7 @@ import java.util.HashSet;
import java.util.Set;
public class GlobTransferItemFinder implements TransferItemFinder {
private static final Logger log = Logger.getLogger(GlobTransferItemFinder.class);
private static final Logger log = LogManager.getLogger(GlobTransferItemFinder.class);
@Override
public Set<TransferItem> find(final CommandLine input, final TerminalAction action, final Path remote) throws AccessDeniedException {
cli/src/main/java/ch/cyberduck/cli/LinuxTerminalPreferences.java
+3 -2
View File
@@ -27,14 +27,15 @@ import ch.cyberduck.core.proxy.EnvironmentVariableProxyFinder;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.awt.*;
import java.io.IOException;
import java.nio.charset.Charset;
public class LinuxTerminalPreferences extends TerminalPreferences {
private static final Logger log = Logger.getLogger(LinuxTerminalPreferences.class);
private static final Logger log = LogManager.getLogger(LinuxTerminalPreferences.class);
public LinuxTerminalPreferences() {
super(new MemoryPreferences());
cli/src/main/java/ch/cyberduck/cli/Terminal.java
+3 -2
View File
@@ -92,7 +92,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.Collections;
@@ -104,7 +105,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.util.concurrent.Uninterruptibles;
public class Terminal {
private static final Logger log = Logger.getLogger(Terminal.class);
private static final Logger log = LogManager.getLogger(Terminal.class);
static {
System.err.close();
cli/src/main/java/ch/cyberduck/cli/TerminalAppender.java
+13 -15
View File
@@ -15,21 +15,29 @@ package ch.cyberduck.cli;
* GNU General Public License for more details.
*/
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
import org.fusesource.jansi.Ansi;
public class TerminalAppender extends AppenderSkeleton {
import java.nio.charset.StandardCharsets;
public class TerminalAppender extends AbstractAppender {
private final Console console = new Console();
public TerminalAppender(final Layout layout) {
super(TerminalAppender.class.getName(), null, layout, true, Property.EMPTY_ARRAY);
}
@Override
public void append(final LoggingEvent event) {
public void append(final LogEvent event) {
if(null == event.getMessage()) {
return;
}
final StringBuilder buffer = new StringBuilder();
buffer.append(layout.format(event));
buffer.append(new String(getLayout().toByteArray(event), StandardCharsets.UTF_8));
console.printf("\r%s%s%s", Ansi.ansi()
.fg(Ansi.Color.YELLOW)
.saveCursorPosition()
@@ -37,14 +45,4 @@ public class TerminalAppender extends AppenderSkeleton {
.restoreCursorPosition(), buffer.toString(),
Ansi.ansi().reset());
}
@Override
public void close() {
//
}
@Override
public boolean requiresLayout() {
return false;
}
}
cli/src/main/java/ch/cyberduck/cli/TerminalPreferences.java
+23 -9
View File
@@ -22,14 +22,21 @@ import ch.cyberduck.core.transfer.Transfer;
import ch.cyberduck.core.transfer.TransferAction;
import org.apache.commons.cli.CommandLine;
import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.layout.PatternLayout;
import java.nio.charset.StandardCharsets;
import java.util.List;
public class TerminalPreferences extends Preferences {
private static final Logger log = Logger.getLogger(TerminalPreferences.class);
private static final Logger log = LogManager.getLogger(TerminalPreferences.class);
private final Preferences proxy;
@@ -58,11 +65,18 @@ public class TerminalPreferences extends Preferences {
@Override
protected void configureLogging(final String level) {
super.configureLogging(level);
// Send log output to system.log
Logger root = Logger.getRootLogger();
final Appender appender = new TerminalAppender();
appender.setLayout(new PatternLayout("[%t] %-5p %c - %m%n"));
root.addAppender(appender);
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration config = ctx.getConfiguration();
final Appender appender = new TerminalAppender(PatternLayout.newBuilder().withConfiguration(config).withPattern("[%t] %-5p %c - %m%n").withCharset(StandardCharsets.UTF_8).build());
appender.start();
config.addAppender(appender);
final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
final AppenderRef[] refs = new AppenderRef[]{ref};
LoggerConfig loggerConfig = LoggerConfig.createLogger(false, Level.getLevel(level), LogManager.ROOT_LOGGER_NAME,
"true", refs, null, config, null);
loggerConfig.addAppender(appender, null, null);
config.addLogger(LogManager.ROOT_LOGGER_NAME, loggerConfig);
ctx.updateLoggers();
}
@Override
core/dylib/src/main/java/ch/cyberduck/core/ApplescriptTerminalService.java
+3 -2
View File
@@ -11,13 +11,14 @@ import ch.cyberduck.core.preferences.Preferences;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ObjCObjectByReference;
import java.text.MessageFormat;
public class ApplescriptTerminalService implements TerminalService {
private static final Logger log = Logger.getLogger(ApplescriptTerminalService.class);
private static final Logger log = LogManager.getLogger(ApplescriptTerminalService.class);
private final ApplicationFinder finder
= ApplicationFinderFactory.get();
core/dylib/src/main/java/ch/cyberduck/core/IOKitSleepPreventer.java
+3 -2
View File
@@ -21,10 +21,11 @@ package ch.cyberduck.core;
import ch.cyberduck.core.library.Native;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public final class IOKitSleepPreventer implements SleepPreventer {
private static final Logger log = Logger.getLogger(IOKitSleepPreventer.class);
private static final Logger log = LogManager.getLogger(IOKitSleepPreventer.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/KeychainCertificateStore.java
+3 -2
View File
@@ -34,7 +34,8 @@ import ch.cyberduck.core.ssl.DEREncoder;
import ch.cyberduck.core.ssl.KeychainX509KeyManager;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSUInteger;
import java.io.ByteArrayInputStream;
@@ -50,7 +51,7 @@ import java.util.List;
import com.sun.jna.ptr.PointerByReference;
public final class KeychainCertificateStore implements CertificateStore {
private static final Logger log = Logger.getLogger(KeychainCertificateStore.class);
private static final Logger log = LogManager.getLogger(KeychainCertificateStore.class);
/**
* @param certificates Chain of certificates
core/dylib/src/main/java/ch/cyberduck/core/KeychainPasswordStore.java
+3 -2
View File
@@ -23,7 +23,8 @@ import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.keychain.SecKeychainItemRef;
import ch.cyberduck.core.keychain.SecurityFunctions;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.nio.charset.StandardCharsets;
@@ -33,7 +34,7 @@ import com.sun.jna.ptr.PointerByReference;
import static ch.cyberduck.core.keychain.SecurityFunctions.*;
public final class KeychainPasswordStore extends DefaultHostPasswordStore implements PasswordStore {
private static final Logger log = Logger.getLogger(KeychainPasswordStore.class);
private static final Logger log = LogManager.getLogger(KeychainPasswordStore.class);
private static final Object lock = new Object();
core/dylib/src/main/java/ch/cyberduck/core/diagnostics/SystemConfigurationReachability.java
+3 -2
View File
@@ -25,11 +25,12 @@ import ch.cyberduck.binding.foundation.NSNotificationCenter;
import ch.cyberduck.core.Host;
import ch.cyberduck.core.idna.PunycodeConverter;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
public final class SystemConfigurationReachability implements Reachability {
private static final Logger log = Logger.getLogger(SystemConfigurationReachability.class);
private static final Logger log = LogManager.getLogger(SystemConfigurationReachability.class);
private final NSNotificationCenter notificationCenter = NSNotificationCenter.defaultCenter();
core/dylib/src/main/java/ch/cyberduck/core/editor/FSEventWatchEditor.java
+3 -2
View File
@@ -27,7 +27,8 @@ import ch.cyberduck.core.local.FileWatcher;
import ch.cyberduck.core.local.FileWatcherListener;
import ch.cyberduck.core.pool.SessionPool;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
@@ -37,7 +38,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
* An editor listing for file system notifications on a particular folder
*/
public class FSEventWatchEditor extends AbstractEditor {
private static final Logger log = Logger.getLogger(FSEventWatchEditor.class);
private static final Logger log = LogManager.getLogger(FSEventWatchEditor.class);
private final FileWatcher monitor
= new FileWatcher(new FSEventWatchService());
core/dylib/src/main/java/ch/cyberduck/core/i18n/BundleRegexLocale.java
+3 -2
View File
@@ -19,12 +19,13 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.LocaleUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
public class BundleRegexLocale extends BundleLocale {
private static final Logger log = Logger.getLogger(BundleRegexLocale.class.getName());
private static final Logger log = LogManager.getLogger(BundleRegexLocale.class.getName());
/**
* For lookup in *.strings.1
core/dylib/src/main/java/ch/cyberduck/core/importer/CloudMounterBookmarkCollection.java
+3 -2
View File
@@ -28,12 +28,13 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.serializer.impl.jna.PlistDeserializer;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
public class CloudMounterBookmarkCollection extends ThirdpartyBookmarkCollection {
private static final Logger log = Logger.getLogger(CloudMounterBookmarkCollection.class);
private static final Logger log = LogManager.getLogger(CloudMounterBookmarkCollection.class);
@Override
public String getName() {
core/dylib/src/main/java/ch/cyberduck/core/importer/FetchBookmarkCollection.java
+3 -2
View File
@@ -30,12 +30,13 @@ import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.serializer.impl.jna.PlistDeserializer;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
public class FetchBookmarkCollection extends ThirdpartyBookmarkCollection {
private static final Logger log = Logger.getLogger(FetchBookmarkCollection.class);
private static final Logger log = LogManager.getLogger(FetchBookmarkCollection.class);
private static final long serialVersionUID = -7544710198776572190L;
core/dylib/src/main/java/ch/cyberduck/core/importer/FlowBookmarkCollection.java
+3 -2
View File
@@ -31,12 +31,13 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.serializer.impl.jna.PlistDeserializer;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
public class FlowBookmarkCollection extends ThirdpartyBookmarkCollection {
private static final Logger log = Logger.getLogger(FlowBookmarkCollection.class);
private static final Logger log = LogManager.getLogger(FlowBookmarkCollection.class);
private static final long serialVersionUID = 2017398431454618548L;
core/dylib/src/main/java/ch/cyberduck/core/importer/InterarchyBookmarkCollection.java
+3 -2
View File
@@ -29,12 +29,13 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.serializer.impl.jna.PlistDeserializer;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
public class InterarchyBookmarkCollection extends ThirdpartyBookmarkCollection {
private static final Logger log = Logger.getLogger(InterarchyBookmarkCollection.class);
private static final Logger log = LogManager.getLogger(InterarchyBookmarkCollection.class);
private static final long serialVersionUID = 999209774019642938L;
core/dylib/src/main/java/ch/cyberduck/core/importer/Transmit5BookmarkCollection.java
+3 -2
View File
@@ -29,10 +29,11 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import ch.cyberduck.core.serializer.impl.jna.PlistDeserializer;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class Transmit5BookmarkCollection extends ThirdpartyBookmarkCollection {
private static final Logger log = Logger.getLogger(Transmit5BookmarkCollection.class);
private static final Logger log = LogManager.getLogger(Transmit5BookmarkCollection.class);
private static final long serialVersionUID = 2422398644582883578L;
core/dylib/src/main/java/ch/cyberduck/core/io/watchservice/FSEventWatchService.java
+3 -2
View File
@@ -23,7 +23,8 @@ import ch.cyberduck.binding.foundation.CFRunLoopRef;
import ch.cyberduck.binding.foundation.CFStringRef;
import ch.cyberduck.core.threading.NamedThreadFactory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.IOException;
@@ -54,7 +55,7 @@ import com.sun.jna.Pointer;
* @author Steve McLeod
*/
public class FSEventWatchService extends AbstractWatchService {
private static final Logger log = Logger.getLogger(FSEventWatchService.class);
private static final Logger log = LogManager.getLogger(FSEventWatchService.class);
private final FSEvents library = FSEvents.library;
core/dylib/src/main/java/ch/cyberduck/core/local/AbstractPromptBookmarkResolver.java
+3 -2
View File
@@ -31,7 +31,8 @@ import ch.cyberduck.core.preferences.SecurityApplicationGroupSupportDirectoryFin
import ch.cyberduck.core.preferences.TemporarySupportDirectoryFinder;
import ch.cyberduck.core.threading.DefaultMainAction;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ObjCObjectByReference;
import org.rococoa.Rococoa;
import org.rococoa.cocoa.foundation.NSError;
@@ -41,7 +42,7 @@ import java.text.MessageFormat;
import java.util.concurrent.atomic.AtomicReference;
public abstract class AbstractPromptBookmarkResolver implements FilesystemBookmarkResolver<NSURL> {
private static final Logger log = Logger.getLogger(AbstractPromptBookmarkResolver.class);
private static final Logger log = LogManager.getLogger(AbstractPromptBookmarkResolver.class);
private final int create;
private final int resolve;
core/dylib/src/main/java/ch/cyberduck/core/local/FileManagerTrashFeature.java
+3 -2
View File
@@ -21,12 +21,13 @@ import ch.cyberduck.core.Local;
import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.local.features.Trash;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ObjCObjectByReference;
import org.rococoa.cocoa.foundation.NSError;
public class FileManagerTrashFeature implements Trash {
private static final Logger log = Logger.getLogger(FileManagerTrashFeature.class);
private static final Logger log = LogManager.getLogger(FileManagerTrashFeature.class);
@Override
public void trash(final Local file) throws LocalAccessDeniedException {
core/dylib/src/main/java/ch/cyberduck/core/local/FilesystemBookmarkResolverFactory.java
+3 -2
View File
@@ -18,10 +18,11 @@ package ch.cyberduck.core.local;
import ch.cyberduck.binding.foundation.NSURL;
import ch.cyberduck.core.Factory;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class FilesystemBookmarkResolverFactory extends Factory<FilesystemBookmarkResolver<NSURL>> {
private static final Logger log = Logger.getLogger(FilesystemBookmarkResolverFactory.class);
private static final Logger log = LogManager.getLogger(FilesystemBookmarkResolverFactory.class);
public FilesystemBookmarkResolverFactory() {
super("factory.bookmarkresolver.class");
core/dylib/src/main/java/ch/cyberduck/core/local/FinderLocal.java
+3 -2
View File
@@ -32,7 +32,8 @@ import ch.cyberduck.core.serializer.Serializer;
import org.apache.commons.io.input.ProxyInputStream;
import org.apache.commons.io.output.ProxyOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import java.io.IOException;
@@ -43,7 +44,7 @@ import java.nio.file.LinkOption;
import java.nio.file.Paths;
public class FinderLocal extends Local {
private static final Logger log = Logger.getLogger(FinderLocal.class);
private static final Logger log = LogManager.getLogger(FinderLocal.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/local/FinderLocalAttributes.java
+3 -2
View File
@@ -31,7 +31,8 @@ import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.exception.LocalNotfoundException;
import ch.cyberduck.core.exception.NotfoundException;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ObjCObjectByReference;
import org.rococoa.Rococoa;
import org.rococoa.cocoa.foundation.NSError;
@@ -42,7 +43,7 @@ import org.rococoa.cocoa.foundation.NSError;
* @see ch.cyberduck.binding.foundation.NSFileManager
*/
public class FinderLocalAttributes extends LocalAttributes {
private static final Logger log = Logger.getLogger(FinderLocalAttributes.class);
private static final Logger log = LogManager.getLogger(FinderLocalAttributes.class);
private final FinderLocal local;
core/dylib/src/main/java/ch/cyberduck/core/local/FinderSidebarService.java
+3 -2
View File
@@ -21,10 +21,11 @@ import ch.cyberduck.core.Local;
import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.library.Native;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class FinderSidebarService implements SidebarService {
private static final Logger log = Logger.getLogger(FinderSidebarService.class);
private static final Logger log = LogManager.getLogger(FinderSidebarService.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/local/LaunchServicesApplicationFinder.java
+3 -2
View File
@@ -29,14 +29,15 @@ import ch.cyberduck.core.library.Native;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public final class LaunchServicesApplicationFinder implements ApplicationFinder {
private static final Logger log = Logger.getLogger(LaunchServicesApplicationFinder.class);
private static final Logger log = LogManager.getLogger(LaunchServicesApplicationFinder.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/local/LaunchServicesQuarantineService.java
+3 -2
View File
@@ -23,10 +23,11 @@ import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.library.Native;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public final class LaunchServicesQuarantineService implements QuarantineService {
private static final Logger log = Logger.getLogger(LaunchServicesQuarantineService.class);
private static final Logger log = LogManager.getLogger(LaunchServicesQuarantineService.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/local/WorkspaceApplicationLauncher.java
+3 -2
View File
@@ -25,14 +25,15 @@ import ch.cyberduck.binding.foundation.NSNotification;
import ch.cyberduck.core.Local;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import java.util.HashMap;
import java.util.Map;
public final class WorkspaceApplicationLauncher implements ApplicationLauncher {
private static final Logger log = Logger.getLogger(WorkspaceApplicationLauncher.class);
private static final Logger log = LogManager.getLogger(WorkspaceApplicationLauncher.class);
private final NSWorkspace workspace = NSWorkspace.sharedWorkspace();
core/dylib/src/main/java/ch/cyberduck/core/local/WorkspaceBrowserLauncher.java
+3 -2
View File
@@ -22,10 +22,11 @@ import ch.cyberduck.binding.application.NSWorkspace;
import ch.cyberduck.binding.foundation.NSURL;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class WorkspaceBrowserLauncher implements BrowserLauncher {
private static final Logger log = Logger.getLogger(WorkspaceBrowserLauncher.class);
private static final Logger log = LogManager.getLogger(WorkspaceBrowserLauncher.class);
private final NSWorkspace workspace = NSWorkspace.sharedWorkspace();
core/dylib/src/main/java/ch/cyberduck/core/local/WorkspaceSymlinkFeature.java
+3 -2
View File
@@ -24,12 +24,13 @@ import ch.cyberduck.core.exception.AccessDeniedException;
import ch.cyberduck.core.exception.LocalAccessDeniedException;
import ch.cyberduck.core.local.features.Symlink;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ObjCObjectByReference;
import org.rococoa.cocoa.foundation.NSError;
public class WorkspaceSymlinkFeature implements Symlink {
private static final Logger log = Logger.getLogger(WorkspaceSymlinkFeature.class);
private static final Logger log = LogManager.getLogger(WorkspaceSymlinkFeature.class);
@Override
public void symlink(final Local file, final String target) throws AccessDeniedException {
core/dylib/src/main/java/ch/cyberduck/core/local/WorkspaceTrashFeature.java
+3 -2
View File
@@ -25,10 +25,11 @@ import ch.cyberduck.core.local.features.Trash;
import ch.cyberduck.core.unicode.NFDNormalizer;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class WorkspaceTrashFeature implements Trash {
private static final Logger log = Logger.getLogger(WorkspaceTrashFeature.class);
private static final Logger log = LogManager.getLogger(WorkspaceTrashFeature.class);
private final NSWorkspace workspace = NSWorkspace.sharedWorkspace();
core/dylib/src/main/java/ch/cyberduck/core/logging/SystemLogAppender.java
+21 -21
View File
@@ -20,11 +20,15 @@ package ch.cyberduck.core.logging;
import ch.cyberduck.binding.foundation.FoundationKitFunctions;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.util.Strings;
import org.rococoa.internal.RococoaTypeMapper;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import com.sun.jna.Library;
@@ -33,37 +37,33 @@ import com.sun.jna.Native;
/**
* Redirect to NSLog(). Logs an error message to the Apple System Log facility.
*/
public class SystemLogAppender extends AppenderSkeleton {
public class SystemLogAppender extends AbstractAppender {
private static final FoundationKitFunctions library = Native.load(
"Foundation", FoundationKitFunctions.class, Collections.singletonMap(Library.OPTION_TYPE_MAPPER, new RococoaTypeMapper()));
public SystemLogAppender(final Layout layout) {
super(SystemLogAppender.class.getName(), null, layout, true, Property.EMPTY_ARRAY);
}
@Override
protected void append(final LoggingEvent event) {
public void append(final LogEvent event) {
if(null == event.getMessage()) {
return;
}
final StringBuilder buffer = new StringBuilder();
buffer.append(layout.format(event));
if(layout.ignoresThrowable()) {
final String[] trace = event.getThrowableStrRep();
if(trace != null) {
buffer.append(Layout.LINE_SEP);
buffer.append(new String(getLayout().toByteArray(event), StandardCharsets.UTF_8));
if(ignoreExceptions()) {
final Throwable thrown = event.getThrown();
if(thrown != null) {
buffer.append(Strings.LINE_SEPARATOR);
final String[] trace = ExceptionUtils.getStackFrames(thrown);
for(final String t : trace) {
buffer.append(t).append(Layout.LINE_SEP);
buffer.append(t).append(Strings.LINE_SEPARATOR);
}
}
}
library.NSLog("%@", buffer.toString());
}
@Override
public void close() {
//
}
@Override
public boolean requiresLayout() {
return true;
}
}
core/dylib/src/main/java/ch/cyberduck/core/logging/UnifiedSystemLogAppender.java
+27 -34
View File
@@ -17,14 +17,16 @@ package ch.cyberduck.core.logging;
import ch.cyberduck.core.library.Native;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
/**
* Redirect to NSLog(). Logs an error message to the Apple System Log facility.
*/
public class UnifiedSystemLogAppender extends AppenderSkeleton {
public class UnifiedSystemLogAppender extends AbstractAppender {
static {
Native.load("core");
@@ -69,34 +71,35 @@ public class UnifiedSystemLogAppender extends AppenderSkeleton {
*/
public static final int OS_LOG_TYPE_FAULT = 0x11;
public UnifiedSystemLogAppender() {
super(UnifiedSystemLogAppender.class.getName(), null, null, true, Property.EMPTY_ARRAY);
}
@Override
protected void append(final LoggingEvent event) {
public void append(final LogEvent event) {
if(null == event.getMessage()) {
return;
}
// Category name
final String logger = String.format("%s %s", event.getThreadName(), event.getLogger().getName());
switch(event.getLevel().toInt()) {
case Level.FATAL_INT:
case Level.ERROR_INT:
final String logger = String.format("%s %s", event.getThreadName(), event.getLoggerName());
Level level = event.getLevel();
if(Level.FATAL.equals(level) || Level.ERROR.equals(level)) {
this.log(OS_LOG_TYPE_ERROR, logger, event.getMessage().toString());
break;
case Level.TRACE_INT:
this.log(OS_LOG_TYPE_DEBUG, logger, event.getMessage().toString());
break;
case Level.DEBUG_INT:
case Level.INFO_INT:
this.log(OS_LOG_TYPE_INFO, logger, event.getMessage().toString());
break;
case Level.WARN_INT:
default:
this.log(OS_LOG_TYPE_DEFAULT, logger, event.getMessage().toString());
break;
}
if(layout.ignoresThrowable()) {
else if(Level.TRACE.equals(level)) {
this.log(OS_LOG_TYPE_DEBUG, logger, event.getMessage().toString());
}
else if(Level.DEBUG.equals(level) || Level.INFO.equals(level)) {
this.log(OS_LOG_TYPE_INFO, logger, event.getMessage().toString());
}
else {
this.log(OS_LOG_TYPE_DEFAULT, logger, event.getMessage().toString());
}
if(ignoreExceptions()) {
// Appender responsible for rendering
final String[] trace = event.getThrowableStrRep();
if(trace != null) {
final Throwable thrown = event.getThrown();
if(thrown != null) {
final String[] trace = ExceptionUtils.getStackFrames(thrown);
for(final String t : trace) {
this.log(OS_LOG_TYPE_DEFAULT, logger, t);
}
@@ -105,15 +108,5 @@ public class UnifiedSystemLogAppender extends AppenderSkeleton {
}
public native void log(int type, String category, String message);
@Override
public void close() {
//
}
@Override
public boolean requiresLayout() {
return true;
}
}
core/dylib/src/main/java/ch/cyberduck/core/notification/NotificationCenter.java
+3 -2
View File
@@ -28,7 +28,8 @@ import ch.cyberduck.core.Scheme;
import ch.cyberduck.core.resources.IconCacheFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import java.util.Collections;
@@ -36,7 +37,7 @@ import java.util.HashSet;
import java.util.Set;
public class NotificationCenter extends ProxyController implements NotificationService, NSUserNotificationCenter.Delegate {
private static final Logger log = Logger.getLogger(NotificationCenter.class);
private static final Logger log = LogManager.getLogger(NotificationCenter.class);
/**
* Methods involve talking to a server process, so calling them repeatedly can have a negative effect on
core/dylib/src/main/java/ch/cyberduck/core/preferences/ApplicationSupportDirectoryFinder.java
+3 -2
View File
@@ -23,11 +23,12 @@ import ch.cyberduck.binding.foundation.NSArray;
import ch.cyberduck.core.Local;
import ch.cyberduck.core.local.FinderLocal;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSUInteger;
public class ApplicationSupportDirectoryFinder implements SupportDirectoryFinder {
private static final Logger log = Logger.getLogger(ApplicationSupportDirectoryFinder.class);
private static final Logger log = LogManager.getLogger(ApplicationSupportDirectoryFinder.class);
private final Preferences preferences = PreferencesFactory.get();
core/dylib/src/main/java/ch/cyberduck/core/preferences/BundleApplicationResourcesFinder.java
+3 -2
View File
@@ -25,10 +25,11 @@ import ch.cyberduck.core.exception.NotfoundException;
import ch.cyberduck.core.local.FinderLocal;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class BundleApplicationResourcesFinder implements ApplicationResourcesFinder {
private static final Logger log = Logger.getLogger(BundleApplicationResourcesFinder.class);
private static final Logger log = LogManager.getLogger(BundleApplicationResourcesFinder.class);
private NSBundle cached;
core/dylib/src/main/java/ch/cyberduck/core/preferences/LibraryLogDirectoryFinder.java
+3 -2
View File
@@ -20,11 +20,12 @@ import ch.cyberduck.binding.foundation.NSArray;
import ch.cyberduck.core.Local;
import ch.cyberduck.core.local.FinderLocal;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSUInteger;
public class LibraryLogDirectoryFinder implements LogDirectoryFinder {
private static final Logger log = Logger.getLogger(LibraryLogDirectoryFinder.class);
private static final Logger log = LogManager.getLogger(LibraryLogDirectoryFinder.class);
private final Preferences preferences = PreferencesFactory.get();
core/dylib/src/main/java/ch/cyberduck/core/preferences/SecurityApplicationGroupSupportDirectoryFinder.java
+3 -2
View File
@@ -29,14 +29,15 @@ import ch.cyberduck.core.local.features.Symlink;
import ch.cyberduck.core.local.features.Trash;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Foundation;
import java.io.File;
import java.io.IOException;
public class SecurityApplicationGroupSupportDirectoryFinder implements SupportDirectoryFinder {
private static final Logger log = Logger.getLogger(SecurityApplicationGroupSupportDirectoryFinder.class);
private static final Logger log = LogManager.getLogger(SecurityApplicationGroupSupportDirectoryFinder.class);
private final String identifier;
core/dylib/src/main/java/ch/cyberduck/core/preferences/ServiceManagementApplicationLoginRegistry.java
+3 -2
View File
@@ -23,10 +23,11 @@ import ch.cyberduck.core.local.Application;
import ch.cyberduck.core.local.FinderLocal;
import ch.cyberduck.core.local.LaunchServicesApplicationFinder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class ServiceManagementApplicationLoginRegistry implements ApplicationLoginRegistry {
private static final Logger log = Logger.getLogger(ServiceManagementApplicationLoginRegistry.class);
private static final Logger log = LogManager.getLogger(ServiceManagementApplicationLoginRegistry.class);
private final LaunchServicesApplicationFinder finder
= new LaunchServicesApplicationFinder();
core/dylib/src/main/java/ch/cyberduck/core/preferences/UserDefaultsPreferences.java
+3 -2
View File
@@ -33,7 +33,8 @@ import ch.cyberduck.core.exception.AccessDeniedException;
import ch.cyberduck.core.sparkle.Sandbox;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Rococoa;
import java.util.ArrayList;
@@ -49,7 +50,7 @@ import com.sun.jna.platform.mac.SystemB;
* @see ch.cyberduck.binding.foundation.NSUserDefaults
*/
public class UserDefaultsPreferences extends DefaultPreferences {
private static final Logger log = Logger.getLogger(UserDefaultsPreferences.class);
private static final Logger log = LogManager.getLogger(UserDefaultsPreferences.class);
private final NSBundle bundle = new BundleApplicationResourcesFinder().bundle();
core/dylib/src/main/java/ch/cyberduck/core/proxy/SystemConfigurationProxy.java
+3 -2
View File
@@ -23,13 +23,14 @@ import ch.cyberduck.core.preferences.Preferences;
import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.net.URI;
import java.net.URISyntaxException;
public final class SystemConfigurationProxy extends AbstractProxyFinder implements ProxyFinder {
private static final Logger log = Logger.getLogger(SystemConfigurationProxy.class);
private static final Logger log = LogManager.getLogger(SystemConfigurationProxy.class);
static {
Native.load("core");
core/dylib/src/main/java/ch/cyberduck/core/quicklook/QuartzQuickLook.java
+3 -2
View File
@@ -22,7 +22,8 @@ import ch.cyberduck.binding.quicklook.QLPreviewPanelDataSource;
import ch.cyberduck.core.Local;
import ch.cyberduck.ui.quicklook.QuickLook;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.ID;
import org.rococoa.cocoa.foundation.NSInteger;
@@ -30,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
public final class QuartzQuickLook implements QuickLook {
private static final Logger log = Logger.getLogger(QuartzQuickLook.class);
private static final Logger log = LogManager.getLogger(QuartzQuickLook.class);
private final List<QLPreviewItem> previews
= new ArrayList<QLPreviewItem>();
core/dylib/src/main/java/ch/cyberduck/core/resources/NSImageIconCache.java
+3 -2
View File
@@ -28,13 +28,14 @@ import ch.cyberduck.core.preferences.PreferencesFactory;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.cocoa.foundation.NSPoint;
import org.rococoa.cocoa.foundation.NSRect;
import org.rococoa.cocoa.foundation.NSSize;
public class NSImageIconCache implements IconCache<NSImage> {
private static final Logger log = Logger.getLogger(NSImageIconCache.class);
private static final Logger log = LogManager.getLogger(NSImageIconCache.class);
private final static NSRect NSZeroRect = new NSRect(0, 0);
core/dylib/src/main/java/ch/cyberduck/core/serializer/impl/jna/PlistDeserializer.java
+3 -2
View File
@@ -25,7 +25,8 @@ import ch.cyberduck.binding.foundation.NSObject;
import ch.cyberduck.binding.foundation.NSString;
import ch.cyberduck.core.serializer.Deserializer;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.rococoa.Rococoa;
import java.util.ArrayList;
@@ -34,7 +35,7 @@ import java.util.List;
import java.util.Map;
public class PlistDeserializer implements Deserializer<NSDictionary> {
private static final Logger log = Logger.getLogger(PlistDeserializer.class);
private static final Logger log = LogManager.getLogger(PlistDeserializer.class);
final NSDictionary dict;

Some files were not shown because too many files have changed in this diff Show More