[pkg-java] r13527 - in trunk/spring-build/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-04-13 22:01:25 +0000 (Wed, 13 Apr 2011)
New Revision: 13527

Added:
   trunk/spring-build/debian/patches/new_jets3t_0_8.diff
Modified:
   trunk/spring-build/debian/changelog
   trunk/spring-build/debian/patches/series
   trunk/spring-build/debian/rules
Log:
* 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.

Modified: trunk/spring-build/debian/changelog
===================================================================
--- trunk/spring-build/debian/changelog	2011-04-13 21:23:02 UTC (rev 13526)
+++ trunk/spring-build/debian/changelog	2011-04-13 22:01:25 UTC (rev 13527)
@@ -1,3 +1,11 @@
+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 <drazzib at debian.org>  Wed, 13 Apr 2011 23:57:40 +0200
+
 spring-build (2.7.0-1) unstable; urgency=low
 
   [ Miguel Landaeta ]

Added: trunk/spring-build/debian/patches/new_jets3t_0_8.diff
===================================================================
--- trunk/spring-build/debian/patches/new_jets3t_0_8.diff	                        (rev 0)
+++ trunk/spring-build/debian/patches/new_jets3t_0_8.diff	2011-04-13 22:01:25 UTC (rev 13527)
@@ -0,0 +1,47 @@
+--- 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) {

Modified: trunk/spring-build/debian/patches/series
===================================================================
--- trunk/spring-build/debian/patches/series	2011-04-13 21:23:02 UTC (rev 13526)
+++ trunk/spring-build/debian/patches/series	2011-04-13 22:01:25 UTC (rev 13527)
@@ -1,3 +1,4 @@
 ivy_local_only.diff
 ivy_artifact.diff
 ivy_aspectj.diff
+new_jets3t_0_8.diff

Modified: trunk/spring-build/debian/rules
===================================================================
--- trunk/spring-build/debian/rules	2011-04-13 21:23:02 UTC (rev 13526)
+++ trunk/spring-build/debian/rules	2011-04-13 22:01:25 UTC (rev 13527)
@@ -11,12 +11,27 @@
 PRJ_ROOT = org.springframework.build
 ARTIFACT_ROOT = target/artifacts/org.springframework.build
 
-pre-build::
-	-ln -s project-build spring-build
+setuplinks:
+	-ln -s project-build/ spring-build
 	-for MYMOD in $(MODULES); do \
-		(cd org.springframework.build.$$MYMOD; ln -s ../project-build spring-build); \
+		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`; \
@@ -25,13 +40,8 @@
 		mh_installjar -plibspring-build-java -l $$POM $$JAR ; \
 	done
 
-clean::
-	-for MYMOD in $(MODULES); do \
-		rm org.springframework.build.$$MYMOD/spring-build; \
-	done
-	-rm spring-build
+clean:: removelinks
 	mh_clean
-	-unlink project-build/project-build
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)