diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/commons-vfs | |
download | gentoo-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')
-rw-r--r-- | dev-java/commons-vfs/Manifest | 2 | ||||
-rw-r--r-- | dev-java/commons-vfs/commons-vfs-1.0.ebuild | 64 | ||||
-rw-r--r-- | dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild | 70 | ||||
-rw-r--r-- | dev-java/commons-vfs/files/1.0-noget.patch | 20 | ||||
-rw-r--r-- | dev-java/commons-vfs/files/commons-vfs-2.0-build.xml | 298 | ||||
-rw-r--r-- | dev-java/commons-vfs/files/commons-vfs-2.0-incompatibility.patch | 41 | ||||
-rw-r--r-- | dev-java/commons-vfs/metadata.xml | 11 |
7 files changed, 506 insertions, 0 deletions
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest new file mode 100644 index 000000000000..d29b90f0446d --- /dev/null +++ b/dev-java/commons-vfs/Manifest @@ -0,0 +1,2 @@ +DIST commons-vfs-1.0-src.tar.gz 278588 SHA256 796af4b966b06f9147b062efa4f590689177c80534edf9702009812548ebe957 SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1 WHIRLPOOL 98d0083377daad95675e7204818de2617cf7a9c9821b6701bb1907c2e6c33907c6003fb3b97446f54205c87e3b32744c3c390e30b597825b45f5c084930e54c7 +DIST commons-vfs-2.0-src.tar.gz 335255 SHA256 a90d4d1e9ff17bb856d0d9eb56dd8587db9e7ed33a10e0a680534e125e7a6ebe SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346 WHIRLPOOL 43427c215f3eaaf5cba46682a99d31b1767f24dc9eb85f8b0a31e9b1a2ada421c11f8c60211c37b0922d48a35696663109dcfbfe0474175f7d8da7a12ac8266f diff --git a/dev-java/commons-vfs/commons-vfs-1.0.ebuild b/dev-java/commons-vfs/commons-vfs-1.0.ebuild new file mode 100644 index 000000000000..0818ef639ddd --- /dev/null +++ b/dev-java/commons-vfs/commons-vfs-1.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="a single API for accessing various different file systems" +HOMEPAGE="http://commons.apache.org/vfs/" +SRC_URI="mirror://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +COMMON_DEP=" + dev-java/commons-logging + dev-java/commons-net + =dev-java/commons-httpclient-3* + dev-java/jsch + dev-java/commons-collections + dev-java/ant-core" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.4 + ${COMMON_DEP}" + +S=${WORKDIR}/${P}-src + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/1.0-noget.patch" + java-ant_rewrite-classpath + java-ant_ignore-system-classes +} + +EANT_GENTOO_CLASSPATH=" + commons-logging + commons-net + commons-httpclient-3 + jsch + commons-collections + ant-core +" +EANT_EXTRA_ARGS="-Dlibdir=${T}" + +# The build.xml is generated from maven and can't run the tests properly +# Use maven test to execute these manually but that means downloading deps from +# the internet. Also the tests need to login to some ftp servers and samba +# shares so I doubt they work for everyone. +#src_test() { +# ANT_TASKS="ant-junit" eant test +#} + +src_install() { + java-pkg_newjar target/*.jar + dodoc *.txt || die + use doc && java-pkg_dojavadoc ./dist/docs/api + use source && java-pkg_dosrc ./core/src/main/java +} diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild new file mode 100644 index 000000000000..ebef964920ed --- /dev/null +++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A single API for accessing various different file systems" +HOMEPAGE="http://commons.apache.org/vfs/" +SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +CDEPEND=" + dev-java/ant-core:0 + dev-java/commons-collections:0 + dev-java/commons-logging:0 + dev-java/commons-net:0 + dev-java/commons-httpclient:3 + dev-java/jackrabbit-webdav:0 + dev-java/jsch:0 + " + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${P}/core" + +java_prepare() { + epatch "${FILESDIR}"/${P}-incompatibility.patch + + cp "${FILESDIR}"/${P}-build.xml build.xml || die + + java-ant_rewrite-classpath + java-ant_ignore-system-classes +} + +EANT_GENTOO_CLASSPATH=" + ant-core + commons-collections + commons-logging + commons-net + commons-httpclient-3 + jackrabbit-webdav + jsch +" +EANT_EXTRA_ARGS="-Dlibdir=${T}" + +# The build.xml is generated from maven and can't run the tests properly +# Use maven test to execute these manually but that means downloading deps from +# the internet. Also the tests need to login to some ftp servers and samba +# shares so I doubt they work for everyone. +#src_test() { +# ANT_TASKS="ant-junit" eant test +#} + +src_install() { + java-pkg_newjar target/*.jar + + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java +} diff --git a/dev-java/commons-vfs/files/1.0-noget.patch b/dev-java/commons-vfs/files/1.0-noget.patch new file mode 100644 index 000000000000..d1a6b5620fd5 --- /dev/null +++ b/dev-java/commons-vfs/files/1.0-noget.patch @@ -0,0 +1,20 @@ +--- build.xml.orig 2007-02-11 00:21:37.000000000 +0200 ++++ build.xml 2007-02-11 00:21:55.000000000 +0200 +@@ -86,7 +86,7 @@ + </and> + </condition> + </target> +- <target name="compile" description="o Compile the code" depends="get-deps"> ++ <target name="compile" description="o Compile the code"> + <mkdir dir="${classesdir}"> + </mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> +@@ -191,7 +191,7 @@ + </classpath> + </javac> + </target> +- <target name="javadoc" description="o Generate javadoc" depends="get-deps"> ++ <target name="javadoc" description="o Generate javadoc"> + <mkdir dir="${javadocdir}"> + </mkdir> + <tstamp> diff --git a/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml new file mode 100644 index 000000000000..753e93d669f2 --- /dev/null +++ b/dev-java/commons-vfs/files/commons-vfs-2.0-build.xml @@ -0,0 +1,298 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 5/29/13 3:05 PM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="commons-vfs2-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="commons-vfs2-2.0"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.1" value=".."/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.build.testResourceDir.1" value=".."/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> + <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> + <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> + <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> + <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> + <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> + <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> + </path> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <pathelement location="${maven.repo.local}/ant/ant/1.6.2/ant-1.6.2.jar"/> + <pathelement location="${maven.repo.local}/commons-net/commons-net/2.2/commons-net-2.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/commons/commons-compress/1.1/commons-compress-1.1.jar"/> + <pathelement location="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> + <pathelement location="${maven.repo.local}/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <pathelement location="${maven.repo.local}/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-webdav/1.5.2/jackrabbit-webdav-1.5.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/jackrabbit/jackrabbit-jcr-commons/1.5.2/jackrabbit-jcr-commons-1.5.2.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.5.3/slf4j-api-1.5.3.jar"/> + <pathelement location="${maven.repo.local}/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar"/> + <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-api/1.4/maven-scm-api-1.4.jar"/> + <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svnexe/1.4/maven-scm-provider-svnexe-1.4.jar"/> + <pathelement location="${maven.repo.local}/org/apache/maven/scm/maven-scm-provider-svn-commons/1.4/maven-scm-provider-svn-commons-1.4.jar"/> + <pathelement location="${maven.repo.local}/regexp/regexp/1.3/regexp-1.3.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + <javac destdir="${maven.build.outputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.5" + verbose="false" + fork="false" + source="1.5"> + <src> + <pathelement location="${maven.build.srcDir.0}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <copy todir="${maven.build.outputDir}"> + <fileset dir="${maven.build.resourceDir.0}"> + <exclude name="**/*.java"/> + </fileset> + </copy> + <mkdir dir="${maven.build.outputDir}/META-INF"/> + <copy todir="${maven.build.outputDir}/META-INF"> + <fileset dir="${maven.build.resourceDir.1}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + <javac destdir="${maven.build.testOutputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.5" + verbose="false" + fork="false" + source="1.5"> + <src> + <pathelement location="${maven.build.testDir.0}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + </classpath> + </javac> + <copy todir="${maven.build.testOutputDir}"> + <fileset dir="${maven.build.testResourceDir.0}"/> + </copy> + <mkdir dir="${maven.build.testOutputDir}/META-INF"/> + <copy todir="${maven.build.testOutputDir}/META-INF"> + <fileset dir="${maven.build.testResourceDir.1}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${maven.test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/RunTest.java"/> + <exclude name="**/*$*"/> + </fileset> + </batchtest> + <batchtest todir="${maven.test.reports}" if="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/${test}.java"/> + <exclude name="**/RunTest.java"/> + <exclude name="**/*$*"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${maven.build.srcDir.0}" + packagenames="*" + destdir="${maven.reporting.outputDirectory}/apidocs" + access="protected" + old="false" + verbose="false" + encoding="iso-8859-1" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + source="1.5" + linksource="true" + breakiterator="false"> + <link href="http://download.oracle.com/javase/6/docs/api/"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + basedir="${maven.build.outputDir}" + excludes="**/package.html"> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + + <target name="get-deps" + depends="test-offline" + description="Download all dependencies" + unless="maven.mode.offline"> + </target> + +</project> 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(); diff --git a/dev-java/commons-vfs/metadata.xml b/dev-java/commons-vfs/metadata.xml new file mode 100644 index 000000000000..6f34aa065948 --- /dev/null +++ b/dev-java/commons-vfs/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>java</herd> + <longdescription lang="en"> + Commons VFS provides a single API for accessing various different file + systems. It presents a uniform view of the files from various different + sources, such as the files on local disk, on an HTTP server, or inside + a Zip archive. + </longdescription> +</pkgmetadata> |