Attachment 603761 Details for Bug 847496 – Enable envers module

[patch] Enable envers module

0001-Enable-envers-module.patch (text/plain), 6.75 KB, created by gil cattaneo on 2012-08-12 09:18:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-08-12 09:18:22 UTC

Size: 6.75 KB

patch

obsolete

>From 7278f12c63a6580f819be920678fa0ab47abed4a Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sun, 12 Aug 2012 11:16:26 +0200
>Subject: [PATCH] Enable envers module
>
>---
> hibernate3.spec |   98 ++++++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 83 insertions(+), 15 deletions(-)
>
>diff --git a/hibernate3.spec b/hibernate3.spec
>index 3b64678..63b300e 100644
>--- a/hibernate3.spec
>+++ b/hibernate3.spec
>@@ -4,7 +4,7 @@
> 
> Name: hibernate3
> Version: 3.6.10
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> Summary: Relational persistence and query service
> 
> Group: Development/Libraries
>@@ -26,6 +26,7 @@ BuildArch: noarch
> 
> BuildRequires: jpackage-utils
> BuildRequires: java-devel
>+
> BuildRequires: maven
> BuildRequires: maven-compiler-plugin
> BuildRequires: maven-install-plugin
>@@ -35,22 +36,41 @@ BuildRequires: maven-release-plugin
> BuildRequires: maven-resources-plugin
> BuildRequires: maven-surefire-plugin
> BuildRequires: maven-enforcer-plugin
>-BuildRequires: geronimo-validation
> BuildRequires: maven-injection-plugin
> BuildRequires: antlr-maven-plugin
>-BuildRequires: hibernate-validator
>-BuildRequires: cglib
>-BuildRequires: jboss-jacc-1.4-api
>+
>+BuildRequires: ant
> BuildRequires: c3p0
>-BuildRequires: proxool
>+BuildRequires: cglib
>+BuildRequires: ehcache-core
>+# TODO use bean-validation-api (hibernate proper validation apis) instead of geronimo-validation
>+BuildRequires: geronimo-validation
> BuildRequires: hibernate-commons-annotations
>+BuildRequires: hibernate-tools
>+BuildRequires: hibernate-validator
>+BuildRequires: infinispan
>+BuildRequires: jboss-jacc-1.4-api
> BuildRequires: jboss-servlet-3.0-api
>-BuildRequires: ehcache-core
> BuildRequires: jbosscache-core
> BuildRequires: jbosscache-common-parent
>-BuildRequires: infinispan
>+BuildRequires: junit
>+BuildRequires: proxool
> BuildRequires: rhq-plugin-annotations
> 
>+# test deps
>+# BuildRequires: glassfish-jaxb
>+# BuildRequires: glassfish-jaxb-api
>+# BuildRequires: h2
>+# BuildRequires: hibernate-jpamodelgen
>+# BuildRequires: hsqldb
>+# BuildRequires: jboss-naming
>+# BuildRequires: mysql-connector-java
>+# BuildRequires: shrinkwrap
>+# BuildRequires: testng
>+# BuildRequires: jboss-jts
>+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=845540
>+# BuildRequires: xapool
>+
> Requires: java
> Requires: jpackage-utils
> Requires: apache-commons-collections
>@@ -84,6 +104,18 @@ Requires: javassist
> %description entitymanager
> %{summary}.
> 
>+%package envers
>+Summary: Hibernate support for entity auditing
>+Requires: ant
>+Requires: hibernate-commons-annotations
>+Requires: hibernate-jpa-2.0-api
>+Requires: hibernate-tools
>+Requires: %{name} = %{version}-%{release}
>+Requires: %{name}-entitymanager = %{version}-%{release}
>+
>+%description envers
>+%{summary}.
>+
> %package c3p0
> Summary: C3P0-based implementation of Hibernate ConnectionProvider
> Requires: %{name} = %{version}-%{release}
>@@ -122,6 +154,14 @@ Requires: infinispan
> %description infinispan
> %{summary}.
> 
>+%package testing
>+Summary: Hibernate JUnit test utilities
>+Requires: %{name} = %{version}-%{release}
>+Requires: junit
>+
>+%description testing
>+%{summary}.
>+
> %prep
> %setup -q -n %{oname}-%{namedversion}
> %patch0 -p1
>@@ -134,8 +174,10 @@ Requires: infinispan
> %pom_disable_module hibernate-testsuite
> %pom_disable_module hibernate-oscache
> %pom_disable_module hibernate-swarmcache
>-%pom_disable_module hibernate-envers
> %pom_disable_module hibernate-jdbc3-testing
>+%pom_disable_module hibernate-jdbc4-testing
>+# TODO update PATCH2
>+sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|" hibernate-envers/pom.xml
> 
> %build
> 
>@@ -158,14 +200,17 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
> install -pm 644 hibernate-parent/pom.xml  %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
> %add_maven_depmap JPP-%{name}-parent.pom
> 
>+install -m 644 hibernate-core/target/hibernate-core-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/hibernate-core.jar
>+install -pm 644 hibernate-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-core.pom
>+%add_maven_depmap JPP.%{name}-hibernate-core.pom %{name}/hibernate-core.jar
>+
> # Jar files:
> install -d -m 755 %{buildroot}%{_javadir}/%{name}
>-for module in hibernate-core hibernate-c3p0 hibernate-proxool \
>-              hibernate-entitymanager hibernate-ehcache \
>-              hibernate-jbosscache 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
>+for module in c3p0 ehcache infinispan jbosscache proxool \
>+              entitymanager envers testing; do
>+    install -m 644 hibernate-${module}/target/hibernate-${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/hibernate-${module}.jar
>+    install -pm 644 hibernate-${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-${module}.pom
>+%add_maven_depmap JPP.%{name}-hibernate-${module}.pom %{name}/hibernate-${module}.jar -f ${module}
> done
> 
> # Javadoc files:
>@@ -187,28 +232,51 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> %files entitymanager
> %{_javadir}/%{name}/hibernate-entitymanager.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager.pom
>+%{_mavendepmapfragdir}/%{name}-entitymanager
>+
>+%files envers
>+%{_javadir}/%{name}/hibernate-envers.jar
>+%{_mavenpomdir}/JPP.%{name}-hibernate-envers.pom
>+%{_mavendepmapfragdir}/%{name}-envers
> 
> %files c3p0
> %{_javadir}/%{name}/hibernate-c3p0.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-c3p0.pom
>+%{_mavendepmapfragdir}/%{name}-c3p0
> 
> %files ehcache
> %{_javadir}/%{name}/hibernate-ehcache.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-ehcache.pom
>+%{_mavendepmapfragdir}/%{name}-ehcache
> 
> %files infinispan
> %{_javadir}/%{name}/hibernate-infinispan.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-infinispan.pom
>+%{_mavendepmapfragdir}/%{name}-infinispan
> 
> %files proxool
> %{_javadir}/%{name}/hibernate-proxool.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-proxool.pom
>+%{_mavendepmapfragdir}/%{name}-proxool
> 
> %files jbosscache
> %{_javadir}/%{name}/hibernate-jbosscache.jar
> %{_mavenpomdir}/JPP.%{name}-hibernate-jbosscache.pom
>+%{_mavendepmapfragdir}/%{name}-jbosscache
>+
>+%files testing
>+%{_javadir}/%{name}/hibernate-testing.jar
>+%{_mavenpomdir}/JPP.%{name}-hibernate-testing.pom
>+%{_mavendepmapfragdir}/%{name}-testing
> 
> %changelog
>+* Sun Aug 12 2012 gil cattaneo <puntogil@libero.it> - 3.6.10-5
>+- Enable envers module
>+- Fixed ant gId in envers module
>+- Installed testing module (built but not installed)
>+- Disabled jdbc4-testing module
>+- Added maven fragments files in appropriate subpackages
>+
> * Fri Aug 10 2012 Andy Grimm <agrimm@gmail.com> - 3.6.10-4
> - Enable jbosscache and infinispan modules (RHBZ#846658)
> - Remove duplicate files from core package
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 847496: 603761 | 603964 | 603968