natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Apache Commons VFS version 2 

(and watch VFS-360)
This commit is contained in:
Gintas Grigelionis 2017-09-16 20:56:56 +02:00
parent 45046b5fde
commit d2e4494b47
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy.xml
View File

@ -46,7 +46,7 @@
<dependency org="org.apache.ant" name="ant" rev="1.9.9" conf="default,ant"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.3" conf="default,httpclient->runtime,master"/>
<dependency org="oro" name="oro" rev="2.0.8" conf="default,oro"/>
<dependency org="commons-vfs" name="commons-vfs" rev="1.0" conf="default,vfs"/>
<dependency org="org.apache.commons" name="commons-vfs2" rev="2.1" conf="default,vfs"/>
<dependency org="com.jcraft" name="jsch" rev="0.1.54" conf="default,sftp"/>
<dependency org="com.jcraft" name="jsch.agentproxy" rev="0.0.9" conf="default,sftp"/>
<dependency org="com.jcraft" name="jsch.agentproxy.connector-factory" rev="0.0.9" conf="default,sftp"/>

12
src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
View File

@ -25,12 +25,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs.impl.StandardFileSystemManager;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileType;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.apache.ivy.core.settings.TimeoutConstraint;
import org.apache.ivy.plugins.repository.AbstractRepository;
import org.apache.ivy.plugins.repository.RepositoryCopyProgressListener;

10
src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
View File

@ -22,11 +22,11 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.vfs.FileContent;
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemManager;
import org.apache.commons.vfs.FileType;
import org.apache.commons.vfs2.FileContent;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileType;
import org.apache.ivy.plugins.repository.Resource;
import org.apache.ivy.plugins.resolver.VfsResolver;
import org.apache.ivy.util.Message;

20
src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
View File

@ -14,18 +14,19 @@
"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.
under the License.
-->
<!-- For all intents and purposes this is the providers.xml file included
in the jakarta-vfs-common distribution with the res and tmp schemas removed.
-->
<providers>
<default-provider class-name="org.apache.commons.vfs.provider.url.UrlFileProvider">
<!--
For all intents and purposes this is the providers.xml file included
in the jakarta-vfs-common distribution with the res and tmp schemas removed.
-->
<providers>
<default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider">
</default-provider>
<provider class-name="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider">
<provider class-name="org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider">
<scheme name="file"/>
</provider>
<provider class-name="org.apache.commons.vfs.provider.ftp.FtpFileProvider">
<provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider">
<scheme name="ftp"/>
<if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
</provider>
@ -41,8 +42,7 @@
<if-available class-name="org.apache.commons.httpclient.HttpClient"/>
</provider>
-->
<provider class-name="org.apache.commons.vfs.provider.sftp.SftpFileProvider">
<provider class-name="org.apache.commons.vfs2.provider.sftp.SftpFileProvider">
<scheme name="sftp"/>
<if-available class-name="javax.crypto.Cipher"/>
<if-available class-name="com.jcraft.jsch.JSch"/>

4
test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
View File

@ -21,8 +21,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.impl.StandardFileSystemManager;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.apache.ivy.Ivy;
import org.apache.ivy.util.FileUtil;