diff --git a/.gitignore b/.gitignore index 322feab..b986440 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /hornetq-2.2.13-CLEAN.tar.xz +/HornetQ_2_3_1_FINAL.tar.gz diff --git a/0001-Removed-maven-buildmagic-thirdparty-plugin-dependenc.patch b/0001-Removed-maven-buildmagic-thirdparty-plugin-dependenc.patch deleted file mode 100644 index 3cfc617..0000000 --- a/0001-Removed-maven-buildmagic-thirdparty-plugin-dependenc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a8b36c10fb80d86092382b44ca287c40c6ab08ea Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 11:28:14 +0200 -Subject: [PATCH 1/8] Removed maven-buildmagic-thirdparty-plugin dependency - ---- - pom.xml | 32 -------------------------------- - 1 file changed, 32 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 74beba7..4a39473 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -44,38 +44,6 @@ Copyright 2009 Red Hat, Inc. - - - -- org.jboss.maven.plugins -- maven-buildmagic-thirdparty-plugin -- -- -- build-thirdparty -- initialize -- -- build-thirdparty -- -- -- thirdparty -- thirdparty/libraries.ent -- -- compile -- -- -- -- -- -- -- -- -- id -- art-id -- -- 1.0.0 -- -- -- -- -- -- - org.apache.maven.plugins - maven-antrun-plugin - 1.3 --- -1.7.10.1 - diff --git a/0002-Removed-spring-dependency.patch b/0002-Removed-spring-dependency.patch deleted file mode 100644 index 88f5eac..0000000 --- a/0002-Removed-spring-dependency.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ae40dc704f8dac8edfbae0144c834c3b81b61318 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 11:34:24 +0200 -Subject: [PATCH 2/8] Removed spring dependency - ---- - pom.xml | 21 --------------------- - 1 file changed, 21 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 4a39473..5a0f8ec 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -272,27 +272,6 @@ Copyright 2009 Red Hat, Inc. - apiviz - 1.3.0.GA - -- -- -- org.springframework -- spring-core -- 3.0.3.RELEASE -- -- -- org.springframework -- spring-beans -- 3.0.3.RELEASE -- -- -- org.springframework -- spring-context -- 3.0.3.RELEASE -- -- -- org.springframework -- spring-jms -- 3.0.3.RELEASE -- - - - --- -1.7.10.1 - diff --git a/0003-gui-aid-changes.patch b/0003-gui-aid-changes.patch deleted file mode 100644 index afc746c..0000000 --- a/0003-gui-aid-changes.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3e79b80e29d91268e55dc65fb076446ceb9f8a45 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 11:52:00 +0200 -Subject: [PATCH 3/8] gui:aid changes - ---- - pom.xml | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 5a0f8ec..c75d890 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -151,26 +151,26 @@ Copyright 2009 Red Hat, Inc. - - - -- org.jboss.javaee -- jboss-jms-api -- 1.1.0.GA -+ org.jboss.spec.javax.jms -+ jboss-jms-api_1.1_spec -+ 1.0.1.Final - - - -- org.jboss.javaee -- jboss-ejb-api -- 3.0.0.GA -+ org.jboss.spec.javax.ejb -+ jboss-ejb-api_3.1_spec -+ 1.0.2.Final - - -- org.jboss.javaee -- jboss-transaction-api -- 1.0.1.GA -+ org.jboss.spec.javax.transaction -+ jboss-transaction-api_1.1_spec -+ 1.0.1-SNAPSHOT - - - -- org.jboss.integration -+ org.jboss - jboss-transaction-spi -- 5.1.0.GA -+ 7.0.0.Final - - - -@@ -237,9 +237,9 @@ Copyright 2009 Red Hat, Inc. - - - -- org.jboss.javaee -- jboss-jaspi-api -- 1.0.0.GA -+ org.jboss.spec.javax.security.auth.message -+ jboss-jaspi-api_1.0_spec -+ 1.0.1.Final - - - -@@ -254,7 +254,7 @@ Copyright 2009 Red Hat, Inc. - 4.6.1.GA - - -- apache-logging -+ org.apache.commons - commons-logging - 1.1.0.jboss - --- -1.7.10.1 - diff --git a/0004-JDK7-fix-for-FileChannel-constructor.patch b/0004-JDK7-fix-for-FileChannel-constructor.patch deleted file mode 100644 index fefb7fe..0000000 --- a/0004-JDK7-fix-for-FileChannel-constructor.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 597fcb72236af0cba7b20a4c71987ffd44fdee57 Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 13:44:14 +0200 -Subject: [PATCH 4/8] JDK7 fix for FileChannel constructor - ---- - src/main/org/hornetq/core/asyncio/impl/HornetQFileLock.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/main/org/hornetq/core/asyncio/impl/HornetQFileLock.java b/src/main/org/hornetq/core/asyncio/impl/HornetQFileLock.java -index 6367ffc..7acfd75 100644 ---- a/src/main/org/hornetq/core/asyncio/impl/HornetQFileLock.java -+++ b/src/main/org/hornetq/core/asyncio/impl/HornetQFileLock.java -@@ -14,6 +14,7 @@ - package org.hornetq.core.asyncio.impl; - - import java.io.IOException; -+import java.nio.channels.FileChannel; - import java.nio.channels.FileLock; - - /** -@@ -36,7 +37,7 @@ public class HornetQFileLock extends FileLock - */ - protected HornetQFileLock(final int handle) - { -- super(null, 0, 0, false); -+ super((FileChannel) null, 0, 0, false); - this.handle = handle; - } - --- -1.7.10.1 - diff --git a/0005-Libraries-paths.patch b/0005-Libraries-paths.patch deleted file mode 100644 index f3ddeb5..0000000 --- a/0005-Libraries-paths.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 373de031a2fee1923d47b9c327a620556379e1cf Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 12:18:35 +0200 -Subject: [PATCH 5/8] Libraries paths - ---- - build-hornetq.xml | 7 ++----- - build.xml | 4 ---- - libraries.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 44 insertions(+), 9 deletions(-) - create mode 100644 libraries.xml - -diff --git a/build-hornetq.xml b/build-hornetq.xml -index bacef07..5acb609 100644 ---- a/build-hornetq.xml -+++ b/build-hornetq.xml -@@ -1,6 +1,5 @@ - - - ]> - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - --- -1.7.10.1 - diff --git a/0007-Add-jdepend-dependency-to-run-javadoc-creation.patch b/0007-Add-jdepend-dependency-to-run-javadoc-creation.patch deleted file mode 100644 index 7c6acc7..0000000 --- a/0007-Add-jdepend-dependency-to-run-javadoc-creation.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3877451aca27735062aef8b42d7b2049fd36c86b Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Mon, 14 May 2012 18:39:26 +0200 -Subject: [PATCH 7/8] Add jdepend dependency to run javadoc creation - ---- - build-hornetq.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build-hornetq.xml b/build-hornetq.xml -index 5acb609..76e25e8 100644 ---- a/build-hornetq.xml -+++ b/build-hornetq.xml -@@ -268,6 +268,7 @@ - - - -+ - - - -@@ -1616,7 +1617,7 @@ - - --- -1.7.10.1 - diff --git a/0008-Native-build-fixes.patch b/0008-Native-build-fixes.patch deleted file mode 100644 index 17910d0..0000000 --- a/0008-Native-build-fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 75f3a1de2bd5d09de07e00dc2f6ee374fee6aa7b Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Wed, 16 May 2012 10:29:30 +0200 -Subject: [PATCH 8/8] Native build fixes - ---- - native/src/AsyncFile.cpp | 1 + - native/src/JNI_AsynchronousFileImpl.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/native/src/AsyncFile.cpp b/native/src/AsyncFile.cpp -index e12812a..00cb799 100644 ---- a/native/src/AsyncFile.cpp -+++ b/native/src/AsyncFile.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include "AsyncFile.h" - #include "AIOController.h" -diff --git a/native/src/JNI_AsynchronousFileImpl.cpp b/native/src/JNI_AsynchronousFileImpl.cpp -index 0b8c11a..9e99af7 100644 ---- a/native/src/JNI_AsynchronousFileImpl.cpp -+++ b/native/src/JNI_AsynchronousFileImpl.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - - #include "org_hornetq_core_asyncio_impl_AsynchronousFileImpl.h" --- -1.7.10.1 - diff --git a/hornetq.spec b/hornetq.spec index 730dd2d..10452d9 100644 --- a/hornetq.spec +++ b/hornetq.spec @@ -1,32 +1,18 @@ +%global namedreltag .Final +%global namedversion %{version}%{?namedreltag} +%global customnamedversion 2_3_1_FINAL + Name: hornetq -Version: 2.2.13 -Release: 6%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: High performance messaging system -Group: Development/Libraries License: ASL 2.0 URL: http://www.jboss.org/hornetq - -# git clone git://github.com/hornetq/hornetq.git -# cd hornetq && git checkout HornetQ_2_2_13_AS7_Final && git checkout-index -f -a --prefix=hornetq-2.2.13/ -# find hornetq-2.2.13/ -name '*.jar' -delete -# tar cafJ hornetq-2.2.13-CLEAN.tar.xz hornetq-2.2.13 -Source0: hornetq-%{version}-CLEAN.tar.xz - -Patch0: 0001-Removed-maven-buildmagic-thirdparty-plugin-dependenc.patch -Patch1: 0002-Removed-spring-dependency.patch -Patch2: 0003-gui-aid-changes.patch -Patch3: 0004-JDK7-fix-for-FileChannel-constructor.patch -Patch4: 0005-Libraries-paths.patch -Patch5: 0006-Make-creation-of-pom-files-easier.patch -Patch6: 0007-Add-jdepend-dependency-to-run-javadoc-creation.patch -Patch7: 0008-Native-build-fixes.patch - -BuildRequires: jpackage-utils -BuildRequires: java-devel -BuildRequires: ant +Source0: https://github.com/hornetq/hornetq/archive/HornetQ_2_3_1_FINAL.tar.gz BuildRequires: automake libtool autoconf BuildRequires: apiviz +BuildRequires: aether BuildRequires: apache-commons-logging BuildRequires: javacc BuildRequires: jboss-connector-1.6-api @@ -34,33 +20,27 @@ BuildRequires: jboss-ejb-3.1-api BuildRequires: jboss-ejb3-ext-api BuildRequires: jboss-jaspi-1.0-api BuildRequires: jboss-jms-1.1-api -BuildRequires: jboss-jts BuildRequires: jboss-logging BuildRequires: jboss-servlet-3.0-api BuildRequires: jboss-transaction-1.1-api BuildRequires: jboss-transaction-spi BuildRequires: jboss-logging +BuildRequires: jboss-logging-tools +BuildRequires: jboss-remoting +BuildRequires: jboss-naming +BuildRequires: jbossws-parent BuildRequires: jdepend BuildRequires: libaio-devel BuildRequires: netty +BuildRequires: maven-local +BuildRequires: javacc-maven-plugin +BuildRequires: java-service-wrapper +BuildRequires: jgroups +BuildRequires: jboss-integration -Requires: jpackage-utils -Requires: java - -Requires: apache-commons-logging -Requires: jboss-connector-1.6-api -Requires: jboss-ejb-3.1-api -Requires: jboss-ejb3-ext-api -Requires: jboss-jaspi-1.0-api -Requires: jboss-jms-1.1-api -Requires: jboss-jts -Requires: jboss-logging -Requires: jboss-servlet-3.0-api -Requires: jboss-transaction-1.1-api -Requires: jboss-transaction-spi -Requires: jboss-logging -Requires: jdepend -Requires: netty +# Remove after rebuild with narayana +BuildRequires: jboss-jts +#BuildRequires: narayana %description HornetQ is an open source project to build a multi-protocol, embeddable, @@ -68,110 +48,91 @@ very high performance, clustered, asynchronous messaging system. %package javadoc Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. -%package devel -Summary: Native development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} +%prep +%setup -q -n hornetq-HornetQ_%{customnamedversion} -%description devel -This package provides the support files which can be used to -build applications using the HornetQ native library. +# Remove bundled .so files +find -name "*.so" -delete -%prep -%setup -q -n hornetq-%{version} +# Uncomment after rebuild with narayana +#%pom_remove_dep "org.jboss.jbossts:jbossjts" hornetq-jms-server/pom.xml +#%pom_add_dep "org.jboss.narayana.jta:jta" hornetq-jms-server/pom.xml +%pom_disable_module hornetq-server +%pom_disable_module hornetq-jms-server -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%pom_disable_module hornetq-bootstrap +%pom_disable_module hornetq-ra +%pom_disable_module hornetq-rest +%pom_disable_module hornetq-service-sar +%pom_disable_module tests -mkdir -p thirdparty/net/java/dev/javacc/lib/ thirdparty/org/jboss/apiviz/lib/ +#DEBUG: Caused by: org.apache.maven.project.DependencyResolutionException: Could not resolve dependencies for project org.hornetq:hornetq-jboss-as-integration:jar:2.3.1.Final: The following artifacts could not be resolved: org.jboss.security:jboss-security-spi:jar:2.0.3.SP1, org.jboss.security:jbosssx:jar:2.0.3.SP1, org.jboss.jbossts:jbossjts:jar:4.16.4.Final: The repository system is offline but the artifact org.jboss.security:jboss-security-spi:jar:2.0.3.SP1 is not available in the local repository. +%pom_disable_module integration/hornetq-jboss-as-integration +%pom_disable_module integration/hornetq-spring-integration +%pom_disable_module integration/hornetq-twitter-integration -ln -s $(build-classpath javacc) thirdparty/net/java/dev/javacc/lib/javacc.jar -ln -s $(build-classpath apiviz) thirdparty/org/jboss/apiviz/lib/apiviz.jar -ln -s $(build-classpath jdepend) thirdparty/org/jboss/apiviz/lib/jdepend.jar +%pom_remove_dep "org.jboss.microcontainer:jboss-kernel" -%build -# Build jars and javadocs -ant -Dnodownload=true -Dhornetq.run_script=true jar-core jar-core-client jar-jms jar-jms-client jar-ra javadoc -# Create POMs -ant -f build-maven.xml deploy +%build +# Prebuild the classes, so we can create new native bits later +xmvn -B -o compile # Build native bits export JAVA_HOME=/usr/lib/jvm/java -pushd native +pushd hornetq-native +autoreconf --install +%configure +make clean + # Generate C headers pushd src -javah -classpath ../../build/jars/hornetq-core.jar org.hornetq.core.asyncio.impl.AsynchronousFileImpl +javah -classpath $(build-classpath jboss-logging/jboss-logging):../../hornetq-journal/target/classes org.hornetq.core.asyncio.impl.AsynchronousFileImpl popd -autoreconf --install -%configure make %{?_smp_mflags} -popd - -%install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -for m in core-client core jms-client jms ra; do - # JAR - install -pm 644 build/jars/hornetq-${m}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar - - # POM - install -pm 644 hornetq-${m}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom - - # DEPMAP - %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar -done - -# APIDOCS -cp -rp build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -# Install native bits -pushd native -make install DESTDIR=$RPM_BUILD_ROOT +%ifarch x86_64 +cp -L src/.libs/libHornetQAIO.so bin/libHornetQAIO64.so +%else +cp -L src/.libs/libHornetQAIO.so bin/libHornetQAIO32.so +%endif popd -# Remove static files -rm $RPM_BUILD_ROOT/%{_libdir}/*.la +# Skipping test because junit 3 is not available and 4 breaks the test suite +%mvn_build -- -P maven-release -# Rename the executable file by prefixing it -mv $RPM_BUILD_ROOT/%{_bindir}/disktest $RPM_BUILD_ROOT/%{_bindir}/%{name}-disktest +%install +%mvn_install + +# Install native stuff +install -d -m 755 %{buildroot}/%{_libdir} +cp -L hornetq-native/src/.libs/libHornetQAIO.so %{buildroot}/%{_libdir}/libHornetQAIO.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%{_javadir}/* -%{_libdir}/libHornetQAIO.so.* -%{_bindir}/%{name}-disktest -%doc licenses/LICENSE.txt - -%files javadoc -%{_javadocdir}/%{name} -%doc licenses/LICENSE.txt - -%files devel +%files -f .mfiles +%dir %{_javadir}/%{name} %{_libdir}/libHornetQAIO.so -%doc licenses/LICENSE.txt +%doc distribution/hornetq/src/main/resources/licenses/LICENSE.txt +%doc NOTICE +%doc README.md + +%files javadoc -f .mfiles-javadoc +%doc distribution/hornetq/src/main/resources/licenses/LICENSE.txt +%doc NOTICE %changelog +* Wed Jun 12 2013 Marek Goldmann - 2.3.1-1 +- Upstream release 2.3.1.Final +- New guidelines + * Thu Feb 14 2013 Fedora Release Engineering - 2.2.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index ad267d5..0199d99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5581dddb5356d6ee467ffe4018a21f0c hornetq-2.2.13-CLEAN.tar.xz +f4fdd4f90021e1d4d209f550c81bae3c HornetQ_2_3_1_FINAL.tar.gz