[Jpackage-commits] dist/jboss-common/JPP-5 jboss-common-lru-cache-policy.patch, NONE, 1.1 jboss-common.spec, 1.10, 1.11

David Walluck david at ryu.zarb.org
Wed Jul 29 18:12:26 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jboss-common/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv8836

Modified Files:
	jboss-common.spec 
Added Files:
	jboss-common-lru-cache-policy.patch 
Log Message:
- add patch for LRUCachePolicy incompatiblity

--- NEW FILE: jboss-common-lru-cache-policy.patch ---
--- src/main/org/jboss/util/LRUCachePolicy.java.orig	2006-01-25 02:00:03.000000000 -0500
+++ src/main/org/jboss/util/LRUCachePolicy.java	2009-07-29 10:52:39.000000000 -0400
@@ -22,6 +22,7 @@
 package org.jboss.util;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Implementation of a Least Recently Used cache policy.
@@ -38,7 +39,7 @@
    /**
     * The map holding the cached objects
     */
-   protected HashMap m_map;
+   protected Map m_map;
    /**
     * The linked list used to implement the LRU algorithm
     */
@@ -76,6 +77,16 @@
       m_maxCapacity = max;
    }
 
+   /**
+    * Create map holding entries.
+    *
+    * @return the map
+    */
+    protected Map createMap()
+    {
+       return new HashMap();
+    }
+
    // Public --------------------------------------------------------
 
    // Service implementation ----------------------------------------------
@@ -87,7 +98,7 @@
     */
    public void create()
    {
-      m_map = new HashMap();
+      m_map = createMap();
       m_list = createList();
       m_list.m_maxCapacity = m_maxCapacity;
       m_list.m_minCapacity = m_minCapacity;

Index: jboss-common.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common/JPP-5/jboss-common.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** jboss-common.spec	8 Dec 2008 15:11:58 -0000	1.10
--- jboss-common.spec	29 Jul 2009 16:12:24 -0000	1.11
***************
*** 42,50 ****
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define version_full %{version}.GA
  
  Name:           jboss-common    
  Version:        1.2.1
! Release:	7%{?dist}
  Epoch:          0
  Summary:        Common Utilities for JBoss Projects     
--- 42,55 ----
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
+ %if 0
+ %define __jar_repack %{nil}
+ %define gcj_support 0
+ %endif
+ 
  %define version_full %{version}.GA
  
  Name:           jboss-common    
  Version:        1.2.1
! Release:	8%{?dist}
  Epoch:          0
  Summary:        Common Utilities for JBoss Projects     
***************
*** 70,73 ****
--- 75,79 ----
  Patch0:         jboss-common-build-compile.patch
  Patch1:         jboss-common-ant17.patch
+ Patch2:         jboss-common-lru-cache-policy.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 85,89 ****
--- 91,97 ----
  #BuildRequires: jbossbuild
  BuildRequires: junit
+ %if 0
  BuildRequires: maven2-plugin-deploy
+ %endif
  BuildRequires: xml-commons-resolver
  BuildRequires: xerces-j2
***************
*** 122,128 ****
  %patch0 -p0
  %patch1 -p0
  
  # FIXME: (dwalluck) these two jars are not build from source
! find -name '*.jar' ! -name buildmagic-tasks.jar -a ! -name jbossbuild.jar | xargs %{__rm}
  
  #tools/lib
--- 130,137 ----
  %patch0 -p0
  %patch1 -p0
+ %patch2 -p0
  
  # FIXME: (dwalluck) these two jars are not build from source
! find -name '*.jar' ! -name buildmagic-tasks.jar -a ! -name jbossbuild.jar | xargs -t %{__rm}
  
  #tools/lib
***************
*** 154,163 ****
  export CLASSPATH=
  export OPT_JAR_LIST="ant/ant-nodeps"
! ant
  
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 output/lib/* $RPM_BUILD_ROOT%{_javadir}/%{name}
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *; do mv ${jar} ${jar/.jar/-%{version}.jar};done)
--- 163,172 ----
  export CLASSPATH=
  export OPT_JAR_LIST="ant/ant-nodeps"
! %{ant}
  
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -p -m 644 output/lib/* $RPM_BUILD_ROOT%{_javadir}/%{name}
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *; do mv ${jar} ${jar/.jar/-%{version}.jar};done)
***************
*** 196,199 ****
--- 205,210 ----
  	install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
  	install -p -m 644 %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
+ 	install -p -m 644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
+ 	install -p -m 644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
  	install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
  	cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}/namespace.jar $RPM_BUILD_ROOT%{repodirlib}
***************
*** 226,232 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}
! %{_datadir}/maven2/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 237,253 ----
  %files
  %defattr(0644,root,root,0755)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/jboss-common-%{version}.jar
! %{_javadir}/%{name}/jboss-common.jar
! %{_javadir}/%{name}/jboss-common-client-%{version}.jar
! %{_javadir}/%{name}/jboss-common-client.jar
! %{_javadir}/%{name}/jboss-common-sources-%{version}.jar
! %{_javadir}/%{name}/jboss-common-sources.jar
! %{_javadir}/%{name}/namespace-%{version}.jar
! %{_javadir}/%{name}/namespace.jar
! %{_javadir}/%{name}/testsuite-support-%{version}.jar
! %{_javadir}/%{name}/testsuite-support.jar
! %{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 241,244 ****
--- 262,268 ----
  
  %changelog
+ * Wed Jul 29 2009 David Walluck <dwalluck at redhat.com> 0:1.2.1-8
+ - add patch for LRUCachePolicy incompatiblity
+ 
  * Mon Dec 08 2008 Will Tatam <will.tatam at red61.com> 1.2.1-7
  - Auto rebuild for JPackage 5 in mock




More information about the JPackage-commits mailing list