[pkg-java] r12522 - in trunk/libjboss-cache1-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri May 28 22:25:09 UTC 2010
Author: twerner
Date: 2010-05-28 22:25:07 +0000 (Fri, 28 May 2010)
New Revision: 12522
Added:
trunk/libjboss-cache1-java/debian/patches/0001-switch-to-java.util.concurrent.patch
trunk/libjboss-cache1-java/debian/patches/0002-support-newer-je-library.patch
trunk/libjboss-cache1-java/debian/patches/0003-support-jgroups-2.7.patch
Removed:
trunk/libjboss-cache1-java/debian/patches/concurrent.diff
trunk/libjboss-cache1-java/debian/patches/je.diff
trunk/libjboss-cache1-java/debian/patches/jgroups-2.7.diff
Modified:
trunk/libjboss-cache1-java/debian/changelog
trunk/libjboss-cache1-java/debian/patches/series
trunk/libjboss-cache1-java/debian/rules
Log:
* new upstream release
* Convert patches to dep3 format.
* Add jgroups to CLASSPATH. (Closes: #583461)
Modified: trunk/libjboss-cache1-java/debian/changelog
===================================================================
--- trunk/libjboss-cache1-java/debian/changelog 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/changelog 2010-05-28 22:25:07 UTC (rev 12522)
@@ -1,3 +1,11 @@
+libjboss-cache1-java (1.4.1.SP14-1) unstable; urgency=low
+
+ * new upstream release
+ * Convert patches to dep3 format.
+ * Add jgroups to CLASSPATH. (Closes: #583461)
+
+ -- Torsten Werner <twerner at debian.org> Sat, 29 May 2010 00:23:46 +0200
+
libjboss-cache1-java (1.4.1.SP13-1) unstable; urgency=low
* new upstream release
Added: trunk/libjboss-cache1-java/debian/patches/0001-switch-to-java.util.concurrent.patch
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/0001-switch-to-java.util.concurrent.patch (rev 0)
+++ trunk/libjboss-cache1-java/debian/patches/0001-switch-to-java.util.concurrent.patch 2010-05-28 22:25:07 UTC (rev 12522)
@@ -0,0 +1,342 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 29 May 2010 00:16:11 +0200
+Subject: [PATCH] switch to java.util.concurrent
+
+---
+ src/org/jboss/cache/Node.java | 6 +++---
+ src/org/jboss/cache/TransactionTable.java | 2 +-
+ src/org/jboss/cache/TreeCache.java | 4 ++--
+ .../jboss/cache/buddyreplication/BuddyManager.java | 6 +++---
+ src/org/jboss/cache/eviction/RegionManager.java | 2 +-
+ .../cache/interceptors/ActivationInterceptor.java | 2 +-
+ .../cache/interceptors/CacheStoreInterceptor.java | 2 +-
+ .../interceptors/DataGravitatorInterceptor.java | 2 +-
+ .../OptimisticReplicationInterceptor.java | 4 ++--
+ .../OrderedSynchronizationHandler.java | 2 +-
+ .../jboss/cache/interceptors/TxInterceptor.java | 2 +-
+ src/org/jboss/cache/loader/FileCacheLoader.java | 2 +-
+ .../jboss/cache/loader/bdbje/BdbjeCacheLoader.java | 2 +-
+ .../jboss/cache/loader/jdbm/JdbmCacheLoader.java | 2 +-
+ src/org/jboss/cache/lock/LockMap.java | 2 +-
+ src/org/jboss/cache/marshall/Marshaller.java | 2 +-
+ src/org/jboss/cache/marshall/RegionManager.java | 2 +-
+ .../jboss/cache/marshall/TreeCacheMarshaller.java | 2 +-
+ .../cache/optimistic/TransactionWorkspaceImpl.java | 2 +-
+ .../jboss/cache/optimistic/WorkspaceNodeImpl.java | 6 +++---
+ 20 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/src/org/jboss/cache/Node.java b/src/org/jboss/cache/Node.java
+index e7eb7b4..b197cb4 100755
+--- a/src/org/jboss/cache/Node.java
++++ b/src/org/jboss/cache/Node.java
+@@ -7,7 +7,7 @@
+ package org.jboss.cache;
+
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.factories.NodeFactory;
+@@ -149,11 +149,11 @@ public class Node extends AbstractNode implements Externalizable
+ {
+ if (getFqn().isRoot())
+ {
+- children = new ConcurrentReaderHashMap(64);
++ children = new ConcurrentHashMap(64);
+ }
+ else
+ {
+- children = new ConcurrentReaderHashMap(4);
++ children = new ConcurrentHashMap(4);
+ }
+ }
+ return children;
+diff --git a/src/org/jboss/cache/TransactionTable.java b/src/org/jboss/cache/TransactionTable.java
+index e6902e7..f334e4b 100755
+--- a/src/org/jboss/cache/TransactionTable.java
++++ b/src/org/jboss/cache/TransactionTable.java
+@@ -7,7 +7,7 @@
+ package org.jboss.cache;
+
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.lock.IdentityLock;
+diff --git a/src/org/jboss/cache/TreeCache.java b/src/org/jboss/cache/TreeCache.java
+index de5b526..e111e4e 100755
+--- a/src/org/jboss/cache/TreeCache.java
++++ b/src/org/jboss/cache/TreeCache.java
+@@ -6,8 +6,8 @@
+ */
+ package org.jboss.cache;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.CopyOnWriteArraySet;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.buddyreplication.BuddyGroup;
+diff --git a/src/org/jboss/cache/buddyreplication/BuddyManager.java b/src/org/jboss/cache/buddyreplication/BuddyManager.java
+index 50e81ae..851e24a 100755
+--- a/src/org/jboss/cache/buddyreplication/BuddyManager.java
++++ b/src/org/jboss/cache/buddyreplication/BuddyManager.java
+@@ -7,7 +7,7 @@
+ package org.jboss.cache.buddyreplication;
+
+ import EDU.oswego.cs.dl.util.concurrent.BoundedLinkedQueue;
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -73,7 +73,7 @@ public class BuddyManager
+ /**
+ * Map of buddy pools received from broadcasts
+ */
+- Map buddyPool = new ConcurrentReaderHashMap();
++ Map buddyPool = new ConcurrentHashMap();
+ /**
+ * The nullBuddyPool is a set of addresses that have not specified buddy pools.
+ */
+@@ -92,7 +92,7 @@ public class BuddyManager
+ * Keyed on String group name, values are BuddyGroup objects.
+ * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp
+ */
+- Map buddyGroupsIParticipateIn = new ConcurrentReaderHashMap();
++ Map buddyGroupsIParticipateIn = new ConcurrentHashMap();
+
+ /**
+ * Queue to deal with queued up view change requests - which are handled asynchronously
+diff --git a/src/org/jboss/cache/eviction/RegionManager.java b/src/org/jboss/cache/eviction/RegionManager.java
+index 3d7f52d..8e3112c 100755
+--- a/src/org/jboss/cache/eviction/RegionManager.java
++++ b/src/org/jboss/cache/eviction/RegionManager.java
+@@ -29,7 +29,7 @@ import java.util.Set;
+ import java.util.TreeSet;
+ import java.util.Iterator;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * Factory to create region from configuration, to track region,
+diff --git a/src/org/jboss/cache/interceptors/ActivationInterceptor.java b/src/org/jboss/cache/interceptors/ActivationInterceptor.java
+index ec6431c..ece582d 100755
+--- a/src/org/jboss/cache/interceptors/ActivationInterceptor.java
++++ b/src/org/jboss/cache/interceptors/ActivationInterceptor.java
+@@ -1,6 +1,6 @@
+ package org.jboss.cache.interceptors;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.cache.DataNode;
+ import org.jboss.cache.Fqn;
+ import org.jboss.cache.GlobalTransaction;
+diff --git a/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java b/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
+index af66df3..36bf7ea 100755
+--- a/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
++++ b/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
+@@ -1,6 +1,6 @@
+ package org.jboss.cache.interceptors;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.cache.Fqn;
+ import org.jboss.cache.GlobalTransaction;
+ import org.jboss.cache.Modification;
+diff --git a/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java b/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
+index 1a8f576..bc4e250 100755
+--- a/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
++++ b/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.interceptors;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.CacheException;
+diff --git a/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java b/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
+index e7af802..ad2732e 100755
+--- a/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
++++ b/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.interceptors;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.cache.CacheException;
+ import org.jboss.cache.Fqn;
+ import org.jboss.cache.GlobalTransaction;
+@@ -329,4 +329,4 @@ public class OptimisticReplicationInterceptor extends BaseRpcInterceptor
+ }
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff --git a/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java b/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java
+index e5b7b41..ceb31f5 100755
+--- a/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java
++++ b/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java
+@@ -3,7 +3,7 @@ package org.jboss.cache.interceptors;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import javax.transaction.RollbackException;
+ import javax.transaction.Synchronization;
+diff --git a/src/org/jboss/cache/interceptors/TxInterceptor.java b/src/org/jboss/cache/interceptors/TxInterceptor.java
+index b753de8..8deed7e 100755
+--- a/src/org/jboss/cache/interceptors/TxInterceptor.java
++++ b/src/org/jboss/cache/interceptors/TxInterceptor.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.interceptors;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.cache.CacheException;
+ import org.jboss.cache.GlobalTransaction;
+ import org.jboss.cache.InvocationContext;
+diff --git a/src/org/jboss/cache/loader/FileCacheLoader.java b/src/org/jboss/cache/loader/FileCacheLoader.java
+index c35f69a..2a22aa1 100755
+--- a/src/org/jboss/cache/loader/FileCacheLoader.java
++++ b/src/org/jboss/cache/loader/FileCacheLoader.java
+@@ -1,6 +1,6 @@
+ package org.jboss.cache.loader;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.Fqn;
+diff --git a/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java b/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
+index ef40e38..c7290bb 100755
+--- a/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
++++ b/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
+@@ -1,6 +1,6 @@
+ package org.jboss.cache.loader.bdbje;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import com.sleepycat.bind.serial.SerialBinding;
+ import com.sleepycat.bind.serial.StoredClassCatalog;
+ import com.sleepycat.bind.tuple.TupleBinding;
+diff --git a/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java b/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
+index 86ef75d..e549af0 100755
+--- a/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
++++ b/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
+@@ -1,6 +1,6 @@
+ package org.jboss.cache.loader.jdbm;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import jdbm.RecordManager;
+ import jdbm.RecordManagerFactory;
+ import jdbm.btree.BTree;
+diff --git a/src/org/jboss/cache/lock/LockMap.java b/src/org/jboss/cache/lock/LockMap.java
+index 27c4131..9265d71 100755
+--- a/src/org/jboss/cache/lock/LockMap.java
++++ b/src/org/jboss/cache/lock/LockMap.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.lock;
+
+-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.CopyOnWriteArraySet;
+
+ // See IdentityLockPerfTest --
+ // oswego read/write acquire/release locks/sec: 2000000, 2840909
+diff --git a/src/org/jboss/cache/marshall/Marshaller.java b/src/org/jboss/cache/marshall/Marshaller.java
+index 204638c..e0ae36b 100755
+--- a/src/org/jboss/cache/marshall/Marshaller.java
++++ b/src/org/jboss/cache/marshall/Marshaller.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.marshall;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.Fqn;
+diff --git a/src/org/jboss/cache/marshall/RegionManager.java b/src/org/jboss/cache/marshall/RegionManager.java
+index 53735a2..fe650ef 100755
+--- a/src/org/jboss/cache/marshall/RegionManager.java
++++ b/src/org/jboss/cache/marshall/RegionManager.java
+@@ -23,7 +23,7 @@ import java.util.Iterator;
+ import java.util.Set;
+ import java.util.TreeSet;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * Factory to create region from configuration, to track region,
+diff --git a/src/org/jboss/cache/marshall/TreeCacheMarshaller.java b/src/org/jboss/cache/marshall/TreeCacheMarshaller.java
+index a409ebc..e627e41 100755
+--- a/src/org/jboss/cache/marshall/TreeCacheMarshaller.java
++++ b/src/org/jboss/cache/marshall/TreeCacheMarshaller.java
+@@ -7,7 +7,7 @@
+
+ package org.jboss.cache.marshall;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.Fqn;
+diff --git a/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java b/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
+index 8ae294e..8829c89 100755
+--- a/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
++++ b/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.optimistic;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.jboss.cache.Fqn;
+ import org.jboss.cache.TreeCache;
+
+diff --git a/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java b/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
+index ce9df10..858b91b 100755
+--- a/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
++++ b/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
+@@ -6,7 +6,7 @@
+ */
+ package org.jboss.cache.optimistic;
+
+-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.jboss.cache.DataNode;
+@@ -88,7 +88,7 @@ public class WorkspaceNodeImpl implements WorkspaceNode
+ }
+ else
+ {
+- optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren());
++ optimisticChildNodeMap = new ConcurrentHashMap(node.getChildren());
+ }
+ this.version = ((OptimisticTreeNode) node).getVersion();
+ }
+@@ -239,7 +239,7 @@ public class WorkspaceNodeImpl implements WorkspaceNode
+ {
+ child = NodeFactory.getInstance().createNodeOfType(parent, child_name, fqn, parent, null, cache, version);
+ if (optimisticChildNodeMap == Collections.EMPTY_MAP)
+- optimisticChildNodeMap = new ConcurrentReaderHashMap();
++ optimisticChildNodeMap = new ConcurrentHashMap();
+ optimisticChildNodeMap.put(child_name, child);
+ if (trace) log.trace("Adding child " + child_name);
+ childrenAdded.add(child);
+--
Added: trunk/libjboss-cache1-java/debian/patches/0002-support-newer-je-library.patch
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/0002-support-newer-je-library.patch (rev 0)
+++ trunk/libjboss-cache1-java/debian/patches/0002-support-newer-je-library.patch 2010-05-28 22:25:07 UTC (rev 12522)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 29 May 2010 00:16:13 +0200
+Subject: [PATCH] support newer je library
+
+---
+ .../jboss/cache/loader/bdbje/BdbjeCacheLoader.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java b/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
+index c7290bb..12775e3 100755
+--- a/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
++++ b/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
+@@ -848,7 +848,7 @@ public class BdbjeCacheLoader implements CacheLoader {
+ private void dumpDatabase(String dbName, PrintStream ps)
+ throws Exception {
+
+- DbDump dumper = new DbDump(env, dbName, ps, false);
++ DbDump dumper = new DbDump(env, dbName, ps, ".", false);
+ dumper.dump();
+ }
+
+--
Added: trunk/libjboss-cache1-java/debian/patches/0003-support-jgroups-2.7.patch
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/0003-support-jgroups-2.7.patch (rev 0)
+++ trunk/libjboss-cache1-java/debian/patches/0003-support-jgroups-2.7.patch 2010-05-28 22:25:07 UTC (rev 12522)
@@ -0,0 +1,29 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 29 May 2010 00:16:15 +0200
+Subject: [PATCH] support jgroups 2.7
+
+---
+ src/org/jboss/cache/TreeCache.java | 7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/org/jboss/cache/TreeCache.java b/src/org/jboss/cache/TreeCache.java
+index e111e4e..3110d77 100755
+--- a/src/org/jboss/cache/TreeCache.java
++++ b/src/org/jboss/cache/TreeCache.java
+@@ -6726,13 +6726,10 @@ public class TreeCache extends ServiceMBeanSupport implements TreeCacheMBean, Cl
+ {
+ try
+ {
+- String protocolPrefix = JGROUPS_JMX_DOMAIN + ":" + PROTOCOL_JMX_ATTRIBUTES + getClusterName();
+- JmxConfigurator.registerProtocols(server, channel, protocolPrefix);
+- protocolsRegistered = true;
+-
+- String name = JGROUPS_JMX_DOMAIN + ":" + CHANNEL_JMX_ATTRIBUTES + getClusterName();
++ String name = JGROUPS_JMX_DOMAIN + ":" + CHANNEL_JMX_ATTRIBUTES + ":" + PROTOCOL_JMX_ATTRIBUTES + getClusterName();
+ JmxConfigurator.registerChannel(channel, server, name);
+ channelRegistered = true;
++ protocolsRegistered = true;
+ }
+ catch (Exception e)
+ {
+--
Deleted: trunk/libjboss-cache1-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/concurrent.diff 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/patches/concurrent.diff 2010-05-28 22:25:07 UTC (rev 12522)
@@ -1,314 +0,0 @@
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/Node.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/Node.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/Node.java 2009-02-17 21:46:14.000000000 +0100
-@@ -7,7 +7,7 @@
- package org.jboss.cache;
-
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.factories.NodeFactory;
-@@ -149,11 +149,11 @@
- {
- if (getFqn().isRoot())
- {
-- children = new ConcurrentReaderHashMap(64);
-+ children = new ConcurrentHashMap(64);
- }
- else
- {
-- children = new ConcurrentReaderHashMap(4);
-+ children = new ConcurrentHashMap(4);
- }
- }
- return children;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/buddyreplication/BuddyManager.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/buddyreplication/BuddyManager.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/buddyreplication/BuddyManager.java 2009-02-17 21:46:14.000000000 +0100
-@@ -7,7 +7,7 @@
- package org.jboss.cache.buddyreplication;
-
- import EDU.oswego.cs.dl.util.concurrent.BoundedLinkedQueue;
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-@@ -73,7 +73,7 @@
- /**
- * Map of buddy pools received from broadcasts
- */
-- Map buddyPool = new ConcurrentReaderHashMap();
-+ Map buddyPool = new ConcurrentHashMap();
- /**
- * The nullBuddyPool is a set of addresses that have not specified buddy pools.
- */
-@@ -92,7 +92,7 @@
- * Keyed on String group name, values are BuddyGroup objects.
- * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp
- */
-- Map buddyGroupsIParticipateIn = new ConcurrentReaderHashMap();
-+ Map buddyGroupsIParticipateIn = new ConcurrentHashMap();
-
- /**
- * Queue to deal with queued up view change requests - which are handled asynchronously
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.optimistic;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.DataNode;
-@@ -88,7 +88,7 @@
- }
- else
- {
-- optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren());
-+ optimisticChildNodeMap = new ConcurrentHashMap(node.getChildren());
- }
- this.version = ((OptimisticTreeNode) node).getVersion();
- }
-@@ -239,7 +239,7 @@
- {
- child = NodeFactory.getInstance().createNodeOfType(parent, child_name, fqn, parent, null, cache, version);
- if (optimisticChildNodeMap == Collections.EMPTY_MAP)
-- optimisticChildNodeMap = new ConcurrentReaderHashMap();
-+ optimisticChildNodeMap = new ConcurrentHashMap();
- optimisticChildNodeMap.put(child_name, child);
- if (trace) log.trace("Adding child " + child_name);
- childrenAdded.add(child);
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/TransactionTable.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/TransactionTable.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/TransactionTable.java 2009-02-17 21:46:14.000000000 +0100
-@@ -7,7 +7,7 @@
- package org.jboss.cache;
-
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.lock.IdentityLock;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/TreeCache.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/TreeCache.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/TreeCache.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,8 +6,8 @@
- */
- package org.jboss.cache;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
--import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.CopyOnWriteArraySet;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.buddyreplication.BuddyGroup;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/eviction/RegionManager.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/eviction/RegionManager.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/eviction/RegionManager.java 2009-02-17 21:46:14.000000000 +0100
-@@ -29,7 +29,7 @@
- import java.util.TreeSet;
- import java.util.Iterator;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
-
- /**
- * Factory to create region from configuration, to track region,
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/ActivationInterceptor.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/ActivationInterceptor.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/ActivationInterceptor.java 2009-02-17 21:46:14.000000000 +0100
-@@ -1,6 +1,6 @@
- package org.jboss.cache.interceptors;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.jboss.cache.DataNode;
- import org.jboss.cache.Fqn;
- import org.jboss.cache.GlobalTransaction;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2009-02-17 21:46:14.000000000 +0100
-@@ -1,6 +1,6 @@
- package org.jboss.cache.interceptors;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.jboss.cache.Fqn;
- import org.jboss.cache.GlobalTransaction;
- import org.jboss.cache.Modification;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.interceptors;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.CacheException;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.interceptors;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.jboss.cache.CacheException;
- import org.jboss.cache.Fqn;
- import org.jboss.cache.GlobalTransaction;
-@@ -329,4 +329,4 @@
- }
- }
- }
--}
-\ No newline at end of file
-+}
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/TxInterceptor.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/TxInterceptor.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/TxInterceptor.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.interceptors;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.jboss.cache.CacheException;
- import org.jboss.cache.GlobalTransaction;
- import org.jboss.cache.InvocationContext;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/FileCacheLoader.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/loader/FileCacheLoader.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/FileCacheLoader.java 2009-02-17 21:46:14.000000000 +0100
-@@ -1,6 +1,6 @@
- package org.jboss.cache.loader;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.Fqn;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2009-02-17 21:46:14.000000000 +0100
-@@ -1,6 +1,6 @@
- package org.jboss.cache.loader.bdbje;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import com.sleepycat.bind.serial.SerialBinding;
- import com.sleepycat.bind.serial.StoredClassCatalog;
- import com.sleepycat.bind.tuple.TupleBinding;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2009-02-17 21:46:14.000000000 +0100
-@@ -1,6 +1,6 @@
- package org.jboss.cache.loader.jdbm;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import jdbm.RecordManager;
- import jdbm.RecordManagerFactory;
- import jdbm.btree.BTree;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/Marshaller.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/marshall/Marshaller.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/Marshaller.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.marshall;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.Fqn;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/RegionManager.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/marshall/RegionManager.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/RegionManager.java 2009-02-17 21:46:14.000000000 +0100
-@@ -23,7 +23,7 @@
- import java.util.Set;
- import java.util.TreeSet;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
-
- /**
- * Factory to create region from configuration, to track region,
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/TreeCacheMarshaller.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/marshall/TreeCacheMarshaller.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/marshall/TreeCacheMarshaller.java 2009-02-17 21:46:14.000000000 +0100
-@@ -7,7 +7,7 @@
-
- package org.jboss.cache.marshall;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.jboss.cache.Fqn;
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.optimistic;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
- import org.jboss.cache.Fqn;
- import org.jboss.cache.TreeCache;
-
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/lock/LockMap.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/lock/LockMap.java 2009-01-23 15:07:52.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/lock/LockMap.java 2009-02-17 21:46:14.000000000 +0100
-@@ -6,7 +6,7 @@
- */
- package org.jboss.cache.lock;
-
--import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
-+import java.util.concurrent.CopyOnWriteArraySet;
-
- // See IdentityLockPerfTest --
- // oswego read/write acquire/release locks/sec: 2000000, 2840909
-Index: libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP12.orig/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2009-02-17 21:46:33.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP12/src/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2009-02-17 21:46:39.000000000 +0100
-@@ -3,7 +3,7 @@
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
--import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentHashMap;
-
- import javax.transaction.RollbackException;
- import javax.transaction.Synchronization;
Deleted: trunk/libjboss-cache1-java/debian/patches/je.diff
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/je.diff 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/patches/je.diff 2010-05-28 22:25:07 UTC (rev 12522)
@@ -1,13 +0,0 @@
-Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-06 22:07:22.000000000 +0100
-+++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-06 22:12:51.000000000 +0100
-@@ -848,7 +848,7 @@
- private void dumpDatabase(String dbName, PrintStream ps)
- throws Exception {
-
-- DbDump dumper = new DbDump(env, dbName, ps, false);
-+ DbDump dumper = new DbDump(env, dbName, ps, ".", false);
- dumper.dump();
- }
-
Deleted: trunk/libjboss-cache1-java/debian/patches/jgroups-2.7.diff
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/jgroups-2.7.diff 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/patches/jgroups-2.7.diff 2010-05-28 22:25:07 UTC (rev 12522)
@@ -1,20 +0,0 @@
-Index: libjboss-cache1-java-1.4.1.SP13/src/org/jboss/cache/TreeCache.java
-===================================================================
---- libjboss-cache1-java-1.4.1.SP13.orig/src/org/jboss/cache/TreeCache.java 2009-09-20 18:05:12.000000000 +0200
-+++ libjboss-cache1-java-1.4.1.SP13/src/org/jboss/cache/TreeCache.java 2009-09-20 18:07:57.000000000 +0200
-@@ -6726,13 +6726,10 @@
- {
- try
- {
-- String protocolPrefix = JGROUPS_JMX_DOMAIN + ":" + PROTOCOL_JMX_ATTRIBUTES + getClusterName();
-- JmxConfigurator.registerProtocols(server, channel, protocolPrefix);
-- protocolsRegistered = true;
--
-- String name = JGROUPS_JMX_DOMAIN + ":" + CHANNEL_JMX_ATTRIBUTES + getClusterName();
-+ String name = JGROUPS_JMX_DOMAIN + ":" + CHANNEL_JMX_ATTRIBUTES + ":" + PROTOCOL_JMX_ATTRIBUTES + getClusterName();
- JmxConfigurator.registerChannel(channel, server, name);
- channelRegistered = true;
-+ protocolsRegistered = true;
- }
- catch (Exception e)
- {
Modified: trunk/libjboss-cache1-java/debian/patches/series
===================================================================
--- trunk/libjboss-cache1-java/debian/patches/series 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/patches/series 2010-05-28 22:25:07 UTC (rev 12522)
@@ -1,3 +1,3 @@
-concurrent.diff
-je.diff
-jgroups-2.7.diff
+0001-switch-to-java.util.concurrent.patch
+0002-support-newer-je-library.patch
+0003-support-jgroups-2.7.patch
Modified: trunk/libjboss-cache1-java/debian/rules
===================================================================
--- trunk/libjboss-cache1-java/debian/rules 2010-05-27 20:27:26 UTC (rev 12521)
+++ trunk/libjboss-cache1-java/debian/rules 2010-05-28 22:25:07 UTC (rev 12522)
@@ -9,7 +9,7 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_JARS := jboss jboss-aop db-je bsh jgroups-core commons-logging \
jdbm log4j-1.2 jboss-serialization jboss-system jboss-jmx jboss-common \
- concurrent jboss-j2ee
+ concurrent jboss-j2ee jgroups
install/libjboss-cache1-java::
install -m 644 -D jboss-cache1.jar \
More information about the pkg-java-commits
mailing list