[Jpackage-commits] rpms/free/activemq4 activemq4-all-pom.patch, NONE, 1.1.2.1 activemq4-jpp-depmap.xml, NONE, 1.1.2.1 activemq4-optional-HttpClientTransport.patch, NONE, 1.1.2.1 activemq4-pom.patch, NONE, 1.1.2.1 activemq4-run-pom.patch, NONE, 1.1.2.1 activemq4-settings.xml, NONE, 1.1.2.1 activemq4-web-console-pom.patch, NONE, 1.1.2.1 activemq4-web-pom.patch, NONE, 1.1.2.1 activemq4.spec, NONE, 1.1.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 8 00:20:57 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/activemq4
In directory ryu.zarb.org:/tmp/m4dcuCneUa/rpms/free/activemq4

Added Files:
      Tag: JPACKAGE-5_0
	activemq4-all-pom.patch activemq4-jpp-depmap.xml 
	activemq4-optional-HttpClientTransport.patch 
	activemq4-pom.patch activemq4-run-pom.patch 
	activemq4-settings.xml activemq4-web-console-pom.patch 
	activemq4-web-pom.patch activemq4.spec 
Log Message:
4.1.2-1.jpp5

--- NEW FILE: activemq4-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: activemq4-all-pom.patch ---
--- activemq-all/pom.xml.sav3	2008-04-11 00:03:51.000000000 +0200
+++ activemq-all/pom.xml	2008-09-04 12:28:53.000000000 +0200
@@ -52,9 +52,9 @@
     <plugins>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0.1</version>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>shade-maven-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -79,19 +79,19 @@
                 </includes>
               </artifactSet>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                <transformer implementation="org.codehaus.mojo.shade.resource.ApacheNoticeResourceTransformer">
                   <projectName>Apache ActiveMQ</projectName>
                 </transformer>
 
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                   <resource>META-INF/spring.handlers</resource>
                 </transformer>
 
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                   <resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
                 </transformer>
 
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
                   <resource>META-INF/spring.schemas</resource>
                 </transformer>
               </transformers>
@@ -120,4 +120,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: activemq4.spec ---
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

%define section free
%define oname activemq

Name:           activemq4
Summary:        ActiveMQ Message Broker
Url:            http://activemq.apache.org/
Version:        4.1.2
Release:        1%{dist}
Epoch:          0
License:        Apache Software License 2.0
Group:          Development/Libraries/Java
Source0:        activemq-4.1.2.tar.gz
# svn export http://svn.apache.org/repos/asf/activemq/tags/activemq-4.1.2/

Source1:        activemq4-settings.xml
Source2:        activemq4-jpp-depmap.xml
Source3:        apache-jar-resource-bundle-1.3.jar

Patch0:         activemq4-pom.patch
Patch1:         activemq4-optional-HttpClientTransport.patch
Patch2:         activemq4-web-console-pom.patch
Patch3:         activemq4-all-pom.patch
Patch4:         activemq4-run-pom.patch
Patch5:         activemq4-web-pom.patch


BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  junit
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-eclipse
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-rar
BuildRequires:  maven2-plugin-remote-resources
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-stage
BuildRequires:  maven2-plugin-war
BuildRequires:  maven-jaxb2-plugin
BuildRequires:  maven-release
BuildRequires:  maven-surefire-plugin
BuildRequires:  mvn-anno-mojo
BuildRequires:  mojo-maven2-plugin-build-helper
BuildRequires:  mojo-maven2-plugin-javacc
BuildRequires:  mojo-maven2-plugin-rat
BuildRequires:  mojo-maven2-plugin-shade
BuildRequires:  felix-maven2
BuildRequires:  jetty6-maven2-plugins
BuildRequires:  geronimo-genesis

BuildRequires:  apacheds-shared-ldap
# = directory-shared:ldap-common:jar:0.9.2
BuildRequires:  apacheds10-protocol-ldap
# = directory-protocols:ldap-protocol:jar:0.9.2
BuildRequires:  apacheds10-core-shared
# = directory:apacheds-shared:jar:0.9.2
BuildRequires:  apacheds10-protocol-kerberos
# = directory-protocols:kerberos-protocol:jar:0.5
BuildRequires:  asn1
# = directory-asn1:asn1-codec:jar:0.3.2
# = directory-asn1:asn1-der:jar:0.3.2
BuildRequires:  apacheds10-core
# = directory:apacheds-core:jar:0.9.2

BuildRequires:  activeio3
BuildRequires:  annogen
BuildRequires:  ant
BuildRequires:  aopalliance
BuildRequires:  atomikos-transactions-essentials
BuildRequires:  axis
BuildRequires:  backport-util-concurrent
BuildRequires:  derby
BuildRequires:  groovy-jsr
BuildRequires:  groovy-module-gram
BuildRequires:  j2ee_connector_1_5_api
BuildRequires:  geronimo-j2ee-management-1.0-api
BuildRequires:  j2ee_management_1_0_api
BuildRequires:  jacc_1_0_api
BuildRequires:  jaf_1_1_api
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-httpclient
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-pool
BuildRequires:  jakarta-commons-primitives11
BuildRequires:  jakarta-taglibs-standard
BuildRequires:  jdom
BuildRequires:  jetty6-core
BuildRequires:  jms_1_1_api
BuildRequires:  jrms
BuildRequires:  jta_1_0_1B_api
BuildRequires:  junit
BuildRequires:  log4j
BuildRequires:  mina11
BuildRequires:  mina11-filter-ssl
BuildRequires:  mx4j
BuildRequires:  qdox
BuildRequires:  rome
BuildRequires:  saxon7
BuildRequires:  geronimo-jaf-1.1-api
BuildRequires:  geronimo-jsp-2.1-api
BuildRequires:  servlet_2_5_api
BuildRequires:  sitemesh
BuildRequires:  slf4j
BuildRequires:  spring2-all
BuildRequires:  spring2-webmvc
BuildRequires:  smack
BuildRequires:  stax_1_0_api
BuildRequires:  sun-jaxb-2.1-api
BuildRequires:  sun-jaxb-2.1-impl
BuildRequires:  wstx
BuildRequires:  xalan-j2
BuildRequires:  xbean
BuildRequires:  xmlbeans
BuildRequires:  xpp3-minimal
BuildRequires:  xstream

Requires:       activeio3
Requires:       backport-util-concurrent
Requires:       jakarta-commons-logging
Requires:       jms_1_1_api

%if %{gcj_support}
BuildRequires:    gnu-crypto
BuildRequires:          java-gcj-compat-devel
Requires(post):         java-gcj-compat
Requires(postun):       java-gcj-compat
%endif
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
Apache ActiveMQ is a popular and powerful open source Message
Broker and Enterprise Integration Patterns provider.
Apache ActiveMQ is fast, supports many Cross Language Clients
and Protocols, comes with easy to use Enterprise Integration
Patterns and many advanced features while fully supporting
JMS 1.1 and J2EE 1.4. 

%package all
Summary:        All of %{name}
Group:          Development/Libraries/Java
Requires:       %{name}-console = %{epoch}:%{version}-%{release}
Requires:       %{name}-optional = %{epoch}:%{version}-%{release}
Requires:       derby

%description all
%{summary}.

%package console
Summary:        Console from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-pool
Requires:       jms_1_1_api
Requires:       mx4j
Requires:       spring2-all
Requires:       xbean

%description console
%{summary}.

%package jaas
Summary:        JAAS from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-logging

%description jaas
%{summary}.

%package maven-plugins
Summary:        Maven2 Plugins from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       %{name}-console = %{epoch}:%{version}-%{release}
Requires:       activeio3
Requires:       backport-util-concurrent
Requires:       derby
Requires:       jms_1_1_api
Requires:       j2ee_management_1_0_api
Requires:       maven2

%description maven-plugins
%{summary}.

%package openwire-generator
Summary:        Openwire Generator from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       ant
Requires:       annogen
Requires:       groovy-module-gram
Requires:       groovy-jsr

%description openwire-generator
%{summary}.

%package optional
Summary:        Optional from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       activeio3
Requires:       aopalliance
Requires:       axis
Requires:       jakarta-commons-collections
Requires:       jakarta-commons-httpclient
Requires:       jakarta-commons-pool
Requires:       jetty6-core
Requires:       junit
Requires:       log4j
Requires:       spring2-all
Requires:       xpp3
Requires:       xstream

%description optional
%{summary}.

%package ra
Summary:        Resource Adapter from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       derby
Requires:       j2ee_connector_1_5_api
Requires:       j2ee_management_1_0_api
Requires:       log4j
Requires:       spring2-all
Requires:       xbean

%description ra
%{summary}.

%package web
Summary:        Web Module from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jdom
Requires:       jetty6-core
Requires:       rome
Requires:       servlet_2_5_api
Requires:       xbean
Requires:       xpp3

%description web
%{summary}.

%package web-console
Summary:        Web Console from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       %{name}-console = %{epoch}:%{version}-%{release}
Requires:       %{name}-web = %{epoch}:%{version}-%{release}
Requires:       %{name}-xmpp = %{epoch}:%{version}-%{release}
Requires:       activeio3
Requires:       j2ee_management_1_0_api
Requires:       jacc_1_0_api
Requires:       jakarta-taglibs-standard
Requires:       jms_1_1_api
Requires:       jta_1_0_1B_api
Requires:       log4j
Requires:       servlet_2_5_api
Requires:       sitemesh
Requires:       slf4j
Requires:       spring2-all
Requires:       spring2-webmvc
Requires:       xbean
Requires:       xpp3
Requires:       xstream

%description web-console
%{summary}.

%package web-demo
Summary:        Web Demo from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       %{name}-web = %{epoch}:%{version}-%{release}
Requires:       activeio3
Requires:       jms_1_1_api
Requires:       jta_1_0_1B_api
Requires:       j2ee_management_1_0_api
Requires:       jacc_1_0_api
Requires:       spring2-all
Requires:       xbean
Requires:       xpp3
Requires:       xstream

%description web-demo
%{summary}.

%package xmpp
Summary:        XMPP Module from %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       activeio3
Requires:       jaf_1_1_api
Requires:       stax_1_0_api
Requires:       spring2-all
Requires:       smack
Requires:       sun-jaxb-2.1-api
Requires:       sun-jaxb-2.1-impl
Requires:       wstx
Requires:       xstream

%description xmpp
%{summary}.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q -n %{oname}-%{version}
chmod -R go=u-w *
for f in $(find . -name "*.jar"); do
  mv $f $f.no
done
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4
%patch5 -b .sav5

# tests seem obsolete wrt apacheds
rm -rf activemq-jaas/src/test/
# needs older jmock
rm -f activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQAsfEndpointWorkerTest.java

cp %{SOURCE1} settings.xml

%build
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL/org.apache
cp %{SOURCE3} $MAVEN_REPO_LOCAL/org.apache/apache-jar-resource-bundle.jar

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export SETTINGS=$(pwd)/settings.xml
export MAVEN_OPTS="-Xmx256M"

mvn-jpp \
        -e \
        -s $SETTINGS \
        -Dtest=false \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install

mvn-jpp \
        -e \
        -s $SETTINGS \
        -Daggregate=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        javadoc:javadoc

%install
rm -rf $RPM_BUILD_ROOT

# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms


install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.apache.activemq activemq-parent %{version} JPP %{name}

install -m 644 %{oname}-all/target/%{oname}-all-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-all-%{version}.jar
install -m 644 %{oname}-all/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-all.pom
%add_to_maven_depmap org.apache.activemq activemq-all %{version} JPP %{name}-all

install -m 644 %{oname}-console/target/%{oname}-console-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/console-%{version}.jar
install -m 644 %{oname}-console/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-console.pom
%add_to_maven_depmap org.apache.activemq activemq-console %{version} JPP/%{name} console

install -m 644 %{oname}-core/target/%{oname}-core-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
install -m 644 %{oname}-core/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
%add_to_maven_depmap org.apache.activemq activemq-core %{version} JPP/%{name} core

install -m 644 %{oname}-jaas/target/%{oname}-jaas-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/jaas-%{version}.jar
install -m 644 %{oname}-jaas/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jaas.pom
%add_to_maven_depmap org.apache.activemq activemq-jaas %{version} JPP/%{name} jaas

install -m 644 %{oname}-jmdns_1.0/target/%{oname}-jmdns_1.0-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/jmdns_1.0-%{version}.jar
install -m 644 %{oname}-jmdns_1.0/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jmdns_1.0.pom
%add_to_maven_depmap org.apache.activemq activemq-jmdns_1.0 %{version} JPP/%{name} jmdns_1.0

install -m 644 %{oname}-openwire-generator/target/%{oname}-openwire-generator-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/openwire-generator-%{version}.jar
install -m 644 %{oname}-openwire-generator/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-openwire-generator.pom
%add_to_maven_depmap org.apache.activemq activemq-openwire-generator %{version} JPP/%{name} openwire-generator

install -m 644 %{oname}-optional/target/%{oname}-optional-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/optional-%{version}.jar
install -m 644 %{oname}-optional/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-optional.pom
%add_to_maven_depmap org.apache.activemq activemq-optional %{version} JPP/%{name} optional

install -m 644 %{oname}-ra/target/%{oname}-ra-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/ra-%{version}.jar
install -m 644 %{oname}-ra/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ra.pom
%add_to_maven_depmap org.apache.activemq activemq-ra %{version} JPP/%{name} ra

install -m 644 %{oname}-run/target/%{oname}-run-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/run-%{version}.jar
install -m 644 %{oname}-run/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-run.pom
%add_to_maven_depmap org.apache.activemq activemq-run %{version} JPP/%{name} run

install -m 644 %{oname}-web/target/%{oname}-web-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/web-%{version}.jar
install -m 644 %{oname}-web/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-web.pom
%add_to_maven_depmap org.apache.activemq activemq-web %{version} JPP/%{name} web

install -m 644 %{oname}-xmpp/target/%{oname}-xmpp-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/xmpp-%{version}.jar
install -m 644 %{oname}-xmpp/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-xmpp.pom
%add_to_maven_depmap org.apache.activemq activemq-xmpp %{version} JPP/%{name} xmpp

install -m 644 %{oname}-rar/target/%{oname}-rar-%{version}.rar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/rar-%{version}.rar
install -m 644 %{oname}-rar/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-rar.pom
%add_to_maven_depmap org.apache.activemq activemq-rar %{version} JPP/%{name} rar

install -m 644 %{oname}-web-console/target/%{oname}-web-console-%{version}.war \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/web-console-%{version}.war
install -m 644 %{oname}-web-console/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-web-console.pom
%add_to_maven_depmap org.apache.activemq activemq-web-console %{version} JPP/%{name} web-console

install -m 644 %{oname}-web-demo/target/%{oname}-web-demo-%{version}.war \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/web-demo-%{version}.war
install -m 644 %{oname}-web-demo/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-web-demo.pom
%add_to_maven_depmap org.apache.activemq activemq-web-demo %{version} JPP/%{name} web-demo

install -m 644 %{oname}-tooling/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-tooling.pom
%add_to_maven_depmap org.apache.activemq activemq-tooling %{version} JPP/%{name} tooling

install -m 644 %{oname}-tooling/maven-activemq-memtest-plugin/target/maven-activemq-memtest-plugin-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-activemq-memtest-plugin-%{version}.jar
install -m 644 %{oname}-tooling/maven-activemq-memtest-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven-activemq-memtest-plugin.pom
%add_to_maven_depmap org.apache.activemq.tooling maven-activemq-memtest-plugin %{version} JPP/%{name} maven-activemq-memtest-plugin

install -m 644 %{oname}-tooling/maven-activemq-perf-plugin/target/maven-activemq-perf-plugin-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-activemq-perf-plugin-%{version}.jar
install -m 644 %{oname}-tooling/maven-activemq-perf-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven-activemq-perf-plugin.pom
%add_to_maven_depmap org.apache.activemq.tooling maven-activemq-perf-plugin %{version} JPP/%{name} maven-activemq-perf-plugin

install -m 644 %{oname}-tooling/maven-activemq-plugin/target/maven-activemq-plugin-%{version}.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-activemq-plugin-%{version}.jar
install -m 644 %{oname}-tooling/maven-activemq-plugin/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven-activemq-plugin.pom
%add_to_maven_depmap org.apache.activemq.tooling maven-activemq-plugin %{version} JPP/%{name} maven-activemq-plugin

install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
pushd $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
ln -sf %{_javadir}/%{name}/maven-activemq-memtest-plugin.jar
ln -sf %{_javadir}/%{name}/maven-activemq-perf-plugin.jar
ln -sf %{_javadir}/%{name}/maven-activemq-plugin.jar
popd

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for r in *-%{version}.rar; do ln -sf ${r} `echo $r| sed  "s|-%{version}\.rar|.jar|g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for w in *-%{version}.war; do ln -sf ${w} `echo $w| sed  "s|-%{version}\.war|.jar|g"`; done)

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

%if %{gcj_support}
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root)
%doc LICENSE
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/core*.jar
%{_javadir}/%{name}/jmdns*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif

%files all
%defattr(-,root,root)
%{_javadir}/%{name}*.jar

%files console
%defattr(-,root,root)
%{_javadir}/%{name}/console*.jar
%{_javadir}/%{name}/run*.jar

%files jaas
%defattr(-,root,root)
%{_javadir}/%{name}/jaas*.jar

%files maven-plugins
%defattr(-,root,root)
%{_javadir}/%{name}/maven*.jar
%{_datadir}/maven2/plugins/*.jar

%files openwire-generator
%defattr(-,root,root)
%{_javadir}/%{name}/openwire*.jar

%files optional
%defattr(-,root,root)
%{_javadir}/%{name}/optional*.jar

%files ra
%defattr(-,root,root)
%{_javadir}/%{name}/ra*.jar
%{_javadir}/%{name}/*.rar

%files web
%defattr(-,root,root)
%{_javadir}/%{name}/web*.jar

%files xmpp
%defattr(-,root,root)
%{_javadir}/%{name}/xmpp*.jar

%files web-console
%defattr(-,root,root)
%{_javadir}/%{name}/web-console*

%files web-demo
%defattr(-,root,root)
%{_javadir}/%{name}/web-demo*

%files javadoc
%defattr(-,root,root)
%{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}

%changelog
* Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:4.1.2-1.jpp5
- 4.1.2 changed name to activemq4


--- NEW FILE: activemq4-optional-HttpClientTransport.patch ---
--- activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java.sav	2008-09-03 09:46:38.000000000 +0200
+++ activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java	2008-09-03 09:48:34.000000000 +0200
@@ -141,8 +141,12 @@
 				onException(IOExceptionSupport.create("Failed to perform GET on: " + remoteUrl+" Reason: "+e.getMessage(),e));
 				break;
             } finally {
-                httpMethod.getResponseBody();
-                httpMethod.releaseConnection();
+                try {
+                    httpMethod.getResponseBody();
+                    httpMethod.releaseConnection();
+                }
+                catch (IOException e) {
+                }
             }
         }
     }

--- NEW FILE: activemq4-run-pom.patch ---
--- activemq-run/pom.xml.sav	2008-09-04 12:09:36.000000000 +0200
+++ activemq-run/pom.xml	2008-09-04 12:10:01.000000000 +0200
@@ -54,9 +54,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.0.1</version>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>shade-maven-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -115,4 +115,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: activemq4-jpp-depmap.xml ---
<dependencies>
<!--
-->
 <dependency>
   <maven>
     <groupId>directory-asn1</groupId>
     <artifactId>asn1-der</artifactId>
     <version>0.3.2</version>
   </maven>
   <jpp>
     <groupId>JPP/asn1</groupId>
     <artifactId>asn1-der</artifactId>
     <version>0.3.3</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>directory-asn1</groupId>
     <artifactId>asn1-codec</artifactId>
     <version>0.3.2</version>
   </maven>
   <jpp>
     <groupId>JPP/asn1</groupId>
     <artifactId>asn1-codec</artifactId>
     <version>0.3.3</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>directory-protocols</groupId>
     <artifactId>kerberos-protocol</artifactId>
     <version>0.5</version>
   </maven>
   <jpp>
     <groupId>JPP/apacheds10</groupId>
     <artifactId>protocol-kerberos</artifactId>
     <version>1.0.2</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>directory-protocols</groupId>
     <artifactId>ldap-protocol</artifactId>
     <version>0.9.2</version>
   </maven>
   <jpp>
     <groupId>JPP/apacheds10</groupId>
     <artifactId>protocol-ldap</artifactId>
     <version>1.0.2</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>directory</groupId>
     <artifactId>apacheds-core</artifactId>
     <version>0.9.2</version>
   </maven>
   <jpp>
     <groupId>JPP/apacheds10</groupId>
     <artifactId>core</artifactId>
     <version>1.0.2</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>directory</groupId>
     <artifactId>apacheds-shared</artifactId>
     <version>0.9.2</version>
   </maven>
   <jpp>
     <groupId>JPP/apacheds10</groupId>
     <artifactId>core-shared</artifactId>
     <version>1.0.2</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>directory-shared</groupId>
     <artifactId>ldap-common</artifactId>
     <version>0.9.2</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>apacheds-shared-ldap</artifactId>
     <version>0.9.5.5</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>directory-network</groupId>
     <artifactId>mina</artifactId>
     <version>0.7.3</version>
   </maven>
   <jpp>
     <groupId>JPP/mina11</groupId>
     <artifactId>core</artifactId>
     <version>1.1.4</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-core</artifactId>
     <version>1.1.4</version>
   </maven>
   <jpp>
     <groupId>JPP/mina11</groupId>
     <artifactId>core</artifactId>
     <version>1.1.4</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-filter-ssl</artifactId>
     <version>1.0.2</version>
   </maven>
   <jpp>
     <groupId>JPP/mina11</groupId>
     <artifactId>filter-ssl</artifactId>
     <version>1.1.4</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>jdbm</groupId>
     <artifactId>jdbm</artifactId>
     <version>1.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jdbm</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>directory-shared</groupId>
     <artifactId>kerberos-common</artifactId>
     <version>0.5</version>
   </maven>
   <jpp>
     <groupId>JPP/maven2</groupId>
     <artifactId>empty-dep</artifactId>
     <version>0.5</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>directory-shared</groupId>
     <artifactId>apache-ldapber-provider</artifactId>
     <version>0.9.2</version>
   </maven>
   <jpp>
     <groupId>JPP/maven2</groupId>
     <artifactId>empty-dep</artifactId>
     <version>0.9.2</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>net.java.dev.javacc</groupId>
     <artifactId>javacc</artifactId>
     <version>4.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>javacc</artifactId>
     <version>4.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>commons-pool</groupId>
     <artifactId>commons-pool</artifactId>
     <version>1.2</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>commons-pool</artifactId>
     <version>1.3</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>commons-primitives</groupId>
     <artifactId>commons-primitives</artifactId>
     <version>1.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>commons-primitives11</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.slf4j</groupId>
     <artifactId>nlog4j</artifactId>
     <version>1.2.24</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>nlog4j</artifactId>
     <version>1.2.21</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>axion</groupId>
     <artifactId>axion</artifactId>
     <version>1.0-M3-dev</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>axion</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>mx4j</groupId>
     <artifactId>mx4j-impl</artifactId>
     <version>2.1.1</version>
   </maven>
   <jpp>
     <groupId>JPP/mx4j</groupId>
     <artifactId>mx4j-impl</artifactId>
     <version>3.0.1</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>mx4j</groupId>
     <artifactId>mx4j-jmx</artifactId>
     <version>2.1.1</version>
   </maven>
   <jpp>
     <groupId>JPP/mx4j</groupId>
     <artifactId>mx4j-jmx</artifactId>
     <version>3.0.1</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>mx4j</groupId>
     <artifactId>mx4j-remote</artifactId>
     <version>2.1.1</version>
   </maven>
   <jpp>
     <groupId>JPP/mx4j</groupId>
     <artifactId>mx4j-remote</artifactId>
     <version>3.0.1</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>mx4j</groupId>
     <artifactId>mx4j</artifactId>
     <version>2.1.1</version>
   </maven>
   <jpp>
     <groupId>JPP/mx4j</groupId>
     <artifactId>mx4j</artifactId>
     <version>3.0.1</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>mx4j</groupId>
     <artifactId>mx4j-tools</artifactId>
     <version>2.1.1</version>
   </maven>
   <jpp>
     <groupId>JPP/mx4j</groupId>
     <artifactId>mx4j-tools</artifactId>
     <version>3.0.1</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>groovy</groupId>
     <artifactId>groovy-all</artifactId>
     <version>1.0-jsr-03</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>groovy-jsr-all</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>groovy</groupId>
     <artifactId>gram</artifactId>
     <version>1.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>groovy-module-gram</artifactId>
     <version>1.2</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>xmlbeans</groupId>
     <artifactId>xbean</artifactId>
     <version>2.0.0-beta1</version>
   </maven>
   <jpp>
     <groupId>JPP/xmlbeans</groupId>
     <artifactId>xbean</artifactId>
     <version>2.3.0</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>xmlbeans</groupId>
     <artifactId>xbean_xpath</artifactId>
     <version>2.0.0-beta1</version>
   </maven>
   <jpp>
     <groupId>JPP/xmlbeans</groupId>
     <artifactId>xbean_xpath</artifactId>
     <version>2.3.0</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>xmlbeans</groupId>
     <artifactId>xmlpublic</artifactId>
     <version>2.0.0-beta1</version>
   </maven>
   <jpp>
     <groupId>JPP/xmlbeans</groupId>
     <artifactId>xmlpublic</artifactId>
     <version>2.3.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>xmlpull</groupId>
     <artifactId>xmlpull</artifactId>
     <version>1.1.3.4d_b4_min</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>xpp3-minimal</artifactId>
     <version>1.1.3.8</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>xpp3</groupId>
     <artifactId>xpp3_min</artifactId>
     <version>1.1.3.4.O</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>xpp3-minimal</artifactId>
     <version>1.1.3.8</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>stax</groupId>
     <artifactId>stax-api</artifactId>
     <version>1.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>stax_1_0_api</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>javax.xml.stream</groupId>
     <artifactId>stax-api</artifactId>
     <version>1.0-2</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>stax_1_0_api</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>xstream</groupId>
     <artifactId>xstream</artifactId>
     <version>1.1.2</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>xstream</artifactId>
     <version>1.2.2</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>axis</groupId>
     <artifactId>axis</artifactId>
     <version>1.2-RC1</version>
   </maven>
   <jpp>
     <groupId>JPP/axis</groupId>
     <artifactId>axis</artifactId>
     <version>1.4</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>org.apache.geronimo.specs</groupId>
     <artifactId>geronimo-stax-api_1.0_spec</artifactId>
     <version>1.0.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>stax_1_0_api</artifactId>
     <version>1.0</version>
   </jpp>
 </dependency>

 <dependency>
   <maven>
     <groupId>jivesoftware</groupId>
     <artifactId>smackx</artifactId>
     <version>1.5.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>smackx</artifactId>
     <version>1.5.0</version>
   </jpp>
 </dependency>
 <dependency>
   <maven>
     <groupId>jivesoftware</groupId>
     <artifactId>smack</artifactId>
     <version>1.5.0</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>smack</artifactId>
     <version>1.5.0</version>
   </jpp>
 </dependency>

   <dependency>
      <maven>
         <groupId>org.jvnet.jaxb2_commons</groupId>
         <artifactId>jaxb-xjc</artifactId>
         <version>2.1.6</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>sun-jaxb-2.1-impl-xjc</artifactId>
         <version>2.1.6</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>relaxngDatatype</groupId>
         <artifactId>relaxngDatatype</artifactId>
         <version>20020414</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>relaxngDatatype</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>javax.servlet</groupId>
         <artifactId>jstl</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>taglibs-core</artifactId>
         <version>1.1.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>taglibs</groupId>
         <artifactId>standard</artifactId>
         <version>1.1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>taglibs-standard</artifactId>
         <version>1.1.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
         <version>2.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>spring2</artifactId>
         <version>2.5.5</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
         <version>2.0</version>
      </maven>
      <jpp>
         <groupId>JPP/spring2</groupId>
         <artifactId>webmvc</artifactId>
         <version>2.5.5</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>activesoap</groupId>
         <artifactId>jaxp-api</artifactId>
         <version>1.3</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
         <version>1.3</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>jrms</groupId>
         <artifactId>jrms</artifactId>
         <version>1.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jrms</artifactId>
         <version>1.1</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jsp_2.1_spec</artifactId>
         <version>1.0.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>geronimo-jsp-2.1-api</artifactId>
         <version>1.2</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-activation_1.1_spec</artifactId>
         <version>1.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>geronimo-jaf-1.1-api</artifactId>
         <version>1.2</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_2.5_spec</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>servlet_2_5_api</artifactId>
         <version>2.5</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>geronimo-j2ee-management-1.0-api</artifactId>
         <version>1.0</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>com.thoughtworks.qdox</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.3</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.3</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>servlet-api</artifactId>
         <version>2.5</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>servlet_2_5_api</artifactId>
         <version>2.5</version>
      </jpp>
   </dependency>

<!--

-->
</dependencies>

--- NEW FILE: activemq4-web-console-pom.patch ---
--- activemq-web-console/pom.xml.sav	2008-09-04 11:40:04.000000000 +0200
+++ activemq-web-console/pom.xml	2008-09-04 11:40:55.000000000 +0200
@@ -130,6 +130,10 @@
       <artifactId>spring</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
@@ -206,4 +210,4 @@
   <properties>
     <jetty.port>8080</jetty.port>
   </properties>
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: activemq4-pom.patch ---
--- pom.xml.sav0	2008-04-11 00:03:51.000000000 +0200
+++ pom.xml	2008-09-04 11:42:04.000000000 +0200
@@ -33,7 +33,7 @@
   <description>ActiveMQ is a fast and powerful Message Broker which supports many Cross Language Clients and Protocols and many advanced features while fully supporting JMS 1.1 and J2EE 1.4.</description>
  
   <prerequisites>
-    <maven>2.0.8</maven>
+    <maven>2.0.7</maven>
   </prerequisites>
 
   <url>http://activemq.apache.org/</url>
@@ -327,6 +327,12 @@
       <!-- Optional Spring Support -->
       <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>2.0</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
         <version>2.0</version>
         <optional>true</optional>
@@ -913,7 +919,7 @@
             </goals>
             <configuration>
               <!-- Fail the build if no legal files were found -->
-              <strict>true</strict>
+              <strict>false</strict>
             </configuration>
           </execution>
         </executions>

--- NEW FILE: activemq4-web-pom.patch ---
--- activemq-web/pom.xml.sav5	2008-04-11 00:03:51.000000000 +0200
+++ activemq-web/pom.xml	2009-01-09 19:59:14.000000000 +0100
@@ -95,6 +95,11 @@
       <scope>test</scope>
     </dependency>
     
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+    </dependency>
+    
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>




More information about the JPackage-commits mailing list