summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch')
-rw-r--r--dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
new file mode 100644
index 000000000000..298503ec6153
--- /dev/null
+++ b/dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch
@@ -0,0 +1,41 @@
+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
+--- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:28:39.072739044 +0200
++++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/ExceptionConverter.java 2013-07-05 15:30:24.799404027 +0200
+@@ -50,7 +50,7 @@
+ {
+ try
+ {
+- Element error = davExc.toXml(DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument());
++ Element error = davExc.toXml(DomUtil.createDocument());
+ if (DomUtil.matches(error, DavException.XML_ERROR, DavConstants.NAMESPACE))
+ {
+ if (DomUtil.hasChildElement(error, "exception", null))
+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
+--- a/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:28:39.072739044 +0200
++++ b/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java 2013-07-05 15:31:02.449403426 +0200
+@@ -63,6 +63,7 @@
+ import org.apache.jackrabbit.webdav.client.methods.UncheckoutMethod;
+ import org.apache.jackrabbit.webdav.client.methods.VersionControlMethod;
+ import org.apache.jackrabbit.webdav.property.DavProperty;
++import org.apache.jackrabbit.webdav.property.DavPropertyIterator;
+ import org.apache.jackrabbit.webdav.property.DavPropertyName;
+ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
+ import org.apache.jackrabbit.webdav.property.DavPropertySet;
+@@ -294,7 +294,7 @@
+ DavPropertySet properties = getProperties(fileName, PropFindMethod.PROPFIND_ALL_PROP,
+ new DavPropertyNameSet(), false);
+ @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+- Iterator<DavProperty> iter = properties.iterator();
++ DavPropertyIterator iter = properties.iterator();
+ while (iter.hasNext())
+ {
+ DavProperty property = iter.next();
+@@ -302,7 +302,7 @@
+ }
+ properties = getPropertyNames(fileName);
+ @SuppressWarnings("unchecked") // iterator() is documented to return DavProperty instances
+- Iterator<DavProperty> iter2 = properties.iterator();
++ DavPropertyIterator iter2 = properties.iterator();
+ while (iter2.hasNext())
+ {
+ DavProperty property = iter2.next();