debian/0000755000000000000000000000000011576142162007173 5ustar debian/source/0000755000000000000000000000000011551420157010467 5ustar debian/source/format0000644000000000000000000000001411407105473011676 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000211406732017010365 0ustar 7 debian/ant.properties0000644000000000000000000000036411406732017012072 0ustar disable.bundlor=true # Spring-Build Tool org.springframework.build.ant.version=debian spring.ant.classpath=/usr/share/java/org.springframework.build.ant.jar ecj.classpath=/usr/share/java/ecj.jar ajc.classpath=/usr/share/java/aspectjtools.jar debian/build.xml0000644000000000000000000000205311413221116010777 0ustar debian/rules0000755000000000000000000000247411551420122010246 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := ivy commons-net commons-httpclient jets3t org.eclipse.osgi DEB_ANT_BUILDFILE := debian/build.xml MODULES = ant aws.ant aws.ivy osgi PRJ_ROOT = org.springframework.build ARTIFACT_ROOT = target/artifacts/org.springframework.build setuplinks: if [ ! -d spring-build ]; then \ ln -s project-build spring-build; \ fi; -for MYMOD in $(MODULES); do \ FILE=org.springframework.build.$$MYMOD/spring-build; \ if [ ! -d $$FILE ]; then \ (cd org.springframework.build.$$MYMOD/; ln -s ../project-build spring-build) \ fi; \ done removelinks: for MYMOD in $(MODULES); do \ FILE=org.springframework.build.$$MYMOD/spring-build; \ if [ -d $$FILE ]; then \ rm $$FILE; \ fi; \ done -unlink spring-build cleanbuilddir:: setuplinks makebuilddir:: setuplinks binary-post-install/libspring-build-java:: for MYMOD in $(MODULES); do \ POM=`echo debian/poms/$$MYMOD.xml`; \ JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \ mh_installpom -plibspring-build-java $$POM ; \ mh_installjar -plibspring-build-java -l $$POM $$JAR ; \ done clean:: removelinks mh_clean get-orig-source: sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) debian/poms/0000755000000000000000000000000011551420157010145 5ustar debian/poms/osgi.xml0000644000000000000000000000076411407362762011646 0ustar 4.0.0 org.springframework.build org.springframework.build.osgi debian jar Spring Build - Ant Module debian/poms/aws.ivy.xml0000644000000000000000000000076711407362762012310 0ustar 4.0.0 org.springframework.build org.springframework.build.aws.ivy debian jar Spring Build - Ant Module debian/poms/ant.xml0000644000000000000000000000076311406732017011457 0ustar 4.0.0 org.springframework.build org.springframework.build.ant debian jar Spring Build - Ant Module debian/poms/aws.ant.xml0000644000000000000000000000076711407362762012263 0ustar 4.0.0 org.springframework.build org.springframework.build.aws.ant debian jar Spring Build - Ant Module debian/orig-tar.exclude0000644000000000000000000000006111435043100012251 0ustar project-build/lib/*.jar .gitmodules spring-build debian/patches/0000755000000000000000000000000011551420157010616 5ustar debian/patches/new_jets3t_0_8.diff0000644000000000000000000000311211551416465014207 0ustar --- a/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java +++ b/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java @@ -24,6 +24,7 @@ import org.apache.tools.ant.Project; import org.jets3t.service.S3Service; +import org.jets3t.service.ServiceException; import org.jets3t.service.S3ServiceException; import org.jets3t.service.model.S3Bucket; import org.jets3t.service.model.S3Object; @@ -55,6 +56,9 @@ long endTime = System.currentTimeMillis(); logEnd(source, startTime, endTime); } + catch (ServiceException e) { + throw new S3ServiceException(e); + } finally { if (in != null) { try { @@ -87,4 +91,4 @@ + TransferUtils.getFormattedSpeed(source.getContentLength(), transferTime), Project.MSG_INFO); } -} \ No newline at end of file +} --- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java +++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java @@ -21,6 +21,7 @@ import org.apache.ivy.plugins.repository.Resource; import org.jets3t.service.S3Service; +import org.jets3t.service.ServiceException; import org.jets3t.service.S3ServiceException; import org.jets3t.service.model.S3Bucket; import org.jets3t.service.model.S3Object; @@ -83,6 +84,9 @@ catch (S3ServiceException e) { throw new S3RepositoryException(e); } + catch (ServiceException e) { + throw new S3RepositoryException(e); + } } private void initializeS3(String uri) { debian/patches/ivy_local_only.diff0000644000000000000000000000632711435043100014470 0ustar Description: Only use local Ivy repository (no download) Author: Damien Raude-Morvan Forwarded: not-needed Last-Update: 2010-06-19 --- a/project-build/common/ivysettings.xml +++ b/project-build/common/ivysettings.xml @@ -16,8 +16,6 @@ --> - - - - - + + + + + - - - - - - + - - - - + + debian/patches/ivy_aspectj.diff0000644000000000000000000001256411435043100013766 0ustar Description: Fix aspectj ant tasks. Author: Damien Raude-Morvan Forwarded: not-needed Last-Update: 2010-06-19 --- a/project-build/aspect/artifact.xml +++ b/project-build/aspect/artifact.xml @@ -24,10 +24,16 @@ + + + + + - \ No newline at end of file + --- a/project-build/weaving-external/artifact.xml +++ b/project-build/weaving-external/artifact.xml @@ -32,7 +32,8 @@ - + @@ -49,9 +50,14 @@ + + + + + + + + + - \ No newline at end of file + --- a/project-build/aspect/common.xml +++ b/project-build/aspect/common.xml @@ -25,7 +25,8 @@ - + @@ -42,4 +43,4 @@ - \ No newline at end of file + --- a/project-build/aspect/quality.xml +++ b/project-build/aspect/quality.xml @@ -31,7 +31,8 @@ - + @@ -66,9 +67,10 @@ - + - \ No newline at end of file + debian/patches/ivy_artifact.diff0000644000000000000000000001275411435043100014133 0ustar Description: Don't use Ivy for Spring Build own dependencies resolution. Use explicit classpath references. Author: Damien Raude-Morvan Forwarded: not-needed Last-Update: 2010-06-19 --- a/org.springframework.build.ant/ivy.xml +++ b/org.springframework.build.ant/ivy.xml @@ -19,8 +19,10 @@ - - + --- a/project-build/standard/artifact.xml +++ b/project-build/standard/artifact.xml @@ -22,13 +22,25 @@ + + + + + + + + + + @@ -37,4 +49,4 @@ - \ No newline at end of file + --- a/project-build/weaving-external/artifact.xml +++ b/project-build/weaving-external/artifact.xml @@ -58,9 +58,14 @@ organisation="org.springframework.build" module="org.springframework.build.ant" revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" log="download-only"/> + + + + @@ -80,4 +85,4 @@ - \ No newline at end of file + --- a/project-build/war/artifact.xml +++ b/project-build/war/artifact.xml @@ -60,9 +60,14 @@ organisation="org.springframework.build" module="org.springframework.build.ant" revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" log="download-only"/> + + + + @@ -82,4 +87,4 @@ - \ No newline at end of file + --- a/org.springframework.build.aws.ant/ivy.xml +++ b/org.springframework.build.aws.ant/ivy.xml @@ -19,8 +19,10 @@ + --- a/org.springframework.build.aws.ivy/ivy.xml +++ b/org.springframework.build.aws.ivy/ivy.xml @@ -19,9 +19,11 @@ + --- a/org.springframework.build.osgi/ivy.xml +++ b/org.springframework.build.osgi/ivy.xml @@ -19,9 +19,11 @@ + debian/patches/series0000644000000000000000000000011311551416465012035 0ustar ivy_local_only.diff ivy_artifact.diff ivy_aspectj.diff new_jets3t_0_8.diff debian/control0000644000000000000000000000244411435043100010564 0ustar Source: spring-build Section: java Priority: optional Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant (>= 1.8.0), maven-repo-helper, ivy, libecj-java, libcommons-net-java, libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java, libspring-build-java Maintainer: Damien Raude-Morvan Standards-Version: 3.9.1 Homepage: http://www.springsource.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/spring-build/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/spring-build/ Package: libspring-build-java Architecture: all Depends: ${misc:Depends}, libecj-java Recommends: libcommons-net-java, libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java Description: Ant tasks for Spring Build module Spring projects are built using a combination of Ant and Ivy that is refered to simply as 'Spring Build'. . This package contains small Ant tasks used by Spring Build module. Package: spring-build-scripts Architecture: all Depends: ${misc:Depends}, libspring-build-java (= ${source:Version}) Suggests: ruby, groovy Description: Ant scripts snippets for Spring Build module Spring projects are built using a combination of Ant and Ivy that is refered to simply as 'Spring Build'. . This package contains small Ant scripts snippets for Spring Build module. debian/orig-tar.sh0000644000000000000000000000151211435043100011234 0ustar #!/bin/sh -e # $1 version TAR=../spring-build_$1.orig.tar.gz DIR=spring-build-$1.orig VERSION=`echo $1 | sed -e 's/[+~].*//g'` TAG=$VERSION GIT_ROOT=git://git.springsource.org/spring-build GIT_MODULES="misc-ant aws-ant aws-ivy osgi-ant" mkdir orig_tmp (cd orig_tmp && \ mkdir $DIR && \ git clone ${GIT_ROOT}/spring-build.git && \ (cd spring-build; git archive --prefix=project-build/ --format=tar $TAG | tar -C ../$DIR -xf -) && \ for git_module in $GIT_MODULES; do \ git clone ${GIT_ROOT}/${git_module}.git && \ (cd ${git_module}; git archive --format=tar HEAD | tar -C ../$DIR -xf -); \ done ) GZIP=--best tar -C orig_tmp -c -z -f $TAR -X debian/orig-tar.exclude $DIR rm -rf orig_tmp # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout mv $TAR $origDir echo "moved $TAR to $origDir" fi exit 0 debian/copyright0000644000000000000000000000231211526022271011115 0ustar Format: http://dep.debian.net/deps/dep5/ Upstream-Name: Spring Build Upstream-Contact: SpringSource Source: git://git.springsource.org/spring-build/spring-build.git git://git.springsource.org/spring-build/misc-ant.git git://git.springsource.org/spring-build/aws-ant.git git://git.springsource.org/spring-build/aws-ivy.git git://git.springsource.org/spring-build/osgi-ant.git Files: * Copyright: 2008-2010, SpringSource License: Apache-2.0 Files: debian/* Copyright: 2010, Damien Raude-Morvan License: Apache-2.0 License: Apache-2.0 Licensed 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. . On Debian systems the full text of the Apache License can be found in the `/usr/share/common-licenses/Apache-2.0' file. debian/changelog0000644000000000000000000000201211576142162011040 0ustar spring-build (2.7.0-2build1) oneiric; urgency=low * Re-upload to create build records. -- Matthias Klose Wed, 15 Jun 2011 16:40:10 +0020 spring-build (2.7.0-2) unstable; urgency=low * d/patches/new_jets3t_0_8.diff: Fix build with lastest jets3t 0.8 (Closes: #621937). * d/rules: Enhance symlink handling for "spring-build" directory. -- Damien Raude-Morvan Wed, 13 Apr 2011 23:57:40 +0200 spring-build (2.7.0-1) unstable; urgency=low [ Miguel Landaeta ] * New upstream release. * Remove dangling symlink in clean target. [ Damien Raude-Morvan ] * d/copyright: Fix copyright assignment to SpringSource. Thanks to Torsten Werner. * d/copyright: Update to latest DEP-5 format. * Upload to unstable. -- Damien Raude-Morvan Sun, 13 Feb 2011 19:35:21 +0100 spring-build (2.5.2~git3be7d52-1) experimental; urgency=low * Initial release. (Closes: #586523) -- Damien Raude-Morvan Tue, 24 Aug 2010 22:10:27 +0200 debian/watch0000644000000000000000000000013211406732017010214 0ustar version=3 https://src.springframework.org/svn/spring-build/tags/ project-build-([\d\.]+)/ debian/spring-build-scripts.install0000644000000000000000000000005111406732017014637 0ustar project-build/* /usr/share/spring-build/