/[gentoo-x86]/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
Gentoo

Contents of /dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Fri Jul 5 13:51:35 2013 UTC (6 years, 11 months ago) by tomwij
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Error occurred while calculating annotation data.
Version bump to 2.0, needed for version bump of dev-java/ant-ivy to 2.3.0.

(Portage version: 2.1.12.11/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

1 diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java
2 --- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:28:39.072739044 +0200
3 +++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:30:24.799404027 +0200
4 @@ -50,7 +50,7 @@
5 {
6 try
7 {
8 - Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument());
9 + Element error = davExc.toXml(DomUtil.createDocument());
10 if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
11 {
12 if (DomUtil.hasChildElement(error, "exception", null))
13 diff -urN a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
14 --- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:28:39.072739044 +0200
15 +++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:31:02.449403426 +0200
16 @@ -63,6 +63,7 @@
17 import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod;
18 import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod;
19 import org.apache.jackrabbit.webdav.property.DavProperty;
20 +import org.apache.jackrabbit.webdav.property.DavPropertyIterator;
21 import org.apache.jackrabbit.webdav.property.DavPropertyName;
22 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
23 import org.apache.jackrabbit.webdav.property.DavPropertySet;
24 @@ -294,7 +294,7 @@
25 DavPropertySet properties = getProperties(fileName, PropFindMethod.PROPFIND_ALL_PROP,
26 new DavPropertyNameSet(), false);
27 @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
28 - Iterator<DavProperty> iter = properties.iterator();
29 + DavPropertyIterator iter = properties.iterator();
30 while (iter.hasNext())
31 {
32 DavProperty property = iter.next();
33 @@ -302,7 +302,7 @@
34 }
35 properties = getPropertyNames(fileName);
36 @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
37 - Iterator<DavProperty> iter2 = properties.iterator();
38 + DavPropertyIterator iter2 = properties.iterator();
39 while (iter2.hasNext())
40 {
41 DavProperty property = iter2.next();

  ViewVC Help
Powered by ViewVC 1.1.20