From 2480e1e654d370620dbcd8d353c57c5210f3e083 Mon Sep 17 00:00:00 2001 From: Matt Wringe Date: Mar 14 2007 19:48:51 +0000 Subject: auto-import maven-wagon-1.0-0.1.a5.3jpp.1 on branch devel from maven-wagon-1.0-0.1.a5.3jpp.1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..022e372 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wagon-1.0-alpha-5-src.tar.gz diff --git a/maven-wagon-AbstractSshWagon.patch b/maven-wagon-AbstractSshWagon.patch new file mode 100644 index 0000000..bd120e7 --- /dev/null +++ b/maven-wagon-AbstractSshWagon.patch @@ -0,0 +1,11 @@ +--- wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java.sav 2006-04-05 15:01:16.000000000 +0200 ++++ wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java 2006-04-05 15:10:41.000000000 +0200 +@@ -173,7 +173,7 @@ + + try + { +- proxy.connect( session, host, port ); ++ proxy.connect( null, host, port, 15 ); + } + catch ( Exception e ) + { diff --git a/maven-wagon.spec b/maven-wagon.spec new file mode 100644 index 0000000..3e2dcbb --- /dev/null +++ b/maven-wagon.spec @@ -0,0 +1,418 @@ +# Needs to be re-enabled when spec files starts building with maven2 +## If you don't want to build with maven, and use straight ant instead, +## give rpmbuild option '--without maven' +# +#%define _without_maven 1 +#%define with_maven %{!?_without_maven:1}%{?_without_maven:0} +#%define without_maven %{?_without_maven:1}%{!?_without_maven:0} + +%define bname wagon + +# FIXME1: wagon-scm has been disabled for now due to maven-scm dependency +# FIXME2: haltOnFailure/Error has been set to false for +# wagon-http/wagon-ssh-external tests due to failures. +# FIXME3: Change spec file to build with maven2 +# FIXME4: Add javadoc options ant build + +Name: maven-%{bname} +Version: 1.0 +Release: 0.1.a5.3jpp.1%{?dist} +Epoch: 0 +Summary: Tools to manage artifacts and deployment +License: Apache Software License +Group: Development/Java +URL: http://maven.apache.org/wagon +Source0: wagon-1.0-alpha-5-src.tar.gz +# svn export http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-alpha-5/ +# tar czvf wagon-1.0-alpha-5-src.tar.gz wagon-1.0-alpha-5 + +# The following sources (1-17) were generated by running the maven2 ant task +# inside the root directory of Source0: "mvn ant:ant" +Source1: wagon-1.0-alpha5-provider-api-build.xml +Source3: wagon-1.0-alpha5-provider-test-build.xml +Source5: wagon-1.0-alpha5-providers-file-build.xml +Source7: wagon-1.0-alpha5-providers-ftp-build.xml +Source9: wagon-1.0-alpha5-providers-http-build.xml +Source11: wagon-1.0-alpha5-providers-http-lightweight-build.xml +Source13: wagon-1.0-alpha5-providers-scm-build.xml +Source15: wagon-1.0-alpha5-providers-ssh-build.xml +Source17: wagon-1.0-alpha5-providers-ssh-external-build.xml + +Patch0: wagon-1.0-provider-api-index.patch +Patch1: wagon-1.0-FtpWagon.patch +Patch2: wagon-1.0-ScmWagon.patch +Patch3: wagon-1.0-TraditionalUIKeyboardInteractive.patch +Patch4: maven-wagon-AbstractSshWagon.patch + +Patch5: wagon-1.0-alpha5-provider-api-build_xml.patch +Patch6: wagon-1.0-alpha5-providers-file-build_xml.patch +Patch7: wagon-1.0-alpha5-providers-ftp-build_xml.patch +Patch8: wagon-1.0-alpha5-providers-http-build_xml.patch +Patch9: wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch +Patch10: wagon-1.0-alpha5-providers-scm-build_xml.patch +Patch11: wagon-1.0-alpha5-providers-ssh-build_xml.patch +Patch12: wagon-1.0-alpha5-providers-ssh-external-build_xml.patch +Patch13: wagon-1.0-alpha5-provider-test-build_xml.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: jpackage-utils >= 0:1.6 +BuildRequires: ant +BuildRequires: junit +BuildRequires: classworlds +BuildRequires: concurrent +BuildRequires: jakarta-commons-net +BuildRequires: jakarta-commons-codec +BuildRequires: jakarta-commons-collections +BuildRequires: jakarta-commons-httpclient +BuildRequires: jakarta-commons-logging +BuildRequires: jsch >= 0:0.1.26 +BuildRequires: oro +BuildRequires: plexus-container-default +BuildRequires: plexus-interactivity +BuildRequires: plexus-utils +BuildRequires: servletapi5 +BuildRequires: jline + +# Commented until wagon-scm subproject can be built. +#BuildRequires: excalibur-avalon-framework-api +#BuildRequires: excalibur-avalon-framework-impl +#BuildRequires: excalibur-cornerstone-connection-api +#BuildRequires: excalibur-cornerstone-connection-impl +#BuildRequires: excalibur-cornerstone-sockets-api +#BuildRequires: excalibur-cornerstone-sockets-impl +#BuildRequires: excalibur-cornerstone-threads-api +#BuildRequires: excalibur-cornerstone-threads-impl +#BuildRequires: excalibur-pool-api +#BuildRequires: excalibur-pool-impl +#BuildRequires: excalibur-thread-api +#BuildRequires: excalibur-thread-impl +#BuildRequires: maven-scm +#BuildRequires: plexus-avalon-personality +#BuildRequires: plexus-ftpd +#BuildRequires: plexus-jetty-httpd + +%description +Maven Wagon is a transport abstraction that is used in Maven's +artifact and repository handling code. Currently wagon has the +following providers: +* File +* HTTP +* FTP +* SSH/SCP +* WebDAV (in progress) + +# Needs to be re-enabled when spec files starts building with maven2 +#%package javadoc +#Summary: Javadoc for %{name} +#Group: Development/Documentation +# +#%description javadoc +#Javadoc for %{name}. +# +#%if %{with_maven} +#%package manual +#Summary: Documents for %{name} +#Group: Development/Documentation + +#%description manual +#Documents for %{name}. +#%endif + +%prep +%setup -q -n %{bname}-%{version}-alpha-5 +cp %{SOURCE1} wagon-provider-api/build.xml +cp %{SOURCE3} wagon-provider-test/build.xml +cp %{SOURCE5} wagon-providers/wagon-file/build.xml +cp %{SOURCE7} wagon-providers/wagon-ftp/build.xml +cp %{SOURCE9} wagon-providers/wagon-http/build.xml +cp %{SOURCE11} wagon-providers/wagon-http-lightweight/build.xml +cp %{SOURCE13} wagon-providers/wagon-scm/build.xml +cp %{SOURCE15} wagon-providers/wagon-ssh/build.xml +cp %{SOURCE17} wagon-providers/wagon-ssh-external/build.xml + +%patch0 -b .sav +%patch1 -b .sav +%patch2 -b .sav +%patch3 -b .sav +%patch4 -b .sav + +%patch5 -b .sav +%patch6 -b .sav +%patch7 -b .sav +%patch8 -b .sav +%patch9 -b .sav +%patch10 -b .sav +%patch11 -b .sav +%patch12 -b .sav +%patch13 -b .sav + +%build +pushd wagon-provider-api +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/utils +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +pushd wagon-provider-test +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils junit +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +pushd wagon-providers/wagon-file +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +pushd wagon-providers/wagon-http-lightweight +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +# We don't ship Jetty +# so we removed 'jetty4' and 'plexus/jetty-httpd' from the list below +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds servletapi5 + +# Since we don't ship jetty, we also need to remove tests that need it +rm -f src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java + +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +# commented until wagon-scm can be built +#pushd wagon-providers/wagon-scm +#%if %{with_maven} +#maven \ +# -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \ +# -Dmaven.home.local=$MAVEN_HOME_LOCAL \ +# jar:install javadoc +#%else +#mkdir -p target/lib +#cp ../../wagon-provider-api/target/wagon-provider-api*.jar target/lib +#cp ../../wagon-provider-test/target/wagon-provider-test*.jar target/lib +#build-jar-repository -s -p target/lib plexus/container-default plexus/utils classworlds \ +#maven-scm/api \ +#maven-scm/test \ +#maven-scm/manager-plexus \ +#maven-scm/provider-cvs \ +#maven-scm/provider-svn \ + +#ant jar javadoc +#%endif +#popd + +pushd wagon-providers/wagon-ssh-external +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds +export ANT_OPTS="-Dtest.host=$(hostname)" +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY -Dtest.host=$(hostname) jar #javadoc +popd + +pushd wagon-providers/wagon-ssh +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \ +plexus/interactivity-api plexus/interactivity-jline jsch jline +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY -Dtest.host=$(hostname) jar #javadoc +popd + +pushd wagon-providers/wagon-http +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +# We don't ship Jetty +# so we removed 'jetty4' and 'plexus/jetty-httpd' from the list below +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \ +commons-httpclient commons-logging servletapi5 + +# Since we don't ship jetty, we also need to remove tests that need it +rm -f src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java + +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +pushd wagon-providers/wagon-ftp +export MAVEN_REPOSITORY=$PWD/.m2/respository +mkdir -p $MAVEN_REPOSITORY +cp ../../wagon-provider-api/target/wagon-provider-api*.jar $MAVEN_REPOSITORY +cp ../../wagon-provider-test/target/wagon-provider-test*.jar $MAVEN_REPOSITORY +# FIXME we don't ship plexus ftpd +# After we get Excalibur, it would be nice to ship it also +# and add plexus/ftpd back into the list below + +build-jar-repository -s -p $MAVEN_REPOSITORY plexus/container-default plexus/utils classworlds \ +concurrent \ +commons-collections commons-net \ +oro +ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPOSITORY jar #javadoc +popd + +%install +rm -rf $RPM_BUILD_ROOT +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -m 644 wagon-provider-api/target/wagon-provider-api-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api-%{version}.jar +install -m 644 wagon-providers/wagon-file/target/wagon-file-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/file-%{version}.jar +install -m 644 wagon-providers/wagon-ftp/target/wagon-ftp-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp-%{version}.jar +install -m 644 wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight-%{version}.jar +install -m 644 wagon-providers/wagon-http/target/wagon-http-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/http-%{version}.jar + +# commented until wabon-scm can be built +#install -m 644 wagon-providers/wagon-scm/target/wagon-scm-1.0-alpha-5.jar \ +# $RPM_BUILD_ROOT%{_javadir}/%{name}/scm-%{version}.jar + +install -m 644 wagon-providers/wagon-ssh-external/target/wagon-ssh-external-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external-%{version}.jar +install -m 644 wagon-providers/wagon-ssh/target/wagon-ssh-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-%{version}.jar +install -m 644 wagon-provider-test/target/wagon-provider-test-1.0-alpha-5.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test-%{version}.jar + +(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +install -m 644 wagon-provider-api/LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} + +# Needs to be re-enabled when spec files starts building with maven2 +## javadoc +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api +#cp -pr wagon-provider-api/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-api +#rm -rf wagon-provider-api/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file +#cp -pr wagon-providers/wagon-file/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/file +#rm -rf wagon-providers/wagon-file/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp +#cp -pr wagon-providers/wagon-ftp/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ftp +#rm -rf wagon-providers/wagon-ftp/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight +#cp -pr wagon-providers/wagon-http-lightweight/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http-lightweight +#rm -rf wagon-providers/wagon-http-lightweight/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http +#cp -pr wagon-providers/wagon-http/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/http +#rm -rf wagon-providers/wagon-http/target/docs/apidocs +# +## commented until wagon-scm can be build +##install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm +##cp -pr wagon-providers/wagon-scm/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/scm +##rm -rf wagon-providers/wagon-scm/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external +#cp -pr wagon-providers/wagon-ssh-external/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh-external +#rm -rf wagon-providers/wagon-ssh-external/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh +#cp -pr wagon-providers/wagon-ssh/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ssh +#rm -rf wagon-providers/wagon-ssh/target/docs/apidocs +# +#install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test +#cp -pr wagon-provider-test/target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/provider-test +#rm -rf wagon-provider-test/target/docs/apidocs +# +#ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +# +# manual +#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +#install -m 644 wagon-provider-api/LICENSE.txt \ +# $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +#%if %{with_maven} +#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/provider-api +#cp -pr wagon-provider-api/target/docs/* \ +# $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/provider-api +# +## commented until wagon-scm can be built +##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/file +##cp -pr wagon-providers/wagon-file/target/docs/* \ +## $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/file +# +#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ftp +#cp -pr wagon-providers/wagon-ftp/target/docs/* \ +# $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ftp +#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http +#cp -pr wagon-providers/wagon-http/target/docs/* \ +# $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http +# +## commented until wagon-scm can be built +##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http-lightweight +##cp -pr wagon-providers/wagon-http-lightweight/target/docs/* \ +## $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/http-lightweight +##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/scm +##cp -pr wagon-providers/wagon-scm/target/docs/* \ +## $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/scm +# +#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh +#cp -pr wagon-providers/wagon-ssh/target/docs/* \ +# $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh +# +## commented until wagon-scm can be built +##install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh-external +##cp -pr wagon-providers/wagon-ssh-external/target/docs/* \ +## $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ssh-external +#%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_javadir}/* +%doc %{_docdir}/%{name}-%{version}/LICENSE.txt + +# Needs to be re-enabled when spec files starts building with maven2 +#%files javadoc +#%defattr(-,root,root,-) +#%doc %{_javadocdir}/* + +# Needs to be re-enabled when spec files starts building with maven2 +#%if %{with_maven} +#%files manual +#%defattr(-,root,root,-) +#%doc %{_docdir}/%{name}-%{version} +#%endif + +%changelog +* Tue Mar 13 2007 Matt Wringe - 0:1.0-0.1.a5.3jpp.1 +- Merge in the changes neeeded to build without jetty +- Fix rpmlint issues +- Generate new *-build.xml files from pom.xml files as origins of + *-project files is unknown. +- Remove maven1 project.xml files from sources +- Comment out various section requiring maven or javadocs + (to be re-enabled at a future time). Note that the ant:ant task + for maven2 does not currently generate javadocs. + +* Tue Apr 04 2006 Ralph Apel - 0:1.0-0.a5.3jpp +- Require j-c-codec, to build with j-c-httpclient = 3.0 + +* Thu Dec 22 2005 Deepak Bhole - 0:1.0-0.a5.2jpp +- Commented out potentially superfluous dependencies. +- Disabled wagon-scm + +* Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a5.1jpp +- First JPackage build + diff --git a/sources b/sources index e69de29..3c04c08 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6713a6f7329e35958d2b339e372b7424 wagon-1.0-alpha-5-src.tar.gz diff --git a/wagon-1.0-FtpWagon.patch b/wagon-1.0-FtpWagon.patch new file mode 100644 index 0000000..5ec6304 --- /dev/null +++ b/wagon-1.0-FtpWagon.patch @@ -0,0 +1,11 @@ +--- wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java.sav 2005-11-02 17:41:03.000000000 +0100 ++++ wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java 2005-11-02 17:42:02.000000000 +0100 +@@ -326,7 +326,7 @@ + String filename = PathUtils.filename( resource.getName() ); + FTPFile[] ftpFiles = ftp.listFiles( filename ); + +- if ( ftpFiles == null ) ++ if ( ftpFiles == null || ftpFiles.length == 0 ) + { + throw new ResourceDoesNotExistException( "Could not find file: '" + resource + "'" ); + } diff --git a/wagon-1.0-ScmWagon.patch b/wagon-1.0-ScmWagon.patch new file mode 100644 index 0000000..44cfab9 --- /dev/null +++ b/wagon-1.0-ScmWagon.patch @@ -0,0 +1,58 @@ +--- wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java.sav 2005-11-04 09:57:43.000000000 +0100 ++++ wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java 2005-11-04 10:27:07.000000000 +0100 +@@ -153,16 +153,16 @@ + // TODO: ewwww + if ( new File( basedir, ".svn" ).exists() || new File( basedir, "CVS" ).exists() ) + { +- scmManager.update( scmRepository, new ScmFileSet( basedir ), null ); ++ scmManager.getProviderByRepository( scmRepository ).update( scmRepository, new ScmFileSet( basedir ), null ); + } + else + { + File lastOne = mkdirs( basedir, scmRepository ); +- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ), null ); ++ scmManager.getProviderByRepository( scmRepository ).checkOut( scmRepository, new ScmFileSet( basedir ), null ); + + if ( lastOne != null ) + { +- ScmResult result = scmManager.checkIn( scmRepository, ++ ScmResult result = scmManager.getProviderByRepository( scmRepository ).checkIn( scmRepository, + new ScmFileSet( lastOne.getParentFile(), lastOne ), null, + msg ); + if ( !result.isSuccess() ) +@@ -173,8 +173,8 @@ + } + + // TODO: detect if it is necessary to add first! +- scmManager.add( scmRepository, new ScmFileSet( basedir, scmFile ) ); +- ScmResult result = scmManager.checkIn( scmRepository, new ScmFileSet( basedir, scmFile ), null, msg ); ++ scmManager.getProviderByRepository( scmRepository ).add( scmRepository, new ScmFileSet( basedir, scmFile ) ); ++ ScmResult result = scmManager.getProviderByRepository( scmRepository ).checkIn( scmRepository, new ScmFileSet( basedir, scmFile ), null, msg ); + if ( !result.isSuccess() ) + { + throw new TransferFailedException( "Unable to commit file " + result.getCommandOutput() ); +@@ -214,7 +214,7 @@ + // TODO: ewwww + if ( !new File( basedir, ".svn" ).exists() && !new File( basedir, "CVS" ).exists() ) + { +- scmManager.add( scmRepository, new ScmFileSet( parent, basedir ) ); ++ scmManager.getProviderByRepository( scmRepository ).add( scmRepository, new ScmFileSet( parent, basedir ) ); + lastOne = basedir; + } + } +@@ -261,13 +261,13 @@ + // TODO: ewwww + if ( new File( basedir, ".svn" ).exists() || new File( basedir, "CVS" ).exists() ) + { +- scmManager.update( scmRepository, new ScmFileSet( basedir ), null ); ++ scmManager.getProviderByRepository( scmRepository ).update( scmRepository, new ScmFileSet( basedir ), null ); + } + else + { + // TODO: this should be checking out a full hierachy (requires the -d equiv) + basedir.mkdirs(); +- scmManager.checkOut( scmRepository, new ScmFileSet( basedir ), null ); ++ scmManager.getProviderByRepository( scmRepository ).checkOut( scmRepository, new ScmFileSet( basedir ), null ); + } + + if ( !scmFile.exists() ) diff --git a/wagon-1.0-TraditionalUIKeyboardInteractive.patch b/wagon-1.0-TraditionalUIKeyboardInteractive.patch new file mode 100644 index 0000000..2373eb4 --- /dev/null +++ b/wagon-1.0-TraditionalUIKeyboardInteractive.patch @@ -0,0 +1,19 @@ +--- wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/TraditionalUIKeyboardInteractive.java.sav 2005-10-10 18:37:16.000000000 +0200 ++++ wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/TraditionalUIKeyboardInteractive.java 2005-11-04 12:41:30.000000000 +0100 +@@ -16,6 +16,7 @@ + * limitations under the License. + */ + ++import java.util.regex.Pattern; + import com.jcraft.jsch.UIKeyboardInteractive; + import org.apache.maven.wagon.authentication.AuthenticationInfo; + +@@ -52,7 +53,7 @@ + String[] ret; + + if ( prompt.length == echo.length && prompt.length == 1 && !echo[0] && +- prompt[0].toLowerCase().contains( "password" ) ) ++ Pattern.matches(".*password.*", prompt[0].toLowerCase() ) ) + { + + ret = new String[1]; diff --git a/wagon-1.0-alpha5-provider-api-build.xml b/wagon-1.0-alpha5-provider-api-build.xml new file mode 100644 index 0000000..0e21962 --- /dev/null +++ b/wagon-1.0-alpha5-provider-api-build.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-provider-api-build_xml.patch b/wagon-1.0-alpha5-provider-api-build_xml.patch new file mode 100644 index 0000000..52723a5 --- /dev/null +++ b/wagon-1.0-alpha5-provider-api-build_xml.patch @@ -0,0 +1,18 @@ +--- wagon-provider-api/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-provider-api/build.xml 2007-03-13 14:52:02.000000000 -0400 +@@ -8,7 +8,7 @@ + + + +- ++ + + + +@@ -77,4 +77,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-provider-test-build.xml b/wagon-1.0-alpha5-provider-test-build.xml new file mode 100644 index 0000000..5a44543 --- /dev/null +++ b/wagon-1.0-alpha5-provider-test-build.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-provider-test-build_xml.patch b/wagon-1.0-alpha5-provider-test-build_xml.patch new file mode 100644 index 0000000..56b4e8a --- /dev/null +++ b/wagon-1.0-alpha5-provider-test-build_xml.patch @@ -0,0 +1,22 @@ +--- wagon-provider-test/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-provider-test/build.xml 2007-03-13 14:54:24.000000000 -0400 +@@ -8,11 +8,7 @@ + + + +- +- +- +- +- ++ + + + +@@ -55,4 +51,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-file-build.xml b/wagon-1.0-alpha5-providers-file-build.xml new file mode 100644 index 0000000..4dc3111 --- /dev/null +++ b/wagon-1.0-alpha5-providers-file-build.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-file-build_xml.patch b/wagon-1.0-alpha5-providers-file-build_xml.patch new file mode 100644 index 0000000..b8eff5d --- /dev/null +++ b/wagon-1.0-alpha5-providers-file-build_xml.patch @@ -0,0 +1,19 @@ +--- wagon-providers/wagon-file/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-file/build.xml 2007-03-13 14:52:21.000000000 -0400 +@@ -8,8 +8,7 @@ + + + +- +- ++ + + + +@@ -79,4 +78,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-ftp-build.xml b/wagon-1.0-alpha5-providers-ftp-build.xml new file mode 100644 index 0000000..d20fdf1 --- /dev/null +++ b/wagon-1.0-alpha5-providers-ftp-build.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-ftp-build_xml.patch b/wagon-1.0-alpha5-providers-ftp-build_xml.patch new file mode 100644 index 0000000..b466fde --- /dev/null +++ b/wagon-1.0-alpha5-providers-ftp-build_xml.patch @@ -0,0 +1,31 @@ +--- wagon-providers/wagon-ftp/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-ftp/build.xml 2007-03-13 14:52:37.000000000 -0400 +@@ -8,10 +8,7 @@ + + + +- +- +- +- ++ + + + +@@ -29,7 +26,8 @@ + + + +- ++ ++ + + + +@@ -86,4 +84,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-http-build.xml b/wagon-1.0-alpha5-providers-http-build.xml new file mode 100644 index 0000000..2e6235b --- /dev/null +++ b/wagon-1.0-alpha5-providers-http-build.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-http-build_xml.patch b/wagon-1.0-alpha5-providers-http-build_xml.patch new file mode 100644 index 0000000..6c53002 --- /dev/null +++ b/wagon-1.0-alpha5-providers-http-build_xml.patch @@ -0,0 +1,24 @@ +--- wagon-providers/wagon-http/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-http/build.xml 2007-03-13 14:52:55.000000000 -0400 +@@ -8,13 +8,7 @@ + + + +- +- +- +- +- +- +- ++ + + + +@@ -92,4 +86,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-http-lightweight-build.xml b/wagon-1.0-alpha5-providers-http-lightweight-build.xml new file mode 100644 index 0000000..268f8cc --- /dev/null +++ b/wagon-1.0-alpha5-providers-http-lightweight-build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch b/wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch new file mode 100644 index 0000000..2e83ed3 --- /dev/null +++ b/wagon-1.0-alpha5-providers-http-lightweight-build_xml.patch @@ -0,0 +1,19 @@ +--- wagon-providers/wagon-http-lightweight/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-http-lightweight/build.xml 2007-03-13 14:53:15.000000000 -0400 +@@ -8,8 +8,7 @@ + + + +- +- ++ + + + +@@ -82,4 +81,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-scm-build.xml b/wagon-1.0-alpha5-providers-scm-build.xml new file mode 100644 index 0000000..1884637 --- /dev/null +++ b/wagon-1.0-alpha5-providers-scm-build.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-scm-build_xml.patch b/wagon-1.0-alpha5-providers-scm-build_xml.patch new file mode 100644 index 0000000..9e51f61 --- /dev/null +++ b/wagon-1.0-alpha5-providers-scm-build_xml.patch @@ -0,0 +1,25 @@ +--- wagon-providers/wagon-scm/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-scm/build.xml 2007-03-13 14:53:30.000000000 -0400 +@@ -8,14 +8,7 @@ + + + +- +- +- +- +- +- +- +- ++ + + + +@@ -94,4 +87,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-ssh-build.xml b/wagon-1.0-alpha5-providers-ssh-build.xml new file mode 100644 index 0000000..6af647c --- /dev/null +++ b/wagon-1.0-alpha5-providers-ssh-build.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-ssh-build_xml.patch b/wagon-1.0-alpha5-providers-ssh-build_xml.patch new file mode 100644 index 0000000..c0d84b3 --- /dev/null +++ b/wagon-1.0-alpha5-providers-ssh-build_xml.patch @@ -0,0 +1,34 @@ +--- wagon-providers/wagon-ssh/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-ssh/build.xml 2007-03-13 14:53:50.000000000 -0400 +@@ -8,13 +8,7 @@ + + + +- +- +- +- +- +- +- ++ + + + +@@ -52,7 +46,8 @@ + + + +- ++ ++ + + + +@@ -92,4 +87,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-alpha5-providers-ssh-external-build.xml b/wagon-1.0-alpha5-providers-ssh-external-build.xml new file mode 100644 index 0000000..90e645a --- /dev/null +++ b/wagon-1.0-alpha5-providers-ssh-external-build.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ================================= WARNING ================================ + Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. + ========================================================================== + + + + + + + + + + + + \ No newline at end of file diff --git a/wagon-1.0-alpha5-providers-ssh-external-build_xml.patch b/wagon-1.0-alpha5-providers-ssh-external-build_xml.patch new file mode 100644 index 0000000..3c1245e --- /dev/null +++ b/wagon-1.0-alpha5-providers-ssh-external-build_xml.patch @@ -0,0 +1,29 @@ +--- wagon-providers/wagon-ssh-external/build.xml.orig 2007-03-13 14:50:18.000000000 -0400 ++++ wagon-providers/wagon-ssh-external/build.xml 2007-03-13 14:54:07.000000000 -0400 +@@ -8,8 +8,7 @@ + + + +- +- ++ + + + +@@ -44,7 +43,8 @@ + + + +- ++ ++ + + + +@@ -79,4 +79,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/wagon-1.0-provider-api-index.patch b/wagon-1.0-provider-api-index.patch new file mode 100644 index 0000000..ac76574 --- /dev/null +++ b/wagon-1.0-provider-api-index.patch @@ -0,0 +1,11 @@ +--- wagon-provider-api/xdocs/index.xml.sav 2005-11-02 09:33:29.000000000 +0100 ++++ wagon-provider-api/xdocs/index.xml 2005-11-02 09:34:06.000000000 +0100 +@@ -14,7 +14,7 @@ + The "Wagon API" project defines a simple API for transfering resources + (artifacts) to and from repositories. The word repository is used in this contextx as + it is commonly used in +- Maven ++ Maven + And means a storage of artfacts. + Wagon is a helper project for Maven and it is planned that Wagon will be used in feature + versions of Maven.