You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2008/03/31 11:22:04 UTC
svn commit: r642936 - in /ant/ivy/core/trunk: CHANGES.txt
META-INF/MANIFEST.MF
src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
Author: hibou
Date: Mon Mar 31 02:22:01 2008
New Revision: 642936
URL: http://svn.apache.org/viewvc?rev=642936&view=rev
Log:
IVY-785 : Classpath issues with vfs ftp while being used as a bundle
- add optionnal required bundle to make common-vfs work
- comment the smb configuration: it is not provided anymore in common-vfs, but in common-vfs-sandbox
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/META-INF/MANIFEST.MF
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=642936&r1=642935&r2=642936&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Mon Mar 31 02:22:01 2008
@@ -90,6 +90,7 @@
- FIX: XML entity parsing does not work properly (IVY-737) (thanks to Patrick Woodworth)
- FIX: Cachefileset task silently fails with parent dir ".." construct (IVY-638)
- FIX: SFTP should verify input parameter for hostname (IVY-734)
+- FIX: Classpath issues with vfs ftp while being used as a bundle (IVY-785)
- DOCUMENTATION: Add new cache information to resolver doc (IVY-772) (thanks to Carlton Brown)
Modified: ant/ivy/core/trunk/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/META-INF/MANIFEST.MF?rev=642936&r1=642935&r2=642936&view=diff
==============================================================================
--- ant/ivy/core/trunk/META-INF/MANIFEST.MF (original)
+++ ant/ivy/core/trunk/META-INF/MANIFEST.MF Mon Mar 31 02:22:01 2008
@@ -6,32 +6,37 @@
Bundle-SymbolicName: org.apache.ivy
Bundle-Vendor: Apache Software Foundation
Bundle-DocURL: http://incubator.apache.org/ivy
-Import-Package: javax.xml.parsers,
+Import-Package: com.jcraft.jsch;resolution:=optional,
+ javax.crypto,
+ javax.swing;resolution:=optional,
+ javax.swing.event;resolution:=optional,
+ javax.xml.parsers,
javax.xml.transform,
javax.xml.transform.sax,
javax.xml.transform.stream,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers,
- com.jcraft.jsch;resolution:=optional,
- javax.swing;resolution:=optional,
- javax.swing.event;resolution:=optional,
org.apache.commons.httpclient;resolution:=optional,
org.apache.commons.httpclient.methods;resolution:=optional,
org.apache.commons.httpclient.params;resolution:=optional,
org.apache.commons.httpclient.protocol;resolution:=optional,
+ org.apache.commons.net.ftp;resolution:=optional,
org.apache.commons.vfs;resolution:=optional,
org.apache.commons.vfs.impl;resolution:=optional,
org.apache.commons.vfs.provider;resolution:=optional,
- org.apache.commons.vfs.provider.webdav;resolution:=optional,
+ org.apache.commons.vfs.provider.ftp;resolution:=optional,
+ org.apache.commons.vfs.provider.local;resolution:=optional,
+ org.apache.commons.vfs.provider.sftp;resolution:=optional,
+ org.apache.commons.vfs.provider.url;resolution:=optional,
org.apache.oro.text;resolution:=optional,
org.apache.oro.text.regex;resolution:=optional,
- org.apache.webdav;resolution:=optional,
org.apache.tools.ant;resolution:=optional,
org.apache.tools.ant.filters;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
- org.apache.tools.ant.util;resolution:=optional
+ org.apache.tools.ant.util;resolution:=optional,
+ org.apache.webdav;resolution:=optional,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers
Export-Package: org.apache.ivy;version="2.0.0",
org.apache.ivy.ant;version="2.0.0",
org.apache.ivy.core;version="2.0.0",
@@ -78,3 +83,4 @@
org.apache.ivy.util.extendable;version="2.0.0",
org.apache.ivy.util.filter;version="2.0.0",
org.apache.ivy.util.url;version="2.0.0"
+Bundle-ClassPath: .
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml?rev=642936&r1=642935&r2=642936&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml Mon Mar 31 02:22:01 2008
@@ -29,10 +29,12 @@
<scheme name="ftp"/>
<if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
</provider>
+ <!-- FIXME: not available anymore in commons-vfs but in commons-vfs-sandbox
<provider class-name="org.apache.commons.vfs.provider.smb.SmbFileProvider">
<scheme name="smb"/>
<if-available class-name="jcifs.smb.SmbFile"/>
</provider>
+ -->
<!--
<provider class-name="org.apache.commons.vfs.provider.http.HttpFileProvider">
<scheme name="http"/>