From 9bef39da0f3df23ef36b0a21b026f6cba4398b53 Mon Sep 17 00:00:00 2001 From: Santosh R Dhariwal Date: Tue, 16 Nov 2021 15:51:10 +0530 Subject: [PATCH] Make Changes to Support FTPS AntTaskDef that extends FTP but uses FTPSClient. --- .../tools/ant/taskdefs/optional/net/FTP.java | 6 ++- .../tools/ant/taskdefs/optional/net/FTPS.java | 43 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/main/org/apache/tools/ant/taskdefs/optional/net/FTPS.java diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 57f9ae075..a67fa6d40 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -2488,6 +2488,10 @@ public class FTP extends Task implements FTPTaskConfig { return result; } + protected FTPClient getFTPClient(){ + return new FTPClient(); + } + /** * Runs the task. * @@ -2503,7 +2507,7 @@ public class FTP extends Task implements FTPTaskConfig { try { log("Opening FTP connection to " + server, Project.MSG_VERBOSE); - ftp = new FTPClient(); + ftp = getFTPClient(); if (this.isConfigurationSet) { ftp = FTPConfigurator.configure(ftp, this); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPS.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPS.java new file mode 100644 index 000000000..5d1cea8a4 --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPS.java @@ -0,0 +1,43 @@ +/* + * 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 + * + * https://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.tools.ant.taskdefs.optional.net; + +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPSClient; + +/** + * Basic FTPS client. Performs the following actions: + * + * This class is an extention of FTP class that supports FTPS Client for FTPS taskdef. + * + */ +public class FTPS extends FTP { + @Override + protected FTPClient getFTPClient(){ + return new FTPSClient(); + } +}