Author: twerner Date: 2008-11-19 08:55:12 +0000 (Wed, 19 Nov 2008) New Revision: 7388
Added: trunk/libjboss-buildmagic-java/debian/patches/bsf.diff trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff Modified: trunk/libjboss-buildmagic-java/debian/ant.properties trunk/libjboss-buildmagic-java/debian/control trunk/libjboss-buildmagic-java/debian/orig-tar.sh trunk/libjboss-buildmagic-java/debian/patches/series trunk/libjboss-buildmagic-java/debian/rules Log: remove jar files from orig tarball Modified: trunk/libjboss-buildmagic-java/debian/ant.properties =================================================================== --- trunk/libjboss-buildmagic-java/debian/ant.properties 2008-11-19 07:44:07 UTC (rev 7387) +++ trunk/libjboss-buildmagic-java/debian/ant.properties 2008-11-19 08:55:12 UTC (rev 7388) @@ -1 +1,2 @@ project.name=jboss-buildmagic +build.sysclasspath=first Modified: trunk/libjboss-buildmagic-java/debian/control =================================================================== --- trunk/libjboss-buildmagic-java/debian/control 2008-11-19 07:44:07 UTC (rev 7387) +++ trunk/libjboss-buildmagic-java/debian/control 2008-11-19 08:55:12 UTC (rev 7388) @@ -3,8 +3,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Torsten Werner <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), cdbs, quilt, libxerces2-java, junit4 -Build-Depends-Indep: ant, default-jdk +Build-Depends: ant, default-jdk, debhelper (>= 5), cdbs, quilt, + libxerces2-java, junit4, libjboss-buildmagic-java, liblog4j1.2-java, + libgnu-regexp-java, libcommons-httpclient-java, libslide-webdavclient-java, + libdom4j-java, libbsf-java Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-buildmagic-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-buildmagic-java Modified: trunk/libjboss-buildmagic-java/debian/orig-tar.sh =================================================================== --- trunk/libjboss-buildmagic-java/debian/orig-tar.sh 2008-11-19 07:44:07 UTC (rev 7387) +++ trunk/libjboss-buildmagic-java/debian/orig-tar.sh 2008-11-19 08:55:12 UTC (rev 7388) @@ -5,7 +5,7 @@ # clean up the upstream tarball svn export http://anonsvn.labs.jboss.com/labs/jbossbuild/buildmagic/tags/$DIR $DIR -tar -c -z -f $TAR $DIR +tar -c -z -f $TAR --exclude '*.jar' $DIR rm -rf $DIR $3 # move to directory 'tarballs' Added: trunk/libjboss-buildmagic-java/debian/patches/bsf.diff =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/bsf.diff (rev 0) +++ trunk/libjboss-buildmagic-java/debian/patches/bsf.diff 2008-11-19 08:55:12 UTC (rev 7388) @@ -0,0 +1,26 @@ +Index: libjboss-buildmagic-java-2.0.1/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java 2008-11-19 09:51:39.000000000 +0100 ++++ libjboss-buildmagic-java-2.0.1/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java 2008-11-19 09:51:48.000000000 +0100 +@@ -14,7 +14,7 @@ + + import org.apache.tools.ant.*; + +-import com.ibm.bsf.*; ++import org.apache.bsf.*; + + /** + * Execute a script. +Index: libjboss-buildmagic-java-2.0.1/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java 2008-11-19 09:51:12.000000000 +0100 ++++ libjboss-buildmagic-java-2.0.1/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java 2008-11-19 09:51:31.000000000 +0100 +@@ -13,7 +13,7 @@ + + import org.apache.tools.ant.*; + +-import com.ibm.bsf.*; ++import org.apache.bsf.*; + + import org.jboss.tools.buildmagic.task.*; + import org.jboss.tools.buildmagic.task.util.TaskLogger; Added: trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff (rev 0) +++ trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff 2008-11-19 08:55:12 UTC (rev 7388) @@ -0,0 +1,22 @@ +Index: libjboss-buildmagic-java-2.0.1/common/src/main/org/jboss/net/protocol/http/DavURLLister.java +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/common/src/main/org/jboss/net/protocol/http/DavURLLister.java 2008-08-20 00:06:02.000000000 +0200 ++++ libjboss-buildmagic-java-2.0.1/common/src/main/org/jboss/net/protocol/http/DavURLLister.java 2008-11-19 09:41:00.000000000 +0100 +@@ -18,7 +18,7 @@ + import java.util.List; + + import org.apache.commons.httpclient.HttpException; +-import org.apache.util.HttpURL; ++import org.apache.commons.httpclient.HttpURL; + import org.apache.webdav.lib.WebdavResource; + import org.jboss.net.protocol.URLListerBase; + +@@ -33,7 +33,7 @@ + WebdavResource member = resources[i]; + HttpURL httpURL = member.getHttpURL(); + if (filter.accept(baseUrl, httpURL.getName())) { +- String url = httpURL.getUnescapedHttpURL(); ++ String url = httpURL.getURI(); + if (member.isCollection() && url.endsWith("/") == false) { + url += "/"; + } Added: trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff (rev 0) +++ trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff 2008-11-19 08:55:12 UTC (rev 7388) @@ -0,0 +1,88 @@ +Index: libjboss-buildmagic-java-2.0.1/common/build.xml +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/common/build.xml 2008-11-19 09:46:27.000000000 +0100 ++++ libjboss-buildmagic-java-2.0.1/common/build.xml 2008-11-19 09:46:32.000000000 +0100 +@@ -34,10 +34,6 @@ + &defaults; + &tools; + +- <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" /> +- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" +- uri="urn:maven-artifact-ant" +- classpathref="maven-ant-tasks.classpath" /> + + + <!--+====================================================================+--> +@@ -65,23 +61,6 @@ + <property name="module.name" value="common"/> + <property name="module.Name" value="JBoss/Common"/> + +- <!-- Configure thirdparty libraries using maven--> +- <artifact:dependencies pathId="library.classpath"> +- <dependency groupId="log4j" artifactId="log4j" +- version="1.2.4"/> +- <dependency groupId="slide" artifactId="webdavlib" +- version="1.0.16" /> +- <dependency groupId="commons-httpclient" artifactId="commons-httpclient" +- version="1.0" /> +- <dependency groupId="junit" artifactId="junit" +- version="3.7" /> +- <dependency groupId="gnu-regexp" artifactId="gnu-regexp" +- version="1.1.4" /> +- <!--<dependency groupId="com.sun.jmx" artifactId="jmxri" +- version="1.2" /> --> +- <dependency groupId="dom4j" artifactId="dom4j" +- version="1.3" /> +- </artifact:dependencies> + + <!--<dependency-manager + cacheDir="${project.thirdparty.cache}" +Index: libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/defaults.ent +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/tools/etc/buildmagic/defaults.ent 2008-11-19 09:46:27.000000000 +0100 ++++ libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/defaults.ent 2008-11-19 09:46:32.000000000 +0100 +@@ -104,7 +104,7 @@ + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> +- <path refid="library.classpath"/> ++ <!--<path refid="library.classpath"/>--> + <!--<path refid="dependentmodule.classpath"/>--> + </path> + +@@ -142,4 +142,4 @@ + <property name="junit.batchtest.todir" value="${build.reports}"/> + <property name="junit.jvm.options" value="-Ddummy"/> + +-</target> +\ No newline at end of file ++</target> +Index: libjboss-buildmagic-java-2.0.1/tasks/build.xml +=================================================================== +--- libjboss-buildmagic-java-2.0.1.orig/tasks/build.xml 2008-11-19 09:47:45.000000000 +0100 ++++ libjboss-buildmagic-java-2.0.1/tasks/build.xml 2008-11-19 09:48:33.000000000 +0100 +@@ -35,9 +35,6 @@ + &tools; + + <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" /> +- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" +- uri="urn:maven-artifact-ant" +- classpathref="maven-ant-tasks.classpath" /> + + <!--+====================================================================+--> + <!--| Initialization |--> +@@ -68,14 +65,6 @@ + <!--| Library & Module Dependencies. |--> + <!--+================================+--> + +- <!-- Configure thirdparty libraries using maven --> +- +- <artifact:dependencies pathId="library.classpath"> +- <dependency groupId="log4j" artifactId="log4j" +- version="1.2.4"/> +- <dependency groupId="bsf" artifactId="bsf" +- version="2.2" /> +- </artifact:dependencies> + + <!--<dependency-manager + cacheDir="${project.thirdparty.cache}" Modified: trunk/libjboss-buildmagic-java/debian/patches/series =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/series 2008-11-19 07:44:07 UTC (rev 7387) +++ trunk/libjboss-buildmagic-java/debian/patches/series 2008-11-19 08:55:12 UTC (rev 7388) @@ -1,2 +1,5 @@ ant.diff no-common.diff +no-maven.diff +httpurl.diff +bsf.diff Modified: trunk/libjboss-buildmagic-java/debian/rules =================================================================== --- trunk/libjboss-buildmagic-java/debian/rules 2008-11-19 07:44:07 UTC (rev 7387) +++ trunk/libjboss-buildmagic-java/debian/rules 2008-11-19 08:55:12 UTC (rev 7388) @@ -6,7 +6,8 @@ JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := ant-nodeps xercesImpl junit4 ant-junit +DEB_JARS := ant-nodeps xercesImpl junit4 ant-junit buildmagic-tasks \ + log4j-1.2 gnu-regexp commons-httpclient jakarta-slide-webdavlib dom4j bsf DEB_CLASSPATH := $(DEB_CLASSPATH):common/output/classes/ install/libjboss-buildmagic-java:: @@ -17,4 +18,4 @@ /usr/share/java/buildmagic-tasks.jar get-orig-source: - sh debian/orig-tar.sh + uscan --force-download _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
