From 3ebc4eef7e6fdc5a6dc222247e3bc288b5479109 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Jul 30 2013 11:09:23 +0000
Subject: - Rebuild with narayana

- Added hornetq-jms-server and hornetq-ra modules

---

diff --git a/hornetq.spec b/hornetq.spec
index 10452d9..7fa6098 100644
--- a/hornetq.spec
+++ b/hornetq.spec
@@ -4,7 +4,7 @@
 
 Name:             hornetq
 Version:          2.3.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          High performance messaging system
 License:          ASL 2.0
 URL:              http://www.jboss.org/hornetq
@@ -37,10 +37,10 @@ BuildRequires:    javacc-maven-plugin
 BuildRequires:    java-service-wrapper
 BuildRequires:    jgroups
 BuildRequires:    jboss-integration
-
-# Remove after rebuild with narayana
-BuildRequires:    jboss-jts
-#BuildRequires:    narayana
+BuildRequires:    mvn(org.jboss.resteasy:resteasy-jaxrs)
+BuildRequires:    mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec)
+BuildRequires:    narayana
+BuildRequires:    mvn(org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec)
 
 %description
 HornetQ is an open source project to build a multi-protocol, embeddable,
@@ -58,25 +58,24 @@ This package contains the API documentation for %{name}.
 # Remove bundled .so files
 find -name "*.so" -delete
 
-# 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
+%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-bootstrap
-%pom_disable_module hornetq-ra
-%pom_disable_module hornetq-rest
 %pom_disable_module hornetq-service-sar
+%pom_disable_module hornetq-bootstrap
 %pom_disable_module tests
+%pom_disable_module examples
+%pom_disable_module hornetq-rest
 
-#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
 
 %pom_remove_dep "org.jboss.microcontainer:jboss-kernel"
 
+# Replace old jca
+%pom_remove_dep "org.jboss.javaee:jboss-jca-api" hornetq-ra/pom.xml
+%pom_add_dep "org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec" hornetq-ra/pom.xml
 
 %build
 # Prebuild the classes, so we can create new native bits later
@@ -105,7 +104,11 @@ cp -L src/.libs/libHornetQAIO.so bin/libHornetQAIO32.so
 popd
 
 # Skipping test because junit 3 is not available and 4 breaks the test suite
-%mvn_build -- -P maven-release
+# DEBUG: [ERROR] /builddir/build/BUILD/hornetq-HornetQ_2_3_1_FINAL/hornetq-server/src/test/java/org/hornetq/tests/util/UnitTestCase.java:[466,15] method addTestSuite in class junit.framework.TestSuite cannot be applied to given types;
+# DEBUG: [ERROR] required: java.lang.Class<? extends junit.framework.TestCase>
+# DEBUG: [ERROR] found: java.lang.Class<capture#1 of ?>
+# DEBUG: [ERROR] reason: actual argument java.lang.Class<capture#1 of ?> cannot be converted to java.lang.Class<? extends junit.framework.TestCase> by method invocation conversion
+%mvn_build -f -- -P maven-release
 
 %install
 %mvn_install
@@ -129,6 +132,10 @@ cp -L hornetq-native/src/.libs/libHornetQAIO.so %{buildroot}/%{_libdir}/libHorne
 %doc NOTICE
 
 %changelog
+* Tue Jul 30 2013 Marek Goldmann <mgoldman@redhat.com> - 2.3.1-2
+- Rebuild with narayana
+- Added hornetq-jms-server and hornetq-ra modules
+
 * Wed Jun 12 2013 Marek Goldmann <mgoldman@redhat.com> - 2.3.1-1
 - Upstream release 2.3.1.Final
 - New guidelines