From abf3bd861daead87687494776971a39a5f9d7295 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Jul 06 2013 16:51:46 +0000
Subject: switch to XMvn


---

diff --git a/activeio-3.1.4-fixbuild.patch b/activeio-3.1.4-fixbuild.patch
deleted file mode 100644
index 20ebefe..0000000
--- a/activeio-3.1.4-fixbuild.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -Nru activeio-3.1.4/activeio-core/pom.xml activeio-3.1.4-gil/activeio-core/pom.xml
---- activeio-3.1.4/activeio-core/pom.xml	2012-04-19 17:40:34.000000000 +0200
-+++ activeio-3.1.4-gil/activeio-core/pom.xml	2012-05-18 13:30:38.165132211 +0200
-@@ -30,7 +30,6 @@
-   <description>A high performance IO abstraction framework</description>
-   <properties>
-       <activeio.osgi.import.pkg>
--          org.objectweb.howl.log*;resolution:=optional,
-           *
-       </activeio.osgi.import.pkg>
-   </properties>      
-@@ -63,18 +62,50 @@
-             
-             <!-- This test often fails on unix -->
-             <exclude>**/NIOAsyncChannelTest.*</exclude>
-+            <exclude>**/JournalPerfTool.*</exclude>
-           </excludes>
-         </configuration>
-       </plugin>
- 
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <id>default-compile</id>
-+            <phase>compile</phase>
-+            <configuration>
-+              <excludes>
-+                <exclude>**/HowlJournal.*</exclude>
-+              </excludes>
-+            </configuration>
-+            <goals>
-+                <goal>compile</goal>
-+            </goals>
-+          </execution>
-+          <execution>
-+            <id>default-testCompile</id>
-+            <phase>test-compile</phase>
-+            <configuration>
-+              <testExcludes>
-+                <exclude>**/JournalPerfTool.*</exclude>
-+              </testExcludes>
-+            </configuration> 
-+            <goals>
-+              <goal>testCompile</goal>
-+            </goals>
-+          </execution>
-+        </executions>
-+      </plugin>
-+
-     </plugins>
-   </build>
- 
-   <dependencies>
- 
-     <dependency>
--      <groupId>org.apache.geronimo.specs</groupId>
--      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-+      <groupId>org.jboss.spec.javax.management.j2ee</groupId>
-+      <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>commons-logging</groupId>
-@@ -82,12 +113,17 @@
-     </dependency>
- 
-     <!-- For HOWL integration -->
--    <dependency>
-+    <!--dependency>
-       <groupId>howl</groupId>
-       <artifactId>howl-logger</artifactId>
-       <optional>true</optional>
-+    </dependency-->
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.8.2</version>
-+      <scope>test</scope>
-     </dependency>
--
-   </dependencies>
- 
- 
-diff -Nru activeio-3.1.4/pom.xml activeio-3.1.4-gil/pom.xml
---- activeio-3.1.4/pom.xml	2012-04-19 17:40:34.000000000 +0200
-+++ activeio-3.1.4-gil/pom.xml	2012-05-18 13:26:13.055140793 +0200
-@@ -54,15 +54,15 @@
-   <dependencyManagement>
-     <dependencies>
-       <dependency>
--        <groupId>org.apache.geronimo.specs</groupId>
--        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
--        <version>1.0.1</version>
-+        <groupId>org.jboss.spec.javax.management.j2ee</groupId>
-+        <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
-+        <version>1.0.1.Final</version>
-       </dependency>
--      <dependency>
-+      <!--dependency>
-         <groupId>howl</groupId>
-         <artifactId>howl-logger</artifactId>
-         <version>${howl-version}</version>
--      </dependency>
-+      </dependency-->
-       <dependency>
-         <groupId>commons-logging</groupId>
-         <artifactId>commons-logging</artifactId>
-@@ -164,15 +164,15 @@
-           <artifactId>maven-bundle-plugin</artifactId>
-           <version>1.0.0</version>
-         </plugin>
--        <plugin>
-+        <!--plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>ianal-maven-plugin</artifactId>
-           <version>1.0-alpha-1</version>
--        </plugin>
-+        </plugin-->
-         <plugin>
--          <groupId>org.codehaus.mojo</groupId>
--          <artifactId>rat-maven-plugin</artifactId>
--          <version>1.0-alpha-3</version>
-+          <groupId>org.apache.rat</groupId>
-+          <artifactId>apache-rat-plugin</artifactId>
-+          <version>0.8-SNAPSHOT</version>
-           <configuration>
-             <excludeSubProjects>false</excludeSubProjects>
-           </configuration>
-@@ -212,7 +212,7 @@
-           </execution>
-         </executions>
-       </plugin>
--      <plugin>
-+      <!--plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>ianal-maven-plugin</artifactId>
-         <executions>
-@@ -225,7 +225,7 @@
-             </configuration>
-           </execution>
-         </executions>
--      </plugin>
-+      </plugin-->
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-@@ -285,11 +285,11 @@
-         <artifactId>cobertura-maven-plugin</artifactId>
-         <version>2.5.1</version>
-       </plugin>
--      <plugin>
-+      <!--plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>taglist-maven-plugin</artifactId>
-         <version>2.4</version>
--      </plugin>
-+      </plugin-->
-     </plugins>
-   </reporting>
- 
-@@ -304,7 +304,7 @@
-       </activation>
-       <build>
-         <plugins>
--          <plugin>
-+          <!--plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-assembly-plugin</artifactId>
-             <executions>
-@@ -324,16 +324,16 @@
-               </execution>
-             </executions>
-             <dependencies>
--              <dependency>
-+              <dependency-->
-                 <!-- apache version not yet released -->
-                 <!--<groupId>org.apache</groupId>-->
--                <groupId>org.apache.geronimo.genesis</groupId>
--                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-+                <!--groupId>org.apache.geronimo.genesis</groupId>
-+                <artifactId>apache-source-release-assembly-descriptor</artifactId-->
-                 <!-- apache version not yet known -->
--                <version>2.0</version>
-+                <!--version>2.0</version>
-               </dependency>
-             </dependencies>
--          </plugin>
-+          </plugin-->
-         </plugins>
-       </build>
-     </profile>
diff --git a/activeio.spec b/activeio.spec
index 64a690e..06cf737 100644
--- a/activeio.spec
+++ b/activeio.spec
@@ -1,8 +1,7 @@
 Name:          activeio
 Version:       3.1.4
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Apache ActiveMQ ActiveIO :: Core
-Group:         Development/Libraries
 License:       ASL 2.0
 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
@@ -12,7 +11,6 @@ Source0:       activeio-3.1.4-src-svn.tar.gz
 Patch0:        activeio-3.1.4-howl-logger.patch
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 
 BuildRequires: apache-commons-logging
 %if 0
@@ -23,77 +21,40 @@ BuildRequires: jboss-j2eemgmt-1.1-api
 BuildRequires: junit
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-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
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
 A high performance IO abstraction framework.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
 
 %prep
 %setup -q
-%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_plugin :ianal-maven-plugin
+%pom_remove_plugin :rat-maven-plugin
+%pom_remove_plugin :taglist-maven-plugin
+%pom_remove_plugin :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" "
-    <dependency>
-      <groupId>org.jboss.spec.javax.management.j2ee</groupId>
-      <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
-      <version>1.0.1.Final</version>
-    </dependency>"
-
-%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
-%pom_xpath_inject "pom:project/pom:build/pom:pluginManagement/pom:plugins" "
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.8-SNAPSHOT</version>
-          <configuration>
-            <excludeSubProjects>false</excludeSubProjects>
-          </configuration>
-        </plugin>"
-
-%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core/pom.xml
-%pom_xpath_inject "pom:project/pom:dependencies" "
-    <dependency>
-      <groupId>org.jboss.spec.javax.management.j2ee</groupId>
-      <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
-      <version>1.0.1.Final</version>
-    </dependency>"  %{name}-core/pom.xml
+<dependency>
+  <groupId>org.jboss.spec.javax.management.j2ee</groupId>
+  <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
+  <version>1.0.1.Final</version>
+</dependency>"
 
-%pom_xpath_inject "pom:project/pom:dependencies" "
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>" %{name}-core/pom.xml
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec %{name}-core
+%pom_add_dep org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec %{name}-core
+
+%pom_add_dep junit:junit::test %{name}-core
 
 # TODO remove when howl-logger is available
 %pom_remove_dep howl:howl-logger
@@ -101,86 +62,73 @@ This package contains javadoc for %{name}.
 %if 0
 sed -i "s|<howl-version>0.1.8|<howl-version>1.0.2|" pom.xml
 %pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" '
-    <dependency>
-      <groupId>org.objectweb.howl</groupId>
-      <artifactId>howl</artifactId>
-      <version>${howl-version}</version>
-    </dependency>'
+<dependency>
+  <groupId>org.objectweb.howl</groupId>
+  <artifactId>howl</artifactId>
+  <version>${howl-version}</version>
+</dependency>'
 %pom_xpath_inject "pom:project/pom:dependencies" "
-    <dependency>
-      <groupId>org.objectweb.howl</groupId>
-      <artifactId>howl</artifactId>
-      <optional>true</optional>
-    </dependency>" %{name}-core/pom.xml
+<dependency>
+  <groupId>org.objectweb.howl</groupId>
+  <artifactId>howl</artifactId>
+  <optional>true</optional>
+</dependency>" %{name}-core/pom.xml
 %patch0 -p0
 %else
-%pom_xpath_inject "pom:project/pom:build/pom:plugins" "
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <phase>compile</phase>
-            <configuration>
-              <excludes>
-                <exclude>**/HowlJournal.*</exclude>
-              </excludes>
-            </configuration>
-            <goals>
-                <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-testCompile</id>
-            <phase>test-compile</phase>
-            <configuration>
-              <testExcludes>
-                <exclude>**/JournalPerfTool.*</exclude>
-              </testExcludes>
-            </configuration> 
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>" %{name}-core/pom.xml
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin  %{name}-core "
+<executions>
+  <execution>
+    <id>default-compile</id>
+    <phase>compile</phase>
+    <configuration>
+      <excludes>
+	<exclude>**/HowlJournal.*</exclude>
+      </excludes>
+    </configuration>
+    <goals>
+      <goal>compile</goal>
+    </goals>
+  </execution>
+  <execution>
+    <id>default-testCompile</id>
+    <phase>test-compile</phase>
+    <configuration>
+      <testExcludes>
+	<exclude>**/JournalPerfTool.*</exclude>
+      </testExcludes>
+    </configuration> 
+    <goals>
+      <goal>testCompile</goal>
+    </goals>
+  </execution>
+</executions>"
 %endif
 
 sed -i 's/\r//' NOTICE
 
 %build
 
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :%{name}-core activemq/%{name}-core
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}/activemq
-install -m 644 %{name}-core/target/%{name}-core-%{version}.jar \
-   %{buildroot}%{_javadir}/activemq/%{name}-core.jar
 install -m 644 %{name}-core/target/%{name}-core-%{version}-tests.jar \
    %{buildroot}%{_javadir}/activemq/%{name}-core-tests.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.activemq-%{name}-parent.pom
-%add_maven_depmap JPP.activemq-%{name}-parent.pom
-install -pm 644 %{name}-core/pom.xml %{buildroot}%{_mavenpomdir}/JPP.activemq-%{name}-core.pom
-%add_maven_depmap JPP.activemq-%{name}-core.pom activemq/%{name}-core.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/activemq/%{name}-core*.jar
-%{_mavenpomdir}/JPP.activemq-%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+   
+%files -f .mfiles
+%{_javadir}/activemq/%{name}-core-tests.jar
 %doc LICENSE NOTICE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Sat Jul 06 2013 gil cattaneo <puntogil@libero.it> 3.1.4-6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild