Attachment 603000 Details for Bug 846658 – Patch to add the infinispan module

[patch] Patch to add the infinispan module

0001-Enable-infinispan-module-RHBZ-846658.patch (text/plain), 5.37 KB, created by Marek Goldmann on 2012-08-08 11:43:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Goldmann

Created: 2012-08-08 11:43:00 UTC

Size: 5.37 KB

patch

obsolete

>From 2bf57f0059ec18596deeb00d9da51185578ae1cd Mon Sep 17 00:00:00 2001
>From: Marek Goldmann <goldmann@fedoraproject.org>
>Date: Wed, 8 Aug 2012 13:06:00 +0200
>Subject: [PATCH] Enable infinispan module, RHBZ#846658
>
>---
> hibernate-orm-infinispan-5-support.patch | 34 ++++++++++++++++++++++++++++++++
> hibernate3.spec                          | 26 ++++++++++++++++++------
> 2 files changed, 54 insertions(+), 6 deletions(-)
> create mode 100644 hibernate-orm-infinispan-5-support.patch
>
>diff --git a/hibernate-orm-infinispan-5-support.patch b/hibernate-orm-infinispan-5-support.patch
>new file mode 100644
>index 0000000..104e53f
>--- /dev/null
>+++ b/hibernate-orm-infinispan-5-support.patch
>@@ -0,0 +1,34 @@
>+--- hibernate-orm-3.6.10.Final/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java.orig	2012-08-08 12:41:44.619000123 +0200
>++++ hibernate-orm-3.6.10.Final/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java	2012-08-08 12:45:57.434000123 +0200
>+@@ -270,7 +270,7 @@
>+ 
>+    protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) {
>+       if (!event.isPre() && (replication || event.isOriginLocal()) && CacheHelper.isEvictAllNotification(event.getKey(), event.getValue())) {
>+-         if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put: {0}", event);
>++         if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put");
>+          invalidateState.set(InvalidateState.INVALID);
>+          return true;
>+       }
>+@@ -279,13 +279,13 @@
>+ 
>+    @CacheEntryInvalidated
>+    public void entryInvalidated(CacheEntryInvalidatedEvent event) {
>+-      if (log.isTraceEnabled()) log.trace("Cache entry invalidated: {0}", event);
>++      if (log.isTraceEnabled()) log.trace("Cache entry invalidated");
>+       handleEvictAllInvalidation(event);
>+    }
>+ 
>+    protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) {
>+       if (!event.isPre() && CacheHelper.isEvictAllNotification(event.getKey())) {
>+-         if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated: {0}", event);
>++         if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated");
>+          invalidateState.set(InvalidateState.INVALID);
>+          return true;
>+       }
>+@@ -303,4 +303,4 @@
>+       }
>+    }
>+ 
>+-}
>+\ No newline at end of file
>++}
>diff --git a/hibernate3.spec b/hibernate3.spec
>index 2b537fa..c70ce5f 100644
>--- a/hibernate3.spec
>+++ b/hibernate3.spec
>@@ -4,7 +4,7 @@
> 
> Name: hibernate3
> Version: 3.6.10
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: Relational persistence and query service
> 
> Group: Development/Libraries
>@@ -19,6 +19,7 @@ Source0: hibernate-orm-3.6.10.Final.tar.xz
> Patch0:  hibernate-orm-fix-cglib-gid.patch
> Patch1:  hibernate-orm-fix-jacc-gid-aid.patch
> Patch2:  hibernate-orm-fix-ant-gid.patch
>+Patch3:  hibernate-orm-infinispan-5-support.patch
> 
> BuildArch: noarch
> 
>@@ -44,10 +45,10 @@ BuildRequires: proxool
> BuildRequires: hibernate-commons-annotations
> BuildRequires: jboss-servlet-3.0-api
> BuildRequires: ehcache-core
>+BuildRequires: infinispan
>+BuildRequires: rhq-plugin-annotations
> # Uncomment when BZ 844827 is done
> # BuildRequires: jbosscache-core
>-# FIXME: Infinispan module build is failing
>-# BuildRequires: infinispan
> 
> Requires: java
> Requires: jpackage-utils
>@@ -104,11 +105,19 @@ Requires: ehcache-core
> %description ehcache
> %{summary}.
> 
>+%package infinispan
>+Summary: Integration of Hibernate with Infinispan
>+Requires: infinispan
>+
>+%description infinispan
>+%{summary}.
>+
> %prep
> %setup -q -n %{oname}-%{namedversion}
> %patch0 -p1
> %patch1 -p1
> %patch2 -p1
>+%patch3 -p1
> 
> %pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-plugin hibernate-parent
> %pom_remove_plugin org.jboss.maven.plugins:maven-jdocbook-style-plugin hibernate-parent
>@@ -117,8 +126,6 @@ Requires: ehcache-core
> %pom_disable_module hibernate-swarmcache
> %pom_disable_module hibernate-envers
> %pom_disable_module hibernate-jdbc3-testing
>-# infinispan module doesn't build yet.
>-%pom_disable_module hibernate-infinispan
> # Remove when BZ 844827 is done
> %pom_disable_module hibernate-jbosscache
> 
>@@ -144,7 +151,7 @@ install -pm 644 hibernate-parent/pom.xml  %{buildroot}%{_mavenpomdir}/JPP-%{name
> # Jar files:
> install -d -m 755 %{buildroot}%{_javadir}/%{name}
> for module in hibernate-core hibernate-c3p0 hibernate-proxool \
>-              hibernate-entitymanager hibernate-ehcache ; do
>+              hibernate-entitymanager hibernate-ehcache hibernate-infinispan ; do
>     install -m 644 ${module}/target/${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${module}.jar
>     install -pm 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${module}.pom
> %add_maven_depmap JPP.%{name}-${module}.pom %{name}/${module}.jar
>@@ -183,7 +190,14 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> %{_javadir}/%{name}/hibernate-proxool.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-proxool.pom
> 
>+%files infinispan
>+%{_javadir}/%{name}/hibernate-infinispan.jar
>+%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan.pom
>+
> %changelog
>+* Wed Aug 08 2012 Marek Goldmann <mgoldman@redhat.com> - 3.6.10-4
>+- Enable infinispan module, RHBZ#846658
>+
> * Mon Aug 06 2012 Andy Grimm <agrimm@gmail.com> - 3.6.10-3
> - Enable ehcache module (#845209)
> - Use pom macros for module disablement
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 846658: 603000