r2435 - trunk/slide-webdavclient/slide-webdavclient

[Marcus Better]

Author: marcusb-guest
Date: 2006-09-15 08:27:48 +0000 (Fri, 15 Sep 2006)
New Revision: 2435

Added:
   trunk/slide-webdavclient/slide-webdavclient/build.properties
   trunk/slide-webdavclient/slide-webdavclient/debian/
   trunk/slide-webdavclient/slide-webdavclient/lib/
Modified:
   trunk/slide-webdavclient/slide-webdavclient/build.xml
Log:
Merge from debian branch (r2434).


Copied: trunk/slide-webdavclient/slide-webdavclient/build.properties (from rev 2434, branches/slide-webdavclient/feature/debian/build.properties)
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/build.properties	                        (rev 0)
+++ trunk/slide-webdavclient/slide-webdavclient/build.properties	2006-09-15 08:27:48 UTC (rev 2435)
@@ -0,0 +1,3 @@
+commons-httpclient.jar=/usr/share/java/commons-httpclient.jar
+jdom.jar=/usr/share/java/jdom1.jar
+xml-im-exporter.jar=/usr/share/java/xml-im-exporter.jar

Modified: trunk/slide-webdavclient/slide-webdavclient/build.xml
===================================================================
--- trunk/slide-webdavclient/slide-webdavclient/build.xml	2006-09-15 08:16:26 UTC (rev 2434)
+++ trunk/slide-webdavclient/slide-webdavclient/build.xml	2006-09-15 08:27:48 UTC (rev 2435)
@@ -267,13 +267,6 @@
     <!-- =================================================================== -->
     <target name="dist-clientlib" depends="build-clientlib,prepare-dist,javadoc-clientlib"
 	    description="Jar WebDAV client lib and copy required jar libs">
-        <copy todir="${clientlib.dist}/lib">
-            <fileset dir="lib">
-                <include name="xml-im-exporter*.*"/>
-                <include name="commons-*.jar"/>
-                <include name="jdom*.*"/>
-            </fileset>
-        </copy>
         <jar jarfile="${clientlib.dist}/lib/${clientlib.final.name}.jar"
              basedir="${clientlib.build}/classes"
              manifest="${slide.dist}/etc/MANIFEST.MF">

Copied: trunk/slide-webdavclient/slide-webdavclient/debian (from rev 2434, branches/slide-webdavclient/feature/debian/debian)

Copied: trunk/slide-webdavclient/slide-webdavclient/lib (from rev 2434, branches/slide-webdavclient/feature/debian/lib)