Attachment 605903 Details for Bug 849955 – Enable xbean-blueprint and xbean-classloader modules

[patch] Enable xbean-blueprint and xbean-classloader modules

0001-Enable-xbean-blueprint-and-xbean-classloader-modules.patch (text/plain), 5.69 KB, created by gil cattaneo on 2012-08-21 10:11:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-08-21 10:11:10 UTC

Size: 5.69 KB

patch

obsolete

>From 6cfca917c2689dedcd1ef3fb0ca98998e6cda251 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 21 Aug 2012 12:05:48 +0200
>Subject: [PATCH] Enable xbean-blueprint and xbean-classloader modules
>
>---
> xbean.spec |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 58 insertions(+), 9 deletions(-)
>
>diff --git a/xbean.spec b/xbean.spec
>index 926dc29..1d74e89 100644
>--- a/xbean.spec
>+++ b/xbean.spec
>@@ -2,7 +2,7 @@ Name:           xbean
> Version:        3.11.1
> BuildArch:      noarch
> 
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Java plugin based web server
> 
> Group:          Development/Libraries
>@@ -36,6 +36,13 @@ BuildRequires:  maven-surefire-plugin
> BuildRequires:  maven-site-plugin
> BuildRequires:  maven-shade-plugin
> %if !0%{?rhel:1}
>+BuildRequires:  apache-commons-jexl
>+BuildRequires:  aries-blueprint
>+# BuildRequires:  cglib
>+BuildRequires:  felix-osgi-compendium
>+BuildRequires:  geronimo-annotation
>+BuildRequires:  pax-logging
>+
> BuildRequires:  eclipse-rcp
> BuildRequires:  maven-archiver
> BuildRequires:  maven-plugin-plugin
>@@ -67,6 +74,27 @@ lifecycle and class loader management, and a rock solid Spring
> integration.
> 
> %if !0%{?rhel:1}
>+%package        blueprint
>+Summary:        Schema-driven namespace handler for Apache Aries Blueprint
>+Requires:       %{name} = %{version}-%{release}
>+Requires:       apache-commons-jexl
>+Requires:       aries-blueprint
>+Requires:       felix-osgi-compendium
>+Requires:       geronimo-annotation
>+Requires:       pax-logging
>+
>+%description    blueprint
>+This package provides %{summary}.
>+
>+%package        classloader
>+Summary:        A flexibie multi-parent classloader
>+# maven-xbean-plugin
>+Requires:       %{name} = %{version}-%{release}
>+Requires:       springframework-beans
>+
>+%description    classloader
>+This package provides %{summary}.
>+
> %package        spring
> Summary:        Schema-driven namespace handler for spring contexts
> Requires:       %{name} = %{version}-%{release}
>@@ -114,18 +142,22 @@ rm src/site/site.xml
> 
> # These aren't needed for now
> %pom_disable_module xbean-asm-shaded
>-%pom_disable_module xbean-blueprint
>-%pom_disable_module xbean-classloader
> %pom_disable_module xbean-finder-shaded
> %pom_disable_module xbean-telnet
> 
> # Prevent modules depending on springframework from building.
> if [ %{?rhel} ]; then
>    %pom_remove_dep org.springframework:
>+   %pom_disable_module xbean-blueprint
>+   %pom_disable_module xbean-classloader
>    %pom_disable_module xbean-spring
>    %pom_disable_module maven-xbean-plugin
> fi
> 
>+# disable copy of internal aries-blueprint
>+sed -i "s|<Private-Package>||" xbean-blueprint/pom.xml
>+
> %pom_add_plugin :maven-compiler-plugin . "
>     <configuration>
>       <source>1.5</source>
>@@ -149,6 +181,8 @@ sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
> 
> # Fix ant groupId
> find -name pom.xml -exec sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|" {} \;
>+# Fix cglib artifactId
>+find -name pom.xml -exec sed -i "s|<artifactId>cglib-nodep</artifactId>|<artifactId>cglib</artifactId>|" {} \;
> 
> # Do not build equinox specific part for rhel.
> if [ %{?rhel} ]; then
>@@ -157,14 +191,13 @@ if [ %{?rhel} ]; then
>    sed -i "s|<artifactId>osgi|<artifactId>org.apache.felix.framework|g" xbean-bundleutils/pom.xml
> fi
> 
>-
> %build
>+
> mvn-rpmbuild -e \
>         -Dmaven.local.depmap.file="%{SOURCE1}" \
>         -Dmaven.test.skip=true \
>         install javadoc:aggregate
> 
>-
> %install
> install -dm 755 $RPM_BUILD_ROOT/%{_javadir}/%{name}
> install -dm 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
>@@ -182,10 +215,11 @@ for sub in bundleutils classpath finder naming reflect; do
> done
> 
> if [ %{?fedora} ]; then
>-   # xbean-spring
>-   install -m 644 %{name}-spring/target/%{name}-spring-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-spring.jar
>-   install -pm 644 %{name}-spring/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-spring.pom
>-   %add_maven_depmap JPP.%{name}-%{name}-spring.pom %{name}/%{name}-spring.jar -f spring
>+   for m in blueprint classloader spring; do
>+       install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-${m}.jar;
>+       install -pm 644 %{name}-${m}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
>+       %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar -f ${m}
>+   done
>    # maven-xbean-plugin
>    install -m 644 maven-%{name}-plugin/target/maven-%{name}-plugin-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/maven-%{name}-plugin.jar
>    install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-maven-%{name}-plugin.pom
>@@ -213,6 +247,18 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %{_mavendepmapfragdir}/%{name}
> 
> %if !0%{?rhel:1}
>+%files blueprint
>+%doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd*
>+%{_javadir}/%{name}/%{name}-blueprint.jar
>+%{_mavenpomdir}/JPP.%{name}-%{name}-blueprint.pom
>+%{_mavendepmapfragdir}/%{name}-blueprint
>+
>+%files classloader
>+%doc LICENSE NOTICE
>+%{_javadir}/%{name}/%{name}-classloader.jar
>+%{_mavenpomdir}/JPP.%{name}-%{name}-classloader.pom
>+%{_mavendepmapfragdir}/%{name}-classloader
>+
> %files spring
> %doc LICENSE NOTICE
> %{_javadir}/%{name}/%{name}-spring.jar
>@@ -231,6 +277,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Aug 21 2012 gil cattaneo <puntogil@libero.it> - 3.11.1-4
>+- Enable xbean-blueprint and xbean-classloader modules
>+
> * Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-3
> - Enable xbean-spring
> - Enable maven-xbean-plugin
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 849955: 605903 | 627953