[Jpackage-commits] rpms/free/xbean apache-3.pom, 1.2, NONE xbean-2.8-XBeanBeanDefinitionParserDelegate.patch, 1.1, NONE xbean-2.8-XBeanNamespaceHandler.patch, 1.1, NONE xbean-2.8-finder-pom.patch, 1.1, NONE xbean-2.8-pom.patch, 1.1, NONE xbean-2.8-spring-pom.patch, 1.1, NONE xbean-2.8-spring-v1-pom.patch, 1.1, NONE xbean-2.8-tiger-pom.patch, 1.1, NONE xbean-finder-pom.patch, NONE, 1.1 xbean-jpp-depmap.xml, 1.2, 1.3 xbean-site.patch, NONE, 1.1 xbean.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 7 23:52:06 CET 2010


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

Modified Files:
	xbean-jpp-depmap.xml xbean.spec 
Added Files:
	xbean-finder-pom.patch xbean-site.patch 
Removed Files:
	apache-3.pom xbean-2.8-XBeanBeanDefinitionParserDelegate.patch 
	xbean-2.8-XBeanNamespaceHandler.patch 
	xbean-2.8-finder-pom.patch xbean-2.8-pom.patch 
	xbean-2.8-spring-pom.patch xbean-2.8-spring-v1-pom.patch 
	xbean-2.8-tiger-pom.patch 
Log Message:
3.4.3-1.jpp6

--- xbean-2.8-spring-pom.patch DELETED ---

--- xbean-2.8-pom.patch DELETED ---

--- NEW FILE: xbean-finder-pom.patch ---
--- xbean-finder/pom.xml.sav	2010-12-07 14:13:57.000000000 +0100
+++ xbean-finder/pom.xml	2010-12-07 14:16:17.000000000 +0100
@@ -35,13 +35,13 @@
     
     <dependencies>
         <dependency>
-           <groupId>asm</groupId>
+           <groupId>org.objectweb.asm</groupId>
            <artifactId>asm</artifactId>
            <version>3.1</version>
            <scope>provided</scope>
         </dependency>
         <dependency>
-           <groupId>asm</groupId>
+           <groupId>org.objectweb.asm</groupId>
            <artifactId>asm-commons</artifactId>
            <version>3.1</version>
            <scope>provided</scope>

--- xbean-2.8-XBeanBeanDefinitionParserDelegate.patch DELETED ---

--- xbean-2.8-finder-pom.patch DELETED ---

--- xbean-2.8-tiger-pom.patch DELETED ---

--- xbean-2.8-spring-v1-pom.patch DELETED ---

--- apache-3.pom DELETED ---

Index: xbean-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xbean/xbean-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** xbean-jpp-depmap.xml	28 Mar 2008 19:09:27 -0000	1.2
--- xbean-jpp-depmap.xml	7 Dec 2010 22:52:04 -0000	1.3
***************
*** 15,30 ****
     <dependency>
        <maven>
-          <groupId>qdox</groupId>
-          <artifactId>qdox</artifactId>
-          <version>1.5</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>qdox</artifactId>
-          <version>1.5</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
           <groupId>backport-util-concurrent</groupId>
           <artifactId>backport-util-concurrent</artifactId>
--- 15,18 ----
***************
*** 141,149 ****
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>groovy-jsr</artifactId>
!          <version>1.0-jsr-03</version>
        </jpp>
     </dependency>
- -->
     <dependency>
        <maven>
--- 129,136 ----
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>groovy15</artifactId>
!          <version>1.5.6</version>
        </jpp>
     </dependency>
     <dependency>
        <maven>
***************
*** 208,211 ****
--- 195,210 ----
     <dependency>
        <maven>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jmx</artifactId>
+          <version>2.0.5</version>
+       </maven>
+       <jpp>
+          <groupId>JPP/spring2</groupId>
+          <artifactId>context</artifactId>
+          <version>2.5.5</version>
+       </jpp>
+    </dependency>
+    <dependency>
+       <maven>
           <groupId>cglib</groupId>
           <artifactId>cglib-nodep</artifactId>
***************
*** 244,271 ****
     <dependency>
        <maven>
-          <groupId>xstream</groupId>
-          <artifactId>xstream</artifactId>
-          <version>1.2</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>xstream</artifactId>
-          <version>1.2.2</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>radeox</groupId>
-          <artifactId>radeox-oro</artifactId>
-          <version>0.9</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>radeox</artifactId>
-          <version>0.9</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
           <groupId>radeox</groupId>
           <artifactId>radeox</artifactId>
--- 243,246 ----
***************
*** 280,295 ****
     <dependency>
        <maven>
-          <groupId>axion</groupId>
-          <artifactId>axion</artifactId>
-          <version>1.0-M3-dev</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>radeox</artifactId>
-          <version>1.0-M3-dev</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
           <groupId>idb</groupId>
           <artifactId>idb</artifactId>
--- 255,258 ----
***************
*** 328,331 ****
--- 291,318 ----
     <dependency>
        <maven>
+          <groupId>xpp3</groupId>
+          <artifactId>xpp3_min</artifactId>
+          <version>1.1.3.4.O</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>xpp3</artifactId>
+          <version>1.1.3.8</version>
+       </jpp>
+    </dependency>
+    <dependency>
+       <maven>
+          <groupId>xmlpull</groupId>
+          <artifactId>xmlpull</artifactId>
+          <version>1.1.3.1</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>xpp3</artifactId>
+          <version>1.1.3.8</version>
+       </jpp>
+    </dependency>
+    <dependency>
+       <maven>
           <groupId>javax.servlet</groupId>
           <artifactId>jsp-api</artifactId>
***************
*** 338,340 ****
--- 325,389 ----
        </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>velocity</groupId>
+          <artifactId>velocity</artifactId>
+          <version>1.4</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>velocity14</artifactId>
+          <version>1.4</version>
+       </jpp>
+    </dependency>
+ 
+    <dependency>
+       <maven>
+          <groupId>radeox</groupId>
+          <artifactId>radeox-oro</artifactId>
+          <version>0.9</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>radeox</artifactId>
+          <version>0.9</version>
+       </jpp>
+    </dependency>
+    <dependency>
+       <maven>
+          <groupId>xstream</groupId>
+          <artifactId>xstream</artifactId>
+          <version>1.2</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>xstream</artifactId>
+          <version>1.3.1</version>
+       </jpp>
+    </dependency>
+    <dependency>
+       <maven>
+          <groupId>axion</groupId>
+          <artifactId>axion</artifactId>
+          <version>1.0-M3-dev</version>
+       </maven>
+       <jpp>
+          <groupId>JPP</groupId>
+          <artifactId>radeox</artifactId>
+          <version>1.0-M3-dev</version>
+       </jpp>
+    </dependency>
  </dependencies>

--- NEW FILE: xbean-site.patch ---
--- src/site/site.xml.sav0	2006-10-31 09:57:20.000000000 +0100
+++ src/site/site.xml	2010-12-07 13:41:12.000000000 +0100
@@ -30,9 +30,9 @@
             <item name="Apache" href="http://apache.org/"/>
         </links>
         
-        ${modules}
+        <menu ref="modules"/>
         
-        ${reports}
+        <menu ref="reports"/>
         
     </body>
 

--- xbean-2.8-XBeanNamespaceHandler.patch DELETED ---

Index: xbean.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xbean/xbean.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** xbean.spec	28 Mar 2008 19:09:27 -0000	1.2
--- xbean.spec	7 Dec 2010 22:52:04 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 29,35 ****
  #
  
- %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
- %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
- 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
--- 29,32 ----
***************
*** 38,70 ****
  
  Name:           xbean
! Version:        2.8
! Release:        1jpp
  Epoch:          0
  Summary:        XBean plugin based server
  License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://geronimo.apache.org/xbean
! Source0:        xbean-2.8-src.tar.gz
! # svn export http://svn.apache.org/repos/asf/geronimo/xbean/tags/xbean-2.8/
  
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-settings.xml
! Source4:        apache-3.pom
! Source5:        xbean-2.8-autogenerated-files.tar.gz
! Patch0:         %{name}-2.8-pom.patch
! Patch1:         %{name}-2.8-XBeanNamespaceHandler.patch
! Patch2:         %{name}-2.8-XBeanBeanDefinitionParserDelegate.patch
! Patch3:         %{name}-2.8-spring-v1-pom.patch
! Patch4:         %{name}-2.8-spring-pom.patch
! Patch5:         %{name}-2.8-finder-pom.patch
! Patch6:         %{name}-2.8-tiger-pom.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.4
! BuildRequires:  java-devel = 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  cglib
- %if %{with_maven}
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
--- 35,60 ----
  
  Name:           xbean
! Version:        3.4.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        XBean plugin based server
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://geronimo.apache.org/xbean
! Source0:        xbean-3.4.3-src.tar.gz
! # svn export http://svn.apache.org/repos/asf/geronimo/xbean/tags/xbean-3.4.3/
  
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-settings.xml
! #Source4:        apache-3.pom
! #Source6:        apache-jar-resource-bundle-1.3.jar
! #Source7:        org.eclipse.osgi.jar
! Patch0:         %{name}-site.patch
! Patch1:         %{name}-finder-pom.patch
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  cglib
  BuildRequires:  maven2 >= 0:2.0.7
  BuildRequires:  maven2-plugin-ant
***************
*** 72,75 ****
--- 62,66 ----
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-gpg
+ BuildRequires:  maven2-plugin-idea
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
***************
*** 77,93 ****
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-pmd
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven-release
! BuildRequires:  mojo-maven2-plugin-dependency
! BuildRequires:  mojo-maven2-plugin-jxr
! %else
! BuildRequires:  maven2-bootstrap >= 0:2.0.7
! %endif
  
  BuildRequires:  backport-util-concurrent
! BuildRequires:  bea-stax-api
! BuildRequires:  groovy-jsr
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  junit
--- 68,88 ----
  BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven2-plugin-pmd
+ BuildRequires:  maven2-plugin-remote-resources
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven2-plugin-source
  BuildRequires:  maven2-plugin-surefire
  BuildRequires:  maven-release
! BuildRequires:  maven2-plugin-dependency
! BuildRequires:  maven-jxr
! BuildRequires:  apache-jar-resource-bundle
! BuildRequires:  felix-maven2
! BuildRequires:  geronimo-genesis
  
+ BuildRequires:  asm2
+ BuildRequires:  axion
  BuildRequires:  backport-util-concurrent
! BuildRequires:  stax_1_0_api
! BuildRequires:  groovy
! BuildRequires:  groovy15
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  junit
***************
*** 96,107 ****
  BuildRequires:  plexus-utils
  BuildRequires:  qdox
! BuildRequires:  spring-all
! BuildRequires:  spring2-all
  
  Requires:  java >= 0:1.5.0
  Requires:  ant >= 0:1.6.5
  Requires:  backport-util-concurrent
! Requires:  bea-stax-api
! Requires:  groovy-jsr
  Requires:  jakarta-commons-logging
  Requires:  junit
--- 91,108 ----
  BuildRequires:  plexus-utils
  BuildRequires:  qdox
! BuildRequires:  radeox
! BuildRequires:  spring2-beans
! BuildRequires:  spring2-context
! BuildRequires:  spring2-core
! BuildRequires:  spring2-web
! BuildRequires:  xpp3-minimal
! BuildRequires:  xstream
  
  Requires:  java >= 0:1.5.0
  Requires:  ant >= 0:1.6.5
+ Requires:  asm2
  Requires:  backport-util-concurrent
! Requires:  stax_1_0_api
! Requires:  groovy15
  Requires:  jakarta-commons-logging
  Requires:  junit
***************
*** 113,122 ****
  Requires:  spring2-all
  
! Requires(post):   jpackage-utils >= 0:1.7.4
! Requires(postun): jpackage-utils >= 0:1.7.4
! 
  
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:          java-gcj-compat-devel
  Requires(post):         java-gcj-compat
--- 114,121 ----
  Requires:  spring2-all
  
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  
  %if %{gcj_support}
  BuildRequires:          java-gcj-compat-devel
  Requires(post):         java-gcj-compat
***************
*** 141,170 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
- 
  %prep
! %setup -q -n %{name}-%{version}
  %patch0 -b .sav0
  %patch1 -b .sav1
- %patch2 -b .sav2
- %patch3 -b .sav3
- %patch4 -b .sav4
- %patch5 -b .sav5
- %patch6 -b .sav6
  
  cp %{SOURCE3} maven2-settings.xml
- %if %{without_maven}
- gzip -dc %{SOURCE5} | tar xf -
- %endif
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
- 
- %if %{with_maven}
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
--- 140,155 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  %{summary}.
  
  %prep
! %setup -q 
  %patch0 -b .sav0
  %patch1 -b .sav1
  
  cp %{SOURCE3} maven2-settings.xml
  
  %build
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
  sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
***************
*** 173,192 ****
  sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml
  
- mkdir -p m2_repo/repository/JPP/maven2/default_poms
- cp %{SOURCE4} m2_repo/repository/JPP/maven2/default_poms/org.apache-apache.pom
- cp pom.xml m2_repo/repository/JPP/maven2/default_poms/JPP.xbean-xbean.pom
- cp maven-xbean-plugin/pom.xml m2_repo/repository/JPP/maven2/default_poms/org.apache.xbean-maven-xbean-plugin.pom
- 
- mkdir -p m2_repo/repository/org.apache.xbean/
- ln -sf $(pwd)/m2_repo/repository/org/apache/xbean/xbean-spring-common/%{version}/xbean-spring-common-%{version}.jar \
-               m2_repo/repository/org.apache.xbean/xbean-spring-common.jar
- ln -sf $(pwd)/m2_repo/repository/org/apache/xbean/xbean-spring-v1/%{version}/xbean-spring-v1-%{version}.jar \
-               m2_repo/repository/org.apache.xbean/xbean-spring-v1.jar
- ln -sf $(pwd)/m2_repo/repository/org/apache/xbean/xbean-spring-v2/%{version}/xbean-spring-v2-%{version}.jar \
-               m2_repo/repository/org.apache.xbean/xbean-spring-v2.jar
- mkdir -p m2_repo/repository/org.apache.xbean/
- ln -sf $(pwd)/m2_repo/repository/org/apache/xbean/maven-xbean-plugin/%{version}/maven-xbean-plugin-%{version}.jar \
-               m2_repo/repository/org.apache.xbean/maven-xbean-plugin.jar
- 
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
--- 158,161 ----
***************
*** 199,344 ****
          -s $M2SETTINGS \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-         -Dmaven.test.failure.ignore=true \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          ant:ant install javadoc:javadoc
! %else
! #[INFO] Reactor build order:
! #[INFO]   XBean
! #[INFO]   XBean :: Spring :: Common
! #[INFO]   XBean :: Spring :: V2
! #[INFO]   XBean :: Spring :: V2C
! #[INFO]   XBean :: Spring :: V1
! #[INFO]   XBean :: Spring
! #[INFO]   Maven XBean Plugin
! #[INFO]   XBean :: Classloader
! #[INFO]   XBean :: ClassPath
! #[INFO]   XBean :: Classpath Resource Finder
! #[INFO]   XBean :: Kernel
! #[INFO]   XBean :: Naming
! #[INFO]   XBean :: Reflect
! #[INFO]   XBean :: Server
! #[INFO]   XBean :: Spring :: ITests
! #[INFO]   XBean :: Spring :: ITests :: Core
! #[INFO]   XBean :: Spring :: ITests :: 124
! #[INFO]   XBean :: Spring :: ITests :: 125
! #[INFO]   XBean :: Spring :: ITests :: 126
! #[INFO]   XBean :: Spring :: ITests :: 127
! #[INFO]   XBean :: Spring :: ITests :: 128
! #[INFO]   XBean :: Spring :: ITests :: 20m5
! #[INFO]   XBean :: Spring :: ITests :: 20rc1
! #[INFO]   XBean :: Spring :: ITests :: 20rc2
! #[INFO]   XBean :: Spring :: ITests :: 20rc3
! #[INFO]   XBean :: Spring :: ITests :: 20
! #[INFO]   XBean :: Telnet
! #[INFO]   XBean :: Tiger
! export CLASSPATH=$(build-classpath \
! backport-util-concurrent \
! commons-logging \
! mx4j/mx4j \
! spring2 \
! stax_1_0_api \
! qdox \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes:src/test/resources:target/test-generated
! pushd xbean-spring-common
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-common/target/xbean-spring-common-%{version}.jar
! pushd xbean-spring-v2
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2/target/xbean-spring-v2-%{version}.jar
! pushd xbean-spring-v2c
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2c/target/xbean-spring-v2c-%{version}.jar
! export CLASSPATH=$(build-classpath \
! backport-util-concurrent \
! commons-logging \
! mx4j/mx4j \
! spring \
! stax_1_0_api \
! qdox \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes:src/test/resources:target/test-generated
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-common/target/xbean-spring-common-%{version}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2/target/xbean-spring-v2-%{version}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2c/target/xbean-spring-v2c-%{version}.jar
! pushd xbean-spring-v1
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! export CLASSPATH=$(build-classpath \
! backport-util-concurrent \
! commons-logging \
! mx4j/mx4j \
! spring2 \
! stax_1_0_api \
! qdox \
! )
! CLASSPATH=$CLASSPATH:target/classes:target/test-classes:src/test/resources:target/test-generated
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-common/target/xbean-spring-common-%{version}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2/target/xbean-spring-v2-%{version}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v2c/target/xbean-spring-v2c-%{version}.jar
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring-v1/target/xbean-spring-v1-%{version}.jar
! pushd xbean-spring
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! #CLASSPATH=$CLASSPATH:$(pwd)/xbean-spring/target/xbean-spring-%{version}.jar
! CLASSPATH=$CLASSPATH:$(build-classpath \
! maven2/artifact \
! maven2/model \
! maven2/plugin-api \
! maven2/project \
! )
! pushd maven-xbean-plugin
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(build-classpath \
! cglib-nodep \
! )
! pushd xbean-classloader
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-classloader/target/xbean-classloader-%{version}.jar
! pushd xbean-classpath
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-classpath/target/xbean-classpath-%{version}.jar
! CLASSPATH=$CLASSPATH:$(build-classpath \
! asm2/asm \
! asm2/asm-commons \
! )
! pushd xbean-finder
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-finder/target/xbean-finder-%{version}.jar
! pushd xbean-kernel
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-kernel/target/xbean-kernel-%{version}.jar
! pushd xbean-naming
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-naming/target/xbean-naming-%{version}.jar
! pushd xbean-reflect
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-reflect/target/xbean-reflect-%{version}.jar
! pushd xbean-server
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-server/target/xbean-server-%{version}.jar
! CLASSPATH=$CLASSPATH:$(build-classpath \
! groovy-jsr-all \
! )
! pushd xbean-telnet
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-telnet/target/xbean-telnet-%{version}.jar
! pushd xbean-tiger
!     ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
! popd
! CLASSPATH=$CLASSPATH:$(pwd)/xbean-tiger/target/xbean-tiger-%{version}.jar
! %endif
  
  %install
--- 168,176 ----
          -s $M2SETTINGS \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+         -Daggregate=true \
+         -Dmaven.test.failure.ignore=true \
          ant:ant install javadoc:javadoc
! 
  
  %install
***************
*** 346,386 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -pm 644 maven-%{name}-plugin/target/maven-%{name}-plugin-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-%{name}-plugin-%{version}.jar
! install -pm 644 %{name}-classloader/target/%{name}-classloader-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classloader-%{version}.jar
! install -pm 644 %{name}-classloader/target/alternate.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classloader-alternate-%{version}.jar
! install -pm 644 %{name}-classpath/target/%{name}-classpath-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classpath-%{version}.jar
! install -pm 644 %{name}-finder/target/%{name}-finder-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-finder-%{version}.jar
! install -pm 644 %{name}-kernel/target/%{name}-kernel-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-kernel-%{version}.jar
! #install -pm 644 %{name}-osgi/target/%{name}-osgi-%{version}.jar \
! #  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-osgi-%{version}.jar
! install -pm 644 %{name}-naming/target/%{name}-naming-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-naming-%{version}.jar
! install -pm 644 %{name}-reflect/target/%{name}-reflect-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-reflect-%{version}.jar
! install -pm 644 %{name}-server/target/%{name}-server-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-server-%{version}.jar
! 
! install -pm 644 %{name}-spring-common/target/%{name}-spring-common-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-spring-common-%{version}.jar
! install -pm 644 %{name}-spring/target/%{name}-spring-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-spring-%{version}.jar
! install -pm 644 %{name}-spring-v1/target/%{name}-spring-v1-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-spring-v1-%{version}.jar
! install -pm 644 %{name}-spring-v2/target/%{name}-spring-v2-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-spring-v2-%{version}.jar
! 
! install -pm 644 %{name}-telnet/target/%{name}-telnet-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-telnet-%{version}.jar
- install -pm 644 %{name}-tiger/target/%{name}-tiger-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-tiger-%{version}.jar
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  (cd ${RPM_BUILD_ROOT}%{_datadir}/maven2/plugins && ln -sf %{_javadir}/%{name}/maven-%{name}-plugin-%{version}.jar maven-%{name}-plugin.jar)
  
--- 178,203 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
! install -m 644 maven-%{name}-plugin/target/maven-%{name}-plugin-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-%{name}-plugin-%{version}.jar
! install -m 644 %{name}-classloader/target/%{name}-classloader-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classloader-%{version}.jar
! install -m 644 %{name}-classloader/target/alternate.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classloader-alternate-%{version}.jar
! install -m 644 %{name}-classpath/target/%{name}-classpath-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-classpath-%{version}.jar
! install -m 644 %{name}-finder/target/%{name}-finder-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-finder-%{version}.jar
! install -m 644 %{name}-naming/target/%{name}-naming-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-naming-%{version}.jar
! install -m 644 %{name}-reflect/target/%{name}-reflect-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-reflect-%{version}.jar
! install -m 644 %{name}-spring/target/%{name}-spring-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-spring-%{version}.jar
! install -m 644 %{name}-telnet/target/%{name}-telnet-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-telnet-%{version}.jar
  
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/plugins
  (cd ${RPM_BUILD_ROOT}%{_datadir}/maven2/plugins && ln -sf %{_javadir}/%{name}/maven-%{name}-plugin-%{version}.jar maven-%{name}-plugin.jar)
  
***************
*** 402,411 ****
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-finder.pom
  %add_to_maven_depmap org.apache.xbean %{name}-finder %{version} JPP/%{name} %{name}-finder
- cp %{name}-kernel/pom.xml \
-     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-kernel.pom
- %add_to_maven_depmap org.apache.xbean %{name}-kernel %{version} JPP/%{name} %{name}-kernel
- #cp %{name}-osgi/pom.xml \
- #    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-osgi.pom
- #%add_to_maven_depmap org.apache.xbean %{name}-osgi %{version} JPP/%{name} %{name}-osgi
  cp %{name}-naming/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-naming.pom
--- 219,222 ----
***************
*** 413,474 ****
  cp %{name}-reflect/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-reflect.pom
! %add_to_maven_depmap org.apache.reflect %{name}-naming %{version} JPP/%{name} %{name}-reflect
! cp %{name}-server/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-server.pom
! %add_to_maven_depmap org.apache.server %{name}-naming %{version} JPP/%{name} %{name}-server
! cp %{name}-spring-common/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-spring-common.pom
! %add_to_maven_depmap org.apache.server %{name}-spring-common %{version} JPP/%{name} %{name}-spring-common
  cp %{name}-spring/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-spring.pom
! %add_to_maven_depmap org.apache.server %{name}-spring %{version} JPP/%{name} %{name}-spring
! cp %{name}-spring-v1/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-spring-v1.pom
! %add_to_maven_depmap org.apache.server %{name}-spring-v1 %{version} JPP/%{name} %{name}-spring-v1
! cp %{name}-spring-v2/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-spring-v2.pom
! %add_to_maven_depmap org.apache.server %{name}-spring-v2 %{version} JPP/%{name} %{name}-spring-v2
  cp %{name}-telnet/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-telnet.pom
! %add_to_maven_depmap org.apache.server %{name}-telnet %{version} JPP/%{name} %{name}-telnet
! cp %{name}-tiger/pom.xml \
!     $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-tiger.pom
! %add_to_maven_depmap org.apache.server %{name}-tiger %{version} JPP/%{name} %{name}-tiger
! 
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/maven-%{name}-plugin
! cp -pr maven-%{name}-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/maven-%{name}-plugin
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/classloader
! cp -pr %{name}-classloader/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/classloader
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/classpath
! cp -pr %{name}-classpath/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/classpath
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/finder
! cp -pr %{name}-finder/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/finder
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/kernel
! cp -pr %{name}-kernel/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/kernel
! #install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/osgi
! #cp -pr %{name}-osgi/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/osgi
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/naming
! cp -pr %{name}-naming/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/naming
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/reflect
! cp -pr %{name}-reflect/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/reflect
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/server
! cp -pr %{name}-server/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/server
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-common
! cp -pr %{name}-spring-common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-common
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-v1
! cp -pr %{name}-spring-v1/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-v1
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-v2
! cp -pr %{name}-spring-v2/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/spring-v2
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/telnet
! cp -pr %{name}-telnet/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/telnet
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tiger
! cp -pr %{name}-tiger/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/tiger
  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
--- 224,241 ----
  cp %{name}-reflect/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-reflect.pom
! %add_to_maven_depmap org.apache.xbean %{name}-reflect %{version} JPP/%{name} %{name}-reflect
  cp %{name}-spring/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-spring.pom
! %add_to_maven_depmap org.apache.xbean %{name}-spring %{version} JPP/%{name} %{name}-spring
  cp %{name}-telnet/pom.xml \
      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-telnet.pom
! %add_to_maven_depmap org.apache.xbean %{name}-telnet %{version} JPP/%{name} %{name}-telnet
  
  # 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}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 477,489 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 244,247 ----
***************
*** 507,513 ****
  %defattr(-,root,root,-)
  %doc LICENSE.txt
! %{_javadir}/*
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 265,273 ----
  %defattr(-,root,root,-)
  %doc LICENSE.txt
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*.jar
! %{_datadir}/maven2/plugins/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 518,524 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Mar 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:2.8-1jpp
  - 2.8
--- 278,298 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> - 0:3.4.3-1
+ - 3.4.3 for JPP-6
+ 
+ * Wed Apr 01 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.3-2.jpp5
+ - switch from groovy-jsr to groovy15
+ - enable install of xbean-osgi
+ 
+ * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.3-1.jpp5
+ - 3.3
+ - Drop no-maven build (bundles required)
+ 
+ * Thu Aug 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:2.8-2.jpp5
+ - Fix depmap frags
+ 
  * Fri Mar 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:2.8-1jpp
  - 2.8




More information about the JPackage-commits mailing list