[libspring-webflow-2.0-java] 04/06: Removed the dependency on libbackport-util-concurrent-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-webflow-2.0-java.

commit 77ab487d133bb0870c4a379e993ca0f3c5199e37
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 7 10:53:15 2014 +0200

    Removed the dependency on libbackport-util-concurrent-java
---
 debian/changelog                                  |  3 +-
 debian/control                                    |  1 -
 debian/patches/drop-backport-util-concurrent.diff | 51 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a514a7..040f8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,11 @@
 libspring-webflow-2.0-java (2.0.9.RELEASE-5) UNRELEASED; urgency=low
 
   * Team upload
+  * Removed the dependency on libbackport-util-concurrent-java
   * debian/control
     - Use canonical URLs for the Vcs-* fields
     - Updated Standards-Version to 3.9.5 (no changes)
     - Removed the deprecated DM-Upload-Allowed flag
-    - Removed the unused dependency on libbackport-util-concurrent-java
-      for the binary package
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Aug 2013 00:20:46 +0200
diff --git a/debian/control b/debian/control
index 49d20ba..6f4a733 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: ant,
                glassfish-javaee,
                javahelper,
                junit,
-               libbackport-util-concurrent-java,
                libcommons-logging-java,
                libhibernate3-java,
                libognl-java,
diff --git a/debian/patches/drop-backport-util-concurrent.diff b/debian/patches/drop-backport-util-concurrent.diff
new file mode 100644
index 0000000..61fde7d
--- /dev/null
+++ b/debian/patches/drop-backport-util-concurrent.diff
@@ -0,0 +1,51 @@
+Description: Remove the dependency on backport-util-concurrent
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/projects/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/JdkBackportConcurrentConversationLock.java
++++ b/projects/spring-webflow/src/main/java/org/springframework/webflow/conversation/impl/JdkBackportConcurrentConversationLock.java
+@@ -17,41 +17,15 @@
+ 
+ import org.springframework.webflow.conversation.ConversationLockException;
+ 
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
+-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
+-
+ /**
+  * A conversation lock that relies on backport-concurrent. For use on JDK 1.4
+  * 
+  * @author Keith Donald
+  * @author Rob Harrop
+  */
+-class JdkBackportConcurrentConversationLock implements ConversationLock {
+-
+-	private Lock lock = new ReentrantLock();
+-
+-	private int timeoutSeconds;
++class JdkBackportConcurrentConversationLock extends JdkConcurrentConversationLock {
+ 
+ 	public JdkBackportConcurrentConversationLock(int timeoutSeconds) {
+-		this.timeoutSeconds = timeoutSeconds;
+-	}
+-
+-	public void lock() throws ConversationLockException {
+-		try {
+-			boolean acquired = lock.tryLock(timeoutSeconds, TimeUnit.SECONDS);
+-			if (!acquired) {
+-				throw new LockTimeoutException(timeoutSeconds);
+-			}
+-		} catch (InterruptedException e) {
+-			throw new LockInterruptedException(e);
+-		}
+-	}
+-
+-	/**
+-	 * Releases the lock.
+-	 */
+-	public void unlock() {
+-		lock.unlock();
++		super(timeoutSeconds);
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 5c9b207..f129745 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 ognl.diff
 spring_30.diff
+drop-backport-util-concurrent.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-webflow-2.0-java.git