[pkg-java] r8911 - in trunk/wagon/debian: . patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Mon Jul 6 22:27:06 UTC 2009


Author: ludovicc-guest
Date: 2009-07-06 22:27:06 +0000 (Mon, 06 Jul 2009)
New Revision: 8911

Added:
   trunk/wagon/debian/README.Debian
   trunk/wagon/debian/build.properties
   trunk/wagon/debian/libwagon-java-doc.doc-base
   trunk/wagon/debian/libwagon-java-doc.docs
   trunk/wagon/debian/libwagon-java.poms
   trunk/wagon/debian/maven.rules
   trunk/wagon/debian/orig-tar.sh
   trunk/wagon/debian/patches/series
   trunk/wagon/debian/patches/use_debian_neko_and_xerces.patch
   trunk/wagon/debian/wagon-file-components.xml
   trunk/wagon/debian/wagon-ftp-components.xml
   trunk/wagon/debian/wagon-http-components.xml
   trunk/wagon/debian/wagon-http-lightweight-components.xml
   trunk/wagon/debian/wagon-scm-components.xml
   trunk/wagon/debian/wagon-ssh-common-components.xml
   trunk/wagon/debian/wagon-ssh-components.xml
   trunk/wagon/debian/wagon-ssh-external-components.xml
   trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml
Removed:
   trunk/wagon/debian/patches/BadCatch.patch
   trunk/wagon/debian/wagon.doc-base
Modified:
   trunk/wagon/debian/build.xml
   trunk/wagon/debian/changelog
   trunk/wagon/debian/control
   trunk/wagon/debian/rules
   trunk/wagon/debian/watch
Log:
* New version

Added: trunk/wagon/debian/README.Debian
===================================================================
--- trunk/wagon/debian/README.Debian	                        (rev 0)
+++ trunk/wagon/debian/README.Debian	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,9 @@
+Maven Wagon for Debian
+----------------------
+
+The wagon provider for WebDAV is not packaged as there is a dependency on
+Apache JackRabbit, which is not yet in the Debian repository.
+
+Furthermore, JackRabbit depends on JCR, which is non-free. 
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 30 Apr 2009 11:17:02 +0100

Added: trunk/wagon/debian/build.properties
===================================================================
--- trunk/wagon/debian/build.properties	                        (rev 0)
+++ trunk/wagon/debian/build.properties	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,14 @@
+javadoc.dir=build/api
+maven.test.skip=true
+classpath.compile = \
+                    ${basedir}/wagon-provider-api/build/wagon-provider-api-${version}.jar:\
+                    ${basedir}/wagon-providers/wagon-http-shared/build/wagon-http-shared-${version}.jar:\
+                    ${basedir}/wagon-providers/wagon-ssh-common/build/wagon-ssh-common-${version}.jar:\
+                    /usr/share/java/jsch.jar:\
+                    /usr/share/java/maven-scm-api.jar:\
+                    /usr/share/java/nekohtml.jar:\
+                    /usr/share/java/xercesImpl.jar:\
+                    /usr/share/java/plexus-interactivity-api.jar:\
+                    /usr/share/java/plexus-utils.jar:\
+                    /usr/share/java/commons-net2.jar: \
+                    /usr/share/java/commons-httpclient.jar

Modified: trunk/wagon/debian/build.xml
===================================================================
--- trunk/wagon/debian/build.xml	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/build.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -1,148 +1,77 @@
 <?xml version="1.0"?>
 
-<!--
-      This build.xml file was written for the Debian project.
-      This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
+<project name="pkg-java" default="package" basedir="..">
 
-        This software and documentation is provided "as is," and
-        the copyright holders and contributing author(s) make no
-        representations or warranties, express or implied, including
-        but not limited to, warranties of merchantability or fitness
-        for any particular purpose or that the use of the software or
-        documentation will not infringe any third party patents,
-        copyrights, trademarks or other rights. 
+    <property file="debian/build.properties"/>
+    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
 
-        The copyright holders and contributing author(s) will not be
-        liable for any direct, indirect, special or consequential damages
-        arising out of any use of the software or documentation, even if
-        advised of the possibility of such damage.
+    <macrodef name="cleanmodule">
+	    <attribute name="dir"/>
+	    <sequential>
+		  <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+            <property name="debian.dir" location="debian" />
+            <property name="project.dir" value="@{dir}" />
+          </ant> 
+	    </sequential>
+    </macrodef>
 
-        Permission is hereby granted to use, copy, modify, and distribute
-        this source code, or portions hereof, documentation and executables,
-        for any purpose, without fee, subject to the following restrictions:
+    <macrodef name="packagemodule">
+	    <attribute name="dir"/>
+	    <sequential>
+		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+          <property name="debian.dir" location="debian" />
+          <property name="project.dir" value="@{dir}" />
+		</ant>
+	    </sequential>
+    </macrodef>
 
-        1. The origin of this source code must not be misrepresented.
-        2. Altered versions must be plainly marked as such and must
-           not be misrepresented as being the original source.
-        3. This Copyright notice may not be removed or altered from any
-           source or altered source distribution.
--->
+    <target name="clean">
+        <delete dir="build"/>
+        <cleanmodule dir="wagon-provider-api"/>
+        <cleanmodule dir="wagon-providers/wagon-file"/>
+        <cleanmodule dir="wagon-providers/wagon-ftp"/>
+        <cleanmodule dir="wagon-providers/wagon-http-shared"/>
+        <cleanmodule dir="wagon-providers/wagon-http-lightweight"/>
+        <cleanmodule dir="wagon-providers/wagon-http"/>
+        <cleanmodule dir="wagon-providers/wagon-scm"/>
+        <cleanmodule dir="wagon-providers/wagon-ssh-common"/>
+        <cleanmodule dir="wagon-providers/wagon-ssh-external"/>
+        <cleanmodule dir="wagon-providers/wagon-ssh"/>
+        <!--cleanmodule dir="wagon-providers/wagon-webdav-jackrabbit"/-->
+    </target>
 
-<project name="wagon" default="package" basedir="..">
+    <target name="package">
+        <packagemodule dir=""/>
+        <packagemodule dir="wagon-provider-api"/>
+        <packagemodule dir="wagon-providers/wagon-file"/>
+        <packagemodule dir="wagon-providers/wagon-ftp"/>
+        <packagemodule dir="wagon-providers/wagon-http-shared"/>
+        <packagemodule dir="wagon-providers/wagon-http-lightweight"/>
+        <packagemodule dir="wagon-providers/wagon-http"/>
+        <packagemodule dir="wagon-providers/wagon-scm"/>
+        <packagemodule dir="wagon-providers/wagon-ssh-common"/>
+        <packagemodule dir="wagon-providers/wagon-ssh-external"/>
+        <packagemodule dir="wagon-providers/wagon-ssh"/>
+		<!-- Cannot build as JackRabbit is not in the Debian repository -->
+        <!--packagemodule dir="wagon-providers/wagon-webdav-jackrabbit" />
+        -->
+    </target>
 
-<target name="package" depends="jar,javadoc"/>
+    <target name="javadoc">
+        <javadoc destdir="${javadoc.dir}">
+            <packageset dir="wagon-provider-api/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-file/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-ftp/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-http-lightweight/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-http-shared/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-http/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-scm/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-ssh-common/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-ssh-external/src/main/java/"/>
+            <packageset dir="wagon-providers/wagon-ssh/src/main/java/"/>
+            <!--packageset dir="wagon-providers/wagon-webdav-jackrabbit/src/main/java/"/-->
+        </javadoc>
+    </target>
 
-<target name="init">
-	<property name="src.dir" value="."/>
-	<property name="build.dir" value="build"/>
-	<property name="jar.suffix" value="-${version}.jar"/>
-	<property name="jar" value="${build.dir}/${package}-${version}.jar"/>
-	<property name="javadoc.dir" value="${build.dir}/doc/api"/>
-	<echo message="Classpath: ${java.class.path}" />
-</target>
-
-<target name="compile" depends="init">
-	<mkdir dir="${build.dir}"/>
-	<javac srcdir="${src.dir}"
-		destdir="${build.dir}"
-		debug="on">
-		<include name="wagon-openpgp/src/main/**/*.java"/>
-		<include name="wagon-provider-api/src/main/**/*.java"/>
-		<include name="wagon-providers/*/src/main/**/*.java"/>
-		<exclude name="wagon-providers/wagon-ssh-common-test/**"/>
-	</javac>
-</target>
-
-<target name="jar" depends="compile">
-	<delete file="${jar}"/>
-
-	<jar jarfile="${build.dir}/wagon-file${jar.suffix}"
-		basedir="${build.dir}"
-		includes="org/apache/maven/wagon/providers/file/*.class,**/*.properties" />
-
-	<jar jarfile="${build.dir}/wagon-ftp${jar.suffix}"
-		basedir="${build.dir}"
-		includes="org/apache/maven/wagon/providers/ftp/*.class,**/*.properties" />
-
-	<jar jarfile="${build.dir}/wagon-http${jar.suffix}"
-		basedir="${build.dir}"
-		includes="org/apache/maven/wagon/providers/http/*.class,**/*.properties"
-		excludes="org/apache/maven/wagon/providers/http/LightweightHttpWagon*.class" />
-
-	<jar jarfile="${build.dir}/wagon-http-lightweight${jar.suffix}"
-		basedir="${build.dir}"
-		includes="org/apache/maven/wagon/providers/http/LightweightHttpWagon*.class,**/*.properties" />
-
-	<jar jarfile="${build.dir}/wagon-http-shared${jar.suffix}"
-		basedir="${build.dir}"
-		includes="org/apache/maven/wagon/shared/http/*.class,**/*.properties" />
-
-	<jar jarfile="${build.dir}/wagon-provider-api${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/*.properties" />
-		<include name="org/apache/maven/wagon/*.class" />
-		<include name="org/apache/maven/wagon/authentication/*.class" />
-		<include name="org/apache/maven/wagon/authorization/*.class" />
-		<include name="org/apache/maven/wagon/events/*.class" />
-		<include name="org/apache/maven/wagon/observers/*.class" />
-		<include name="org/apache/maven/wagon/proxy/*.class" />
-		<include name="org/apache/maven/wagon/repository/*.class" />
-		<include name="org/apache/maven/wagon/resource/*.class" />
-	</jar>
-
-	<jar jarfile="${build.dir}/wagon-ssh${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/providers/ssh/jsch/**/*.properties" />
-		<include name="org/apache/maven/wagon/providers/ssh/jsch/*.class" />
-		<include name="org/apache/maven/wagon/providers/ssh/jsch/interactive/*.class" />
-	</jar>
-
-	<jar jarfile="${build.dir}/wagon-ssh-common${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/providers/ssh/**/*.properties" />
-		<include name="org/apache/maven/wagon/providers/ssh/*.class" />
-		<include name="org/apache/maven/wagon/providers/ssh/interactive/*.class" />
-		<include name="org/apache/maven/wagon/providers/ssh/knownhost/*.class" />
-	</jar>
-
-	<jar jarfile="${build.dir}/wagon-ssh-external${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/providers/ssh/external/**/*.properties" />
-		<include name="org/apache/maven/wagon/providers/ssh/external/*.class" />
-	</jar>
-
-	<jar jarfile="${build.dir}/wagon-openpgp${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/openpgp/*.properties" />
-		<include name="org/apache/maven/wagon/openpgp/*.class" />
-	</jar>
-
-	<jar jarfile="${build.dir}/wagon-webdav${jar.suffix}"
-		basedir="${build.dir}">
-		<include name="org/apache/maven/wagon/properties/webdav/*.class" />
-	</jar>
-</target>
-
-<target name="javadoc" depends="init">
-	<mkdir dir="${javadoc.dir}"/>
-	<javadoc 
-		packagenames="org.apache.maven.wagon,org.apache.maven.wagon.authentication,org.apache.maven.wagon.authorization,org.apache.maven.wagon.events,org.apache.maven.wagon.observers,org.apache.maven.wagon.openpgp,org.apache.maven.wagon.providers.file,org.apache.maven.wagon.providers.ftp,org.apache.maven.wagon.providers.http,org.apache.maven.wagon.providers.ssh,org.apache.maven.wagon.providers.ssh.external,org.apache.maven.wagon.providers.ssh.ganymed,org.apache.maven.wagon.providers.ssh.interactive,org.apache.maven.wagon.providers.ssh.jsch,org.apache.maven.wagon.providers.ssh.jsch.interactive,org.apache.maven.wagon.providers.ssh.knownhost,org.apache.maven.wagon.providers.webdav,org.apache.maven.wagon.proxy,org.apache.maven.wagon.repository,org.apache.maven.wagon.resource,org.apache.maven.wagon.shared.http"
-		sourcepath="wagon-openpgp/src/main/java:wagon-provider-api/src/main/java:wagon-providers/wagon-http-lightweight/src/main/java:wagon-providers/wagon-ssh-external/src/main/java:wagon-providers/wagon-ssh-ganymed/src/main/java:wagon-providers/wagon-ssh/src/main/java:wagon-providers/wagon-ssh-common/src/main/java:wagon-providers/wagon-webdav/src/main/java:wagon-providers/wagon-file/src/main/java:wagon-providers/wagon-http/src/main/java:wagon-providers/wagon-http-shared/src/main/java:wagon-providers/wagon-ftp/src/main/java"
-		destdir="${javadoc.dir}"
-		author="true"
-		version="true"
-		windowtitle="${package} API"
-		doctitle="${package} - ${version}"
-		classpath="${java.class.path}" >
-			<!--
-			<fileset dir="." defaultexcludes="yes">
-				<include name="**/main/java/**/*.java"/>
-			</fileset>
-			-->
-	</javadoc>
-</target>
-
-<target name="clean" depends="init">
-	<delete dir="${build.dir}"/>
-</target>
 </project>

Modified: trunk/wagon/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/changelog	2009-07-06 22:27:06 UTC (rev 8911)
@@ -1,3 +1,28 @@
+wagon (1.0-beta-5-1) unstable; urgency=low
+
+  * New upstream version (Closes: #531444)
+  * Add myself to Uploaders
+  * Bump up Standards-Version to 3.8.1
+  * Add the Maven POM to the package (Closes: #511870)
+  * Add a Build-Depends-Indep dependency on maven-repo-helper and 
+    maven-ant-helper, use quilt to patch one of the POM files.
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Use mh_mavenrepo to generate the update scripts for the Debian parent POM
+  * Update watch, orig-tar.sh and the get-orig-sources in debian/rules to use
+    SVN tags
+  * Remove the patch as it doesn't apply anymore
+  * Update the dependency list: remove libcommons-openpgp-java, 
+    libcommons-openpgp-java-doc, libganymed-ssh2-java, libjtidy-java, 
+    libjtidy-java-doc, libslide-webdavclient-java,
+    libplexus-classworlds-java, libplexus-component-api-java
+  * Add a dependency on libmaven-scm-java, libnekohtml-java
+  * Update debian/build.xml to use build.xml from maven-ant-helper,
+    making the build more modular.
+  * Renamed wagon.docbase to libwagon-java-doc.docbase to fix documentation
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 06 Jul 2009 23:19:57 +0100
+
 wagon (1.0-beta-2-4) unstable; urgency=low
 
   * Add missing Depends: ${misc:Depends}.

Modified: trunk/wagon/debian/control
===================================================================
--- trunk/wagon/debian/control	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/control	2009-07-06 22:27:06 UTC (rev 8911)
@@ -3,39 +3,31 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: default-jdk, ant-optional, libxalan2-java,
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+                     libxalan2-java,
                      junit, junit-doc,
                      libcommons-httpclient-java,
-                     libcommons-net-java,
-                     libcommons-openpgp-java, libcommons-openpgp-java-doc,
-                     libganymed-ssh2-java,
+                     libcommons-net2-java,
                      libjsch-java, libjsch-java-doc,
-                     libjtidy-java, libjtidy-java-doc,
-                     libplexus-classworlds-java, libplexus-classworlds-java-doc,
-                     libplexus-component-api-java, libplexus-component-api-java-doc, 
+                     libmaven-scm-java, libmaven-scm-java-doc,
+                     libnekohtml-java, libnekohtml-java-doc, 
                      libplexus-interactivity-api-java, libplexus-interactivity-api-java-doc, 
-                     libplexus-utils-java, libplexus-utils-java-doc,
-                     libslide-webdavclient-java
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.8.0
+                     libplexus-utils-java, libplexus-utils-java-doc
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), quilt, default-jdk
+Standards-Version: 3.8.1
 Homepage: http://maven.apache.org/wagon/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/wagon/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/wagon/
 
 Package: libwagon-java
 Architecture: all
-Depends: libcommons-httpclient-java,
-         libcommons-net-java,
-         libcommons-openpgp-java,
-         libganymed-ssh2-java,
+Depends: ${misc:Depends}, libcommons-httpclient-java,
+         libcommons-net2-java,
          libjsch-java,
-         libjtidy-java,
-         libplexus-classworlds-java,
-         libplexus-component-api-java,
+         libmaven-scm-java,
+         libnekohtml-java,
          libplexus-interactivity-api-java,
-         libplexus-utils-java,
-         libslide-webdavclient-java,
-	 ${misc:Depends}
+         libplexus-utils-java
 Suggests: libwagon-java-doc
 Homepage: http://maven.apache.org/wagon/
 Description: tools to manage Maven artifacts and deployment
@@ -61,13 +53,13 @@
   wagon-http-shared
     This package is a shared Library for the wagon-http, and
     wagon-http-lightweight wagon providers
+  wagon-scm
+    Implementation of Wagon provider for Source Control access.
+    Gets and puts artifacts using a Source Control Management system.
   wagon-ssh
     Implementation of Wagon provider for SCP and SFTP access.
     It enables Maven to deploy artifacts and sites to SSH servers. It
     uses JSch (Java Secure Channel) as lower level layer.
-  wagon-provider-api
-    Maven Wagon API defines the contract between different Wagon
-    implementations.
   wagon-ssh-common
     Implementation of Wagon provider for SCP and SFTP access. It
     enables Maven to deploy artifacts and sites to SSH servers.
@@ -77,23 +69,19 @@
     enables Maven to deploy artifacts and sites to SSH servers.
     It uses an external SSH program that has to be already installed
     in the system. Getting files from SSH servers is not fully tested.
-  wagon-webdav
+  wagon-webdav-jackrabbit
     Implementation of Wagon provider for WebDAV access.
-  wagon-openpgp
-    Maven Wagon OpenPGP Integration.
+    It uses the Apache JackRabbit library for WebDAV access.
 
 Package: libwagon-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc,
-         libcommons-openpgp-java-doc,
+Depends: ${misc:Depends}, classpath-doc,
+         libmaven-scm-java-doc,
+         libnekohtml-java-doc,
          libplexus-utils-java-doc,
-         libplexus-classworlds-java-doc,
-         libplexus-component-api-java-doc,
          libplexus-interactivity-api-java-doc,
-         libjsch-java-doc,
-         libjtidy-java-doc,
-	 ${misc:Depends}
+         libjsch-java-doc
 Suggests: libwagon-java
 Homepage: http://maven.apache.org/wagon/
 Description: tools to manage Maven artifacts and deployment

Added: trunk/wagon/debian/libwagon-java-doc.doc-base
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.doc-base	                        (rev 0)
+++ trunk/wagon/debian/libwagon-java-doc.doc-base	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,9 @@
+Document: libwagon-java
+Title: API Javadoc for Wagon
+Author: Wagon developers
+Abstract: This is the API Javadoc provided by the Wagon library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libwagon-java-doc/api/index.html
+Files: /usr/share/doc/libwagon-java-doc/api/*

Added: trunk/wagon/debian/libwagon-java-doc.docs
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.docs	                        (rev 0)
+++ trunk/wagon/debian/libwagon-java-doc.docs	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1 @@
+build/api

Added: trunk/wagon/debian/libwagon-java.poms
===================================================================
--- trunk/wagon/debian/libwagon-java.poms	                        (rev 0)
+++ trunk/wagon/debian/libwagon-java.poms	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,14 @@
+pom.xml --no-parent
+wagon-provider-api/pom.xml
+wagon-providers/pom.xml
+wagon-providers/wagon-file/pom.xml
+wagon-providers/wagon-ftp/pom.xml
+wagon-providers/wagon-http-lightweight/pom.xml
+wagon-providers/wagon-http-shared/pom.xml
+wagon-providers/wagon-http/pom.xml
+wagon-providers/wagon-scm/pom.xml
+wagon-providers/wagon-ssh-common/pom.xml
+wagon-providers/wagon-ssh-external/pom.xml
+wagon-providers/wagon-ssh/pom.xml
+
+

Added: trunk/wagon/debian/maven.rules
===================================================================
--- trunk/wagon/debian/maven.rules	                        (rev 0)
+++ trunk/wagon/debian/maven.rules	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,3 @@
+commons-net commons-net jar s/2\..+/2.x/
+junit junit jar s/3\..*/3.x/
+org.mortbay.jetty * * s/6..*/6.x/

Added: trunk/wagon/debian/orig-tar.sh
===================================================================
--- trunk/wagon/debian/orig-tar.sh	                        (rev 0)
+++ trunk/wagon/debian/orig-tar.sh	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+TAR=../wagon_$2.orig.tar.gz
+DIR=wagon-$2
+TAG=wagon-$2
+
+svn export http://svn.apache.org/repos/asf/maven/wagon/tags/$TAG/ $DIR
+rm -rf $DIR/lib
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
+


Property changes on: trunk/wagon/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/wagon/debian/patches/BadCatch.patch
===================================================================
--- trunk/wagon/debian/patches/BadCatch.patch	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/patches/BadCatch.patch	2009-07-06 22:27:06 UTC (rev 8911)
@@ -1,18 +0,0 @@
-diff -Nur wagon/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java wagon.new/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
---- wagon/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java	2006-12-10 15:24:49.000000000 +0000
-+++ wagon.new/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java	2007-04-23 11:39:57.000000000 +0100
-@@ -161,10 +161,10 @@
-             throw new ConnectionException( "Connection Exception: " + url + " " + he.getReasonCode() + " "
-                 + HttpStatus.getStatusText( he.getReasonCode() ), he );
-         }
--        catch ( URIException urie )
--        {
--            throw new ConnectionException( "Connection Exception: " + urie.getReason(), urie );
--        }
-+//        catch ( URIException urie )
-+//        {
-+//            throw new ConnectionException( "Connection Exception: " + urie.getReason(), urie );
-+//        }
-         catch ( IOException ioe )
-         {
-             throw new ConnectionException( "Connection Exception: " + ioe.getMessage(), ioe );

Added: trunk/wagon/debian/patches/series
===================================================================
--- trunk/wagon/debian/patches/series	                        (rev 0)
+++ trunk/wagon/debian/patches/series	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1 @@
+use_debian_neko_and_xerces.patch

Added: trunk/wagon/debian/patches/use_debian_neko_and_xerces.patch
===================================================================
--- trunk/wagon/debian/patches/use_debian_neko_and_xerces.patch	                        (rev 0)
+++ trunk/wagon/debian/patches/use_debian_neko_and_xerces.patch	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,31 @@
+--- a/wagon-providers/wagon-http-shared/pom.xml
++++ b/wagon-providers/wagon-http-shared/pom.xml
+@@ -36,20 +36,9 @@
+ 
+   <dependencies>
+     <dependency>
+-      <groupId>nekohtml</groupId>
+-      <artifactId>xercesMinimal</artifactId>
+-      <version>1.9.6.2</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>nekohtml</groupId>
++      <groupId>net.sourceforge.nekohtml</groupId>
+       <artifactId>nekohtml</artifactId>
+       <version>1.9.6.2</version>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>xerces</groupId>
+-          <artifactId>xercesImpl</artifactId>
+-        </exclusion>
+-      </exclusions>
+     </dependency>
+     <dependency>
+       <groupId>commons-httpclient</groupId>
+@@ -57,4 +46,4 @@
+       <version>3.1</version>
+     </dependency>
+   </dependencies>
+-</project>
+\ No newline at end of file
++</project>

Modified: trunk/wagon/debian/rules
===================================================================
--- trunk/wagon/debian/rules	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/rules	2009-07-06 22:27:06 UTC (rev 8911)
@@ -2,48 +2,47 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | sed 's/-[0-9]*$$//')
-JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-#DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \
-                        /usr/share/java/plexus-classworlds.jar \
-                        /usr/share/java/libplexus-utils.jar \
-			/usr/share/java/plexus-component-api.jar \
-			/usr/share/java/plexus-interactivity-api.jar \
-			/usr/share/java/jtidy.jar \
-			/usr/share/java/commons-net.jar \
-			/usr/share/java/commons-httpclient.jar \
-			/usr/share/java/jsch.jar \
-			/usr/share/java/ganymed-ssh2.jar \
-			/usr/share/java/jakarta-slide-webdavlib.jar \
-			/usr/share/java/libcommons-openpgp-java.jar \
-			/usr/share/java/junit.jar
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := ./debian/build.xml
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
-API_DOCS             := build/doc/api
-SVN                  := https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-$(VERSION)
+API_DOCS             := build/api
+MODULES              := wagon-file wagon-ftp wagon-http wagon-http-lightweight wagon-http-shared \
+ wagon-scm wagon-ssh wagon-ssh-common wagon-ssh-external 
+ #wagon-webdav-jackrabbit
 
-
 get-orig-source:
-	echo "Getting version $(VERSION) from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
-	
+	uscan --download-version $(VERSION) --force-download --rename
 
+makebuilddir/lib$(PACKAGE)-java::
+	set -e; for MODULE in $(addprefix wagon-providers/, $(MODULES)); do \
+		COMPONENT_FILE=debian/$$(echo $$MODULE | cut -d'/' -f2 -)-components.xml; \
+		if [ -e $$COMPONENT_FILE ]; then \
+			install -d $$MODULE/build/classes/META-INF/plexus; \
+			install -m644 -T $$COMPONENT_FILE $$MODULE/build/classes/META-INF/plexus/components.xml; \
+		fi \
+	done
+
 binary-post-install/lib$(PACKAGE)-java::
-	for i in wagon-openpgp wagon-file wagon-ftp wagon-http wagon-http-lightweight wagon-http-shared wagon-provider-api wagon-ssh wagon-ssh-common wagon-ssh-external wagon-webdav; do \
-	    dh_install -plib$(PACKAGE)-java build/$$i-$(VERSION).jar usr/share/java && \
-	    dh_link -plib$(PACKAGE)-java usr/share/java/$$i-$(VERSION).jar usr/share/java/$$i.jar; \
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l wagon-provider-api/pom.xml wagon-provider-api/build/wagon-provider-api-$(VERSION).jar
+	set -e; for MODULE in $(MODULES); do \
+		mh_installjar -plib$(PACKAGE)-java -l wagon-providers/$$MODULE/pom.xml wagon-providers/$$MODULE/build/$$MODULE-$(VERSION).jar; \
 	done
 
-binary-post-install/lib$(PACKAGE)-java-doc::
-	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+clean::
+	-rm -rf debian/tmp
+
+# Extract generated plexus components.xml files from a standard Maven build
+PLEXUS_COMPONENTS=$(shell find . -name components.xml | grep target | sed -re "s,.*/([a-z-]+)/target/.*,debian/\1-components.xml,")
+
+debian/%-components.xml:
+	echo $*
+	find . -type f -path *$*/target/classes/META-INF/plexus/components.xml -exec cp '{}' $@ \;
+
+copy-plexus-components: $(PLEXUS_COMPONENTS)


Property changes on: trunk/wagon/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Added: trunk/wagon/debian/wagon-file-components.xml
===================================================================
--- trunk/wagon/debian/wagon-file-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-file-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,11 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>file</role-hint>
+      <implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>Wagon Provider for Local File System</description>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-ftp-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ftp-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-ftp-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,14 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>ftp</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ftp.FtpWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>FtpWagon</description>
+      <configuration>
+        <passive-mode>true</passive-mode>
+      </configuration>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-http-components.xml
===================================================================
--- trunk/wagon/debian/wagon-http-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-http-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,35 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<component-set>
+    <components>
+      <component>
+        <role>org.apache.maven.wagon.Wagon</role>
+        <role-hint>http</role-hint>
+        <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
+        <instantiation-strategy>per-lookup</instantiation-strategy>
+      </component>
+      <component>
+        <role>org.apache.maven.wagon.Wagon</role>
+        <role-hint>https</role-hint>
+        <implementation>org.apache.maven.wagon.providers.http.HttpWagon</implementation>
+        <instantiation-strategy>per-lookup</instantiation-strategy>
+      </component>
+    </components>
+</component-set>

Added: trunk/wagon/debian/wagon-http-lightweight-components.xml
===================================================================
--- trunk/wagon/debian/wagon-http-lightweight-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-http-lightweight-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,18 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>http</role-hint>
+      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>LightweightHttpWagon</description>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>https</role-hint>
+      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpsWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>LIghtweightHttpsWagon</description>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-scm-components.xml
===================================================================
--- trunk/wagon/debian/wagon-scm-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-scm-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,15 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>scm</role-hint>
+      <implementation>org.apache.maven.wagon.providers.scm.ScmWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.scm.manager.ScmManager</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-ssh-common-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-common-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-ssh-common-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,47 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
+      <implementation>org.apache.maven.wagon.providers.ssh.interactive.ConsoleInteractiveUserInfo</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>Shows messages to System.</description>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.components.interactivity.Prompter</role>
+          <role-hint>default</role-hint>
+          <field-name>prompter</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+      <role-hint>file</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.knownhost.FileKnownHostsProvider</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>Provides known hosts from a file</description>
+      <configuration>
+        <host-key-checking>ask</host-key-checking>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+      <role-hint>single</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.knownhost.SingleKnownHostProvider</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>Simple &lt;code&gt;KnownHostsProvider&lt;/code&gt; with known wired values</description>
+      <configuration>
+        <host-key-checking>ask</host-key-checking>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+      <role-hint>null</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.knownhost.NullKnownHostProvider</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>Dummy &lt;code&gt;KnownHostsProvider&lt;/code&gt;</description>
+      <configuration>
+        <host-key-checking>ask</host-key-checking>
+      </configuration>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-ssh-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-ssh-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,82 @@
+<component-set>
+  <components>
+    <component>
+      <role>com.jcraft.jsch.UIKeyboardInteractive</role>
+      <implementation>org.apache.maven.wagon.providers.ssh.jsch.interactive.PrompterUIKeyboardInteractive</implementation>
+      <description>UIKeyboardInteractive that use plexus-prompter.</description>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.components.interactivity.Prompter</role>
+          <role-hint>default</role-hint>
+          <field-name>prompter</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.CommandExecutor</role>
+      <role-hint>scp</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpCommandExecutor</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>ScpCommandExecutor - bridge class for plexus:descriptor</description>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+          <role-hint>file</role-hint>
+          <field-name>knownHostsProvider</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
+          <field-name>interactiveUserInfo</field-name>
+        </requirement>
+        <requirement>
+          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
+          <field-name>uIKeyboardInteractive</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>sftp</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.jsch.SftpWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>SFTP protocol wagon.</description>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+          <role-hint>file</role-hint>
+          <field-name>knownHostsProvider</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
+          <field-name>interactiveUserInfo</field-name>
+        </requirement>
+        <requirement>
+          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
+          <field-name>uIKeyboardInteractive</field-name>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>scp</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>SCP protocol wagon.</description>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
+          <role-hint>file</role-hint>
+          <field-name>knownHostsProvider</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
+          <field-name>interactiveUserInfo</field-name>
+        </requirement>
+        <requirement>
+          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
+          <field-name>uIKeyboardInteractive</field-name>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-ssh-external-components.xml
===================================================================
--- trunk/wagon/debian/wagon-ssh-external-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-ssh-external-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,18 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.CommandExecutor</role>
+      <role-hint>scpexe</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.external.ScpExternalCommandExecutor</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>ScpExternalCommandExecutor - bridge class for plexus:descriptor</description>
+    </component>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>scpexe</role-hint>
+      <implementation>org.apache.maven.wagon.providers.ssh.external.ScpExternalWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>SCP deployer using &quot;external&quot; scp program.</description>
+    </component>
+  </components>
+</component-set>

Added: trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml
===================================================================
--- trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml	                        (rev 0)
+++ trunk/wagon/debian/wagon-webdav-jackrabbit-components.xml	2009-07-06 22:27:06 UTC (rev 8911)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>dav</role-hint>
+      <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>&lt;p&gt;WebDavWagon&lt;/p&gt;
+&lt;p/&gt;
+&lt;p&gt;Allows using a webdav remote repository for downloads and deployments&lt;/p&gt;</description>
+    <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm><instantiation-strategy>per-lookup</instantiation-strategy><instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component>
+  <component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>davs</role-hint>
+      <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>&lt;p&gt;WebDavWagon&lt;/p&gt;
+&lt;p/&gt;
+&lt;p&gt;Allows using a webdav remote repository for downloads and deployments&lt;/p&gt;</description>
+      <isolated-realm>false</isolated-realm>
+    <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component><component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>dav+http</role-hint>
+      <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>&lt;p&gt;WebDavWagon&lt;/p&gt;
+&lt;p/&gt;
+&lt;p&gt;Allows using a webdav remote repository for downloads and deployments&lt;/p&gt;</description>
+      <isolated-realm>false</isolated-realm>
+    <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component><component>
+      <role>org.apache.maven.wagon.Wagon</role>
+      <role-hint>dav+https</role-hint>
+      <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <description>&lt;p&gt;WebDavWagon&lt;/p&gt;
+&lt;p/&gt;
+&lt;p&gt;Allows using a webdav remote repository for downloads and deployments&lt;/p&gt;</description>
+      <isolated-realm>false</isolated-realm>
+    <instantiation-strategy>per-lookup</instantiation-strategy><isolated-realm>false</isolated-realm></component></components>
+</component-set>

Deleted: trunk/wagon/debian/wagon.doc-base
===================================================================
--- trunk/wagon/debian/wagon.doc-base	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/wagon.doc-base	2009-07-06 22:27:06 UTC (rev 8911)
@@ -1,9 +0,0 @@
-Document: libwagon-java
-Title: API Javadoc for Wagon
-Author: Wagon developers
-Abstract: This is the API Javadoc provided by the Wagon library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libwagon-java/api/index.html
-Files: /usr/share/doc/libwagon-java/api/*

Modified: trunk/wagon/debian/watch
===================================================================
--- trunk/wagon/debian/watch	2009-07-06 22:18:01 UTC (rev 8910)
+++ trunk/wagon/debian/watch	2009-07-06 22:27:06 UTC (rev 8911)
@@ -1,3 +1,4 @@
 version=3
-#http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/maven/wagon/wagon/(.*)/wagon-(.*)\.pom
-http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/maven/wagon/wagon/ (\d.*)/
+http://svn.apache.org/repos/asf/maven/wagon/tags/ \
+  wagon-(\d.*)/ debian debian/orig-tar.sh
+




More information about the pkg-java-commits mailing list