Enable xbean-blueprint and xbean-classloader modules

xbean.spec

@@ -9,7 +9,7 @@ Name:           xbean
 Version:        3.12
 BuildArch:      noarch
 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java plugin based web server
 
 Group:          Development/Libraries
@@ -48,6 +48,14 @@ BuildRequires:  eclipse-rcp
 BuildRequires:  felix-framework
 %endif
 %if %{with spring}
+BuildRequires:  apache-commons-jexl
+BuildRequires:  aries-blueprint
+# test deps BuildRequires:  cglib
+BuildRequires:  felix-osgi-compendium
+BuildRequires:  felix-osgi-core
+BuildRequires:  geronimo-annotation
+BuildRequires:  pax-logging
+
 BuildRequires:  maven-archiver
 BuildRequires:  maven-plugin-plugin
 BuildRequires:  maven-project
@@ -80,6 +88,27 @@ lifecycle and class loader management, and a rock solid Spring
 integration.
 
 %if %{with spring}
+%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}
@@ -127,14 +156,14 @@ 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 %{without spring}
    %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
 %endif
@@ -154,9 +183,14 @@ rm src/site/site.xml
 sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
     xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
 
+# disable copy of internal aries-blueprint
+sed -i "s|<Private-Package>|<!--Private-Package>|" xbean-blueprint/pom.xml
+sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
+
 # 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>|" {} \;
 
 %build
 mvn-rpmbuild -e \
@@ -184,10 +218,11 @@ for sub in bundleutils classpath finder naming reflect; do
 done
 
 %if %{with spring}
-   # xbean-spring
+   for m in blueprint classloader spring; do
-   install -m 644 %{name}-spring/target/%{name}-spring-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-spring.jar
+       install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-${m}.jar;
-   install -pm 644 %{name}-spring/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-spring.pom
+       install -pm 644 %{name}-${m}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-   %add_maven_depmap JPP.%{name}-%{name}-spring.pom %{name}/%{name}-spring.jar -f spring
+       %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
@@ -215,6 +250,18 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}
 
 %if %{with spring}
+%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
@@ -233,6 +280,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 16 2012 gil cattaneo <puntogil@libero.it> - 3.12-2
+- Enable xbean-blueprint and xbean-classloader modules
+
 * Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-1
 - Update to upstream version 3.12