[dom4j] Properly remove references to ConcurrentReaderHashMap

[Michal Srb]

commit 3452d700db256b81ee8a8ce1399dfdcd2da02880
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Jul 25 14:01:35 2013 +0200

    Properly remove references to ConcurrentReaderHashMap

 cleanup-sources.sh                                 |    1 +
 ...ove-references-to-ConcurrentReaderHashMap.patch |   25 ++++++++++++++-----
 dom4j.spec                                         |    7 ++++-
 sources                                            |    2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/cleanup-sources.sh b/cleanup-sources.sh
index e884db3..12072bf 100755
--- a/cleanup-sources.sh
+++ b/cleanup-sources.sh
@@ -9,6 +9,7 @@ set -x
 wget ${url} -O ${name}-${version}.tar.gz
 tar xf ${name}-${version}.tar.gz
 find ${name}-${version} -name \*.jar -delete
+rm -Rf ${name}-${version}/xdocs
 # remove file with unclear licensing
 rm -Rf ${name}-${version}/src/java/org/dom4j/tree/ConcurrentReaderHashMap.java
 tar caf ${name}-${version}-clean.tar.xz ${name}-${version}
diff --git a/dom4j-1.6.1-Remove-reference-to-ConcurrentReaderHashMap.patch b/dom4j-1.6.1-Remove-references-to-ConcurrentReaderHashMap.patch
similarity index 57%
rename from dom4j-1.6.1-Remove-reference-to-ConcurrentReaderHashMap.patch
rename to dom4j-1.6.1-Remove-references-to-ConcurrentReaderHashMap.patch
index e4cb1d4..f04b1b1 100644
--- a/dom4j-1.6.1-Remove-reference-to-ConcurrentReaderHashMap.patch
+++ b/dom4j-1.6.1-Remove-references-to-ConcurrentReaderHashMap.patch
@@ -1,26 +1,28 @@
-From 0ab6d5c3b0b3e68c0ac3d53669609d611e09d4ab Mon Sep 17 00:00:00 2001
+From cc644b2c2073acac30cc80d3a160c1007bad4213 Mon Sep 17 00:00:00 2001
 From: Michal Srb <msrb at redhat.com>
 Date: Tue, 2 Jul 2013 12:54:37 +0200
-Subject: [PATCH] Remove reference to ConcurrentReaderHashMap
+Subject: [PATCH] Remove references to ConcurrentReaderHashMap
 
 File ConcurrentReaderHashMap.java has been removed due to unclear licensing
 ---
- src/java/org/dom4j/tree/NamespaceCache.java | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ src/java/org/dom4j/tree/NamespaceCache.java | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/java/org/dom4j/tree/NamespaceCache.java b/src/java/org/dom4j/tree/NamespaceCache.java
-index 89ff316..046094b 100644
+index 89ff316..9b716de 100644
 --- a/src/java/org/dom4j/tree/NamespaceCache.java
 +++ b/src/java/org/dom4j/tree/NamespaceCache.java
-@@ -9,6 +9,7 @@ package org.dom4j.tree;
+@@ -9,7 +9,9 @@ package org.dom4j.tree;
  
  import java.lang.ref.WeakReference;
  import java.lang.reflect.Constructor;
 +import java.lang.UnsupportedOperationException;
  import java.util.Map;
++import java.util.concurrent.ConcurrentHashMap;
  
  import org.dom4j.Namespace;
-@@ -59,9 +60,7 @@ public class NamespaceCache {
+ 
+@@ -59,9 +61,7 @@ public class NamespaceCache {
                  cache = (Map) clazz.newInstance();
                  noPrefixCache = (Map) clazz.newInstance();
              } catch (Throwable t2) {
@@ -31,6 +33,15 @@ index 89ff316..046094b 100644
              }
          }
      }
+@@ -154,7 +154,7 @@ public class NamespaceCache {
+                 answer = (Map) cache.get(uri);
+ 
+                 if (answer == null) {
+-                    answer = new ConcurrentReaderHashMap();
++                    answer = new ConcurrentHashMap();
+                     cache.put(uri, answer);
+                 }
+             }
 -- 
 1.8.1.4
 
diff --git a/dom4j.spec b/dom4j.spec
index 6588f0a..cd86586 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -31,7 +31,7 @@
 Summary:        Open Source XML framework for Java
 Name:           dom4j
 Version:        1.6.1
-Release:        15%{?dist}
+Release:        16%{?dist}
 Epoch:          0
 License:        BSD
 URL:            http://www.dom4j.org/
@@ -41,7 +41,7 @@ Source1:        dom4j_rundemo.sh
 Source2:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 Patch0:         dom4j-1.6.1-build_xml.patch
 # See https://bugzilla.redhat.com/show_bug.cgi?id=976180
-Patch1:         dom4j-1.6.1-Remove-reference-to-ConcurrentReaderHashMap.patch
+Patch1:         dom4j-1.6.1-Remove-references-to-ConcurrentReaderHashMap.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 #BuildRequires:  junit
@@ -203,6 +203,9 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/%{name}-%{version}
 
 %changelog
+* Thu Jul 25 2013 Michal Srb <msrb at redhat.com> - 0:1.6.1-16
+- Properly remove references to ConcurrentReaderHashMap
+
 * Tue Jul 02 2013 Michal Srb <msrb at redhat.com> - 0:1.6.1-15
 - Remove file with unclear licensing (Resolves: rhbz#976180)
 
diff --git a/sources b/sources
index a739b0b..cd5fe83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6cf999ada54c096f0330aef5b38b8ca5  dom4j-1.6.1-clean.tar.xz
 af01a43a4709b749dd18a10741426715  dom4j-1.6.1.pom
+c412bf6d8180d90f81285d12f9cf1155  dom4j-1.6.1-clean.tar.xz