Author: maartenc
Date: Thu Jun 21 14:41:21 2007
New Revision: 549622
URL: http://svn.apache.org/viewvc?view=rev&rev=549622
Log:
IMPROVEMENT: Upgraded VFS dependency to 1.0 and removed dependency on
VFS-sandbox (IVY-498)
Removed:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/IvyWebdavClientFactory.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/IvyWebdavConnectionManager.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/IvyWebdavFileProvider.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/IvyWebdavFileSystem.java
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/ivy.xml
incubator/ivy/core/trunk/ivysettings.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=549622&r1=549621&r2=549622
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Thu Jun 21 14:41:21 2007
@@ -53,6 +53,7 @@
- NEW: A checkstyle report is generated (IVY-483) (thanks to Jan Materne)
- NEW: Hide private or specific conf when publishing (IVY-77)
+- IMPROVEMENT: Upgraded VFS dependency to 1.0 and removed dependency on
VFS-sandbox (IVY-498)
- IMPROVEMENT: Use maven2 repository to download dependencies
- IMPROVEMENT: Allow "main" parameters to be passed directly (instead of using
-args flag) (IVY-480) (thanks to Archie Cobbs)
- IMPROVEMENT: Remove @author tags (thanks to Stephane Bailliez)
Modified: incubator/ivy/core/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ivy.xml?view=diff&rev=549622&r1=549621&r2=549622
==============================================================================
--- incubator/ivy/core/trunk/ivy.xml (original)
+++ incubator/ivy/core/trunk/ivy.xml Thu Jun 21 14:41:21 2007
@@ -26,7 +26,6 @@
<conf name="httpclient" extends="core" description="core +
optional httpclient for better http handling"/>
<conf name="oro" extends="core" description="to use optional
glob matcher"/>
<conf name="vfs" extends="core" description="core + optional
VirtualFileSystem(VFS) support" />
- <conf name="webdav" extends="core" description="core + optional
VirtualFileSystem(VFS) with webdav support" />
<conf name="sftp" extends="core" description="core + optional
SFTP support" />
<conf name="standalone" extends="core" description="to launch
in standalone mode (from command line)"/>
<conf name="default" description="full ivy with all
dependencies"/>
@@ -45,7 +44,7 @@
<exclude org="junit" name="junit"/>
</dependency>
<dependency org="oro" name="oro" rev="2.0.8"
conf="default,oro->default"/>
- <dependency org="commons-vfs" name="commons-vfs" rev="20060920"
conf="vfs->default;default,webdav->webdav" />
+ <dependency org="commons-vfs" name="commons-vfs" rev="1.0"
conf="default,vfs->default" />
<dependency org="jsch" name="jsch" rev="0.1.25"
conf="default,sftp->default" />
<!-- Test depdendencies -->
<dependency org="ant" name="ant-launcher" rev="1.6.5"
conf="test->default"/>
Modified: incubator/ivy/core/trunk/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/ivysettings.xml?view=diff&rev=549622&r1=549621&r2=549622
==============================================================================
--- incubator/ivy/core/trunk/ivysettings.xml (original)
+++ incubator/ivy/core/trunk/ivysettings.xml Thu Jun 21 14:41:21 2007
@@ -20,26 +20,6 @@
<include url="${ivy.default.conf.dir}/ivysettings-local.xml"/>
<settings defaultResolver="public" />
<resolvers>
- <chain name="public" returnFirst="true">
- <ibiblio name="ibiblio" m2compatible="true"/>
- <url name="ivy" namespace="ivyrep-ns">
- <ivy
pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
- <artifact
pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
- </url>
- </chain>
+ <ibiblio name="public" m2compatible="true"/>
</resolvers>
- <namespaces>
- <namespace name="ivyrep-ns">
- <rule>
- <fromsystem>
- <src org="commons-vfs|slide" />
- <dest org="apache"/>
- </fromsystem>
- <tosystem>
- <src module="(.*)"/>
- <dest org="$m1"/>
- </tosystem>
- </rule>
- </namespace>
- </namespaces>
</ivysettings>
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml?view=diff&rev=549622&r1=549621&r2=549622
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
Thu Jun 21 14:41:21 2007
@@ -39,14 +39,6 @@
<if-available class-name="org.apache.commons.httpclient.HttpClient"/>
</provider>
-->
- <provider
class-name="org.apache.ivy.plugins.repository.vfs.IvyWebdavFileProvider">
- <scheme name="webdav"/>
- <if-available class-name="org.apache.webdav.lib.WebdavResource"/>
- <if-available class-name="org.apache.commons.httpclient.HttpClient"/>
- </provider>
- <provider
class-name="org.apache.commons.vfs.provider.temp.TemporaryFileProvider">
- <scheme name="tmp"/>
- </provider>
<provider
class-name="org.apache.commons.vfs.provider.sftp.SftpFileProvider">
<scheme name="sftp"/>
