diff --git a/activeio-3.1.4-howl-logger.patch b/activeio-3.1.4-howl-logger.patch
new file mode 100644
index 0000000..41e7393
--- /dev/null
+++ b/activeio-3.1.4-howl-logger.patch
@@ -0,0 +1,31 @@
+--- activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java 2006-11-17 01:40:53.000000000 +0100
++++ activeio-core/src/main/java/org/apache/activeio/journal/howl/HowlJournal.java-gil 2012-09-14 12:36:16.560310926 +0200
+@@ -147,6 +147,28 @@
+ public void logOverflowNotification(long key) {
+ eventListener.overflowNotification(new LongRecordLocation(key));
+ }
++ /////// howl-logger 1.0.2 demarcation///////
++ /* (non-Javadoc)
++ * @see org.objectweb.howl.log.LogEventListener#log(int,java.lang.String,java.lang.Throwable)
++ */
++ public void log(int level, String message, Throwable thrown) {
++ // TODO Auto-generated method stub
++ throw new AbstractMethodError();
++ }
++ /* (non-Javadoc)
++ * @see org.objectweb.howl.log.LogEventListener#log(int,java.lang.String)
++ */
++ public void log(int level, String message) {
++ // TODO Auto-generated method stub
++ throw new AbstractMethodError();
++ }
++ /* (non-Javadoc)
++ * @see org.objectweb.howl.log.LogEventListener#isLoggable(int)
++ */
++ public boolean isLoggable(int level) {
++ // TODO Auto-generated method stub
++ throw new AbstractMethodError();
++ }
+ });
+ }
+
diff --git a/activeio.spec b/activeio.spec
index a811118..a4c8f66 100644
--- a/activeio.spec
+++ b/activeio.spec
@@ -1,6 +1,6 @@
Name: activeio
Version: 3.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache ActiveMQ ActiveIO :: Core
Group: Development/Libraries
License: ASL 2.0
@@ -8,19 +8,19 @@ Url: http://activemq.apache.org/
# svn export http://svn.apache.org/repos/asf/activemq/activeio/tags/activeio-parent-3.1.4/ activeio-3.1.4
# tar czf activeio-3.1.4-src-svn.tar.gz activeio-3.1.4
Source0: activeio-3.1.4-src-svn.tar.gz
-# remove how-logger integration
-# remove ianal-maven-plugin maven-assembly-plugin(unavailable deps org.apache.geronimo.genesis apache-source-release-assembly-descriptor 2.0) taglist-maven-plugin
-# change geronimo-j2ee-management_1.1_spec with jboss-j2eemgmt-api_1.1_spec
-# change rat-maven-plugin with apache-rat-plugin
-# add junit for test
-Patch0: activeio-3.1.4-fixbuild.patch
+# build fix for howl-logger 1.0.2
+Patch0: activeio-3.1.4-howl-logger.patch
+
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: apache-commons-logging
+%if 0
+BuildRequires: howl-logger
+%endif
BuildRequires: jboss-j2eemgmt-1.1-api
-BuildRequires: junit4
+BuildRequires: junit
BuildRequires: maven
BuildRequires: maven-compiler-plugin
@@ -34,6 +34,9 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
Requires: apache-commons-logging
+%if 0
+Requires: howl-logger
+%endif
Requires: jboss-j2eemgmt-1.1-api
Requires: java
@@ -53,7 +56,96 @@ This package contains javadoc for %{name}.
%prep
%setup -q
-%patch0 -p1
+%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:taglist-maven-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-assembly-plugin
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" "
+
+ org.jboss.spec.javax.management.j2ee
+ jboss-j2eemgmt-api_1.1_spec
+ 1.0.1.Final
+ "
+
+%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
+%pom_xpath_inject "pom:project/pom:build/pom:pluginManagement/pom:plugins" "
+
+ org.apache.rat
+ apache-rat-plugin
+ 0.8-SNAPSHOT
+
+ false
+
+ "
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core/pom.xml
+%pom_xpath_inject "pom:project/pom:dependencies" "
+
+ org.jboss.spec.javax.management.j2ee
+ jboss-j2eemgmt-api_1.1_spec
+ 1.0.1.Final
+ " %{name}-core/pom.xml
+
+%pom_xpath_inject "pom:project/pom:dependencies" "
+
+ junit
+ junit
+ 4.10
+ test
+ " %{name}-core/pom.xml
+
+# TODO remove when howl-logger is available
+%if 0
+sed -i "s|0.1.8|1.0.2|" pom.xml
+%pom_remove_dep howl:howl-logger
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" '
+
+ org.objectweb.howl
+ howl
+ ${howl-version}
+ '
+%pom_xpath_inject "pom:project/pom:dependencies" "
+
+ org.objectweb.howl
+ howl
+ true
+ " %{name}-core/pom.xml
+%patch0 -p0
+%else
+%pom_remove_dep howl:howl-logger %{name}-core/pom.xml
+%pom_xpath_inject "pom:project/pom:build/pom:plugins" "
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ default-compile
+ compile
+
+
+ **/HowlJournal.*
+
+
+
+ compile
+
+
+
+ default-testCompile
+ test-compile
+
+
+ **/JournalPerfTool.*
+
+
+
+ testCompile
+
+
+
+ " %{name}-core/pom.xml
+%endif
sed -i 's/\r//' NOTICE
@@ -89,5 +181,8 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%changelog
+* Fri Sep 14 2012 gil cattaneo 3.1.4-2
+- Convert patch to POM macros
+
* Fri May 18 2012 gil cattaneo 3.1.4-1
- initial rpm
\ No newline at end of file