[Jpackage-commits] dist/jbossas/JPP-6 .cvsignore, 1.7, 1.8 jbossas-4.2.3-ant17.patch, 1.1, NONE jbossas-4.2.3-compute_jar_signature, 1.1, NONE jbossas-4.2.3-glassfish.patch, 1.2, NONE jbossas-4.2.3-jarmap, 1.6, NONE jbossas-4.2.3-no-faces-logger.patch, 1.1, NONE jbossas-4.2.3-no-pluggable-instrumentor.patch, 1.1, NONE jbossas-4.2.3-thirdparty-versions.patch, 1.3, NONE jbossas-4.2.3-version-release-maxmemory.patch, 1.1, NONE jbossas-5.0.0-componentmap, 1.7, 1.8 jbossas-5.0.0-jarmap, 1.3, 1.4 jbossas-5.0.0-thirdparty-versions.patch, 1.3, 1.4 jbossas-buildziponly.patch, 1.2, 1.3 jbossas-version-release-maxmemory.patch, NONE, 1.1 jbossas.spec, 1.53, 1.54 sources, 1.11, 1.12

David Walluck david at ryu.zarb.org
Wed Feb 11 17:04:09 CET 2009


Update of /home/projects/jpackage/cvs/dist/jbossas/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv12082

Modified Files:
	.cvsignore jbossas-5.0.0-componentmap jbossas-5.0.0-jarmap 
	jbossas-5.0.0-thirdparty-versions.patch 
	jbossas-buildziponly.patch jbossas.spec sources 
Added Files:
	jbossas-version-release-maxmemory.patch 
Removed Files:
	jbossas-4.2.3-ant17.patch jbossas-4.2.3-compute_jar_signature 
	jbossas-4.2.3-glassfish.patch jbossas-4.2.3-jarmap 
	jbossas-4.2.3-no-faces-logger.patch 
	jbossas-4.2.3-no-pluggable-instrumentor.patch 
	jbossas-4.2.3-thirdparty-versions.patch 
	jbossas-4.2.3-version-release-maxmemory.patch 
Log Message:
- add external facelets, jboss-common-core, jboss-common-logging-jdk,
  jboss-common-logging-log4j, jboss-common-logging-spi, slf4j, stax-ex,
  sun-mimepull
- update glassfish-jaxb from 2.1.4 to 2.1.9
- rediff jbossas-buildziponly.patch and
  jbossas-version-release-maxmemory.patch and remove others (unused)
- some changes to the jar checksum file creation


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** .cvsignore	8 Jan 2009 23:03:27 -0000	1.7
--- .cvsignore	11 Feb 2009 16:04:06 -0000	1.8
***************
*** 1,2 ****
- jbossas-5.0.0.GA-tp.tar.bz2
  jboss-5.0.0.GA-src.tar.bz2
--- 1,2 ----
  jboss-5.0.0.GA-src.tar.bz2
+ jbossas-5.0.0.GA-tp.tar.bz2

--- NEW FILE: jbossas-version-release-maxmemory.patch ---
--- build/build-release.xml.orig	2007-12-21 10:53:33.000000000 -0500
+++ build/build-release.xml	2009-02-10 19:46:57.479656227 -0500
@@ -162,7 +162,7 @@
          <include name="VersionRelease.java"/>
       </javac>
       <echo message="Versioning: jboss-${version}"/>
-      <java classname="VersionRelease">
+      <java classname="VersionRelease" fork="true" maxmemory="2g">
          <arg value="${jboss.dist}"/>
          <classpath>
             <pathelement location="."/>

--- jbossas-4.2.3-no-faces-logger.patch DELETED ---

Index: jbossas.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -C 2 -d -r1.53 -r1.54
*** jbossas.spec	3 Feb 2009 17:02:49 -0000	1.53
--- jbossas.spec	11 Feb 2009 16:04:06 -0000	1.54
***************
*** 39,48 ****
  Source99:       jbossas-%{version}-compute_jar_signature
  Patch0:         jbossas-buildziponly.patch
- Patch1:         jbossas-4.2.3-ant17.patch
- Patch2:         jbossas-4.2.3-no-pluggable-instrumentor.patch
- Patch3:         jbossas-4.2.3-no-faces-logger.patch
- Patch4:         jbossas-4.2.3-glassfish.patch
  Patch5:         jbossas-5.0.0-thirdparty-versions.patch
! Patch6:         jbossas-4.2.3-version-release-maxmemory.patch
  Requires:       antlr >= 0:2.7.6
  Requires:       aopalliance >= 0:1.0
--- 39,44 ----
  Source99:       jbossas-%{version}-compute_jar_signature
  Patch0:         jbossas-buildziponly.patch
  Patch5:         jbossas-5.0.0-thirdparty-versions.patch
! Patch6:         jbossas-version-release-maxmemory.patch
  Requires:       antlr >= 0:2.7.6
  Requires:       aopalliance >= 0:1.0
***************
*** 60,64 ****
  Requires:       glassfish-jaf = 0:1.1.0
  Requires:       glassfish-javamail = 0:1.4.0
! Requires:       glassfish-jaxb >= 0:2.1.4
  Requires:       glassfish-jaxws >= 0:2.1.1
  Requires:       glassfish-jsf >= 0:1.2_08
--- 56,60 ----
  Requires:       glassfish-jaf = 0:1.1.0
  Requires:       glassfish-javamail = 0:1.4.0
! Requires:       glassfish-jaxb >= 0:2.1.9
  Requires:       glassfish-jaxws >= 0:2.1.1
  Requires:       glassfish-jsf >= 0:1.2_08
***************
*** 86,90 ****
  Requires:       jboss-aop >= 0:1.5.6-1
  Requires:       jboss-cache >= 0:1.4.1-4.SP9
! Requires:       jboss-common >= 0:1.2.1
  Requires:       jboss-jaxr >= 0:1.2.0-1.SP1
  Requires:       jboss-microcontainer >= 1:1.0.2
--- 82,89 ----
  Requires:       jboss-aop >= 0:1.5.6-1
  Requires:       jboss-cache >= 0:1.4.1-4.SP9
! Requires:       jboss-common-core >= 0:2.2.10
! Requires:       jboss-common-logging-jdk >= 0:2.0.5
! Requires:       jboss-common-logging-log4j >= 0:2.0.5
! Requires:       jboss-common-logging-spi >= 0:2.0.5
  Requires:       jboss-jaxr >= 0:1.2.0-1.SP1
  Requires:       jboss-microcontainer >= 1:1.0.2
***************
*** 106,109 ****
--- 105,109 ----
  Requires:       log4j >= 0:1.2.14
  Requires:       quartz >= 0:1.5.2
+ Requires:       slf4j >= 0:1.5.6
  Requires:       snmptrapappender >= 0:1.2.8
  Requires:       sun-fi >= 0:1.2.2
***************
*** 147,150 ****
--- 147,152 ----
  BuildRequires:  excalibur-avalon-logkit >= 1:2.2.1
  BuildRequires:  excalibur-avalon-logkit-repolib = 1:2.2.1
+ BuildRequires:  facelets >= 0:1.1.15
+ BuildRequires:  facelets-repolib = 0:1.1.15
  BuildRequires:  findutils
  BuildRequires:  gawk
***************
*** 153,162 ****
  BuildRequires:  glassfish-javamail = 0:1.4.0
  BuildRequires:  glassfish-javamail-repolib = 0:1.4.0
! BuildRequires:  glassfish-jaxb >= 0:2.1.4
! BuildRequires:  glassfish-jaxb-repolib >= 0:2.1.4
  BuildRequires:  glassfish-jaxws >= 0:2.1.1
! BuildRequires:  glassfish-jaxws-repolib >= 0:2.1.1
! BuildRequires:  glassfish-jsf >= 0:1.2_08
! BuildRequires:  glassfish-jsf-repolib >= 0:1.2_08
  BuildRequires:  glassfish-jstl = 0:1.2.0
  BuildRequires:  glassfish-jstl-repolib = 0:1.2.0
--- 155,164 ----
  BuildRequires:  glassfish-javamail = 0:1.4.0
  BuildRequires:  glassfish-javamail-repolib = 0:1.4.0
! BuildRequires:  glassfish-jaxb >= 0:2.1.9
! BuildRequires:  glassfish-jaxb-repolib = 0:2.1.9
  BuildRequires:  glassfish-jaxws >= 0:2.1.1
! BuildRequires:  glassfish-jaxws-repolib = 0:2.1.1
! BuildRequires:  glassfish-jsf >= 0:1.2_09
! BuildRequires:  glassfish-jsf-repolib = 0:1.2_09
  BuildRequires:  glassfish-jstl = 0:1.2.0
  BuildRequires:  glassfish-jstl-repolib = 0:1.2.0
***************
*** 216,221 ****
  BuildRequires:  jboss-cache >= 0:1.4.1-4.SP9
  BuildRequires:  jboss-cache-repolib >= 0:1.4.1-4.SP9
! BuildRequires:  jboss-common >= 0:1.2.1
! BuildRequires:  jboss-common-repolib = 0:1.2.1
  BuildRequires:  jboss-jaxr >= 0:1.2.0-1.SP1
  BuildRequires:  jboss-jaxr-repolib >= 0:1.2.0-1.SP1
--- 218,229 ----
  BuildRequires:  jboss-cache >= 0:1.4.1-4.SP9
  BuildRequires:  jboss-cache-repolib >= 0:1.4.1-4.SP9
! BuildRequires:  jboss-common-core >= 0:2.2.10
! BuildRequires:  jboss-common-core-repolib = 0:2.2.10
! BuildRequires:  jboss-common-logging-jdk >= 0:2.0.5
! BuildRequires:  jboss-common-logging-jdk-repolib = 0:2.0.5
! BuildRequires:  jboss-common-logging-log4j >= 0:2.0.5
! BuildRequires:  jboss-common-logging-log4j-repolib = 0:2.0.5
! BuildRequires:  jboss-common-logging-spi >= 0:2.0.5
! BuildRequires:  jboss-common-logging-spi-repolib = 0:2.0.5
  BuildRequires:  jboss-jaxr >= 0:1.2.0-1.SP1
  BuildRequires:  jboss-jaxr-repolib >= 0:1.2.0-1.SP1
***************
*** 278,285 ****
--- 286,297 ----
  BuildRequires:  servletapi6 >= 0:6.0.18
  BuildRequires:  servletapi6-repolib >= 0:6.0.18
+ BuildRequires:  slf4j >= 0:1.5.6
+ BuildRequires:  slf4j-repolib >= 0:1.5.6
  BuildRequires:  snmptrapappender >= 0:1.2.8
  BuildRequires:  snmptrapappender-repolib = 0:1.2.8
  BuildRequires:  sun-fi >= 0:1.2.2
  BuildRequires:  sun-fi-repolib >= 0:1.2.2
+ BuildRequires:  sun-mimepull >= 0:1.2
+ BuildRequires:  sun-mimepull-repolib = 0:1.2
  BuildRequires:  unzip
  BuildRequires:  velocity-jboss >= 0:1.4
***************
*** 336,348 ****
  %setup -q -T -D -n jboss-%{jbver}-src
  cp -p %{jbver}/jboss-%{version_major}.%{version_minor}.x/build/build-release.xml .
! #%%patch0 -p0
  pushd %{jbver}/jboss-%{version_major}.%{version_minor}.x
- #%%patch1 -p0
- #%%patch2 -p0
- #%%patch3 -p0
- #%%patch4 -p0
  %patch5 -p0 -b .thirdparty-versions
  #exit 1
! #%%patch6 -p0
  popd
  
--- 348,356 ----
  %setup -q -T -D -n jboss-%{jbver}-src
  cp -p %{jbver}/jboss-%{version_major}.%{version_minor}.x/build/build-release.xml .
! %patch0 -p0
  pushd %{jbver}/jboss-%{version_major}.%{version_minor}.x
  %patch5 -p0 -b .thirdparty-versions
  #exit 1
! %patch6 -p0
  popd
  
***************
*** 375,379 ****
      version=`echo $i | cut -d ' ' -f 2`
      
!     if [ -d ${name} ]; then
          echo ${name} should be removed from the tp tarball
          exit 1
--- 383,387 ----
      version=`echo $i | cut -d ' ' -f 2`
      
!     if [ -f ${name}/component-info.xml ]; then
          echo ${name} should be removed from the tp tarball
          exit 1
***************
*** 384,388 ****
  
      # Add the checksums from that jar into the checksum file
!     for i in `find ${name}/ -type f -name "*.?ar" | sort`; do
          /bin/sh %{SOURCE99} $i >> %{rlibcsfile}
      done
--- 392,396 ----
  
      # Add the checksums from that jar into the checksum file
!     for i in `find ${name}/lib/ -type f -name "*.?ar" | sort`; do
          /bin/sh %{SOURCE99} $i >> %{rlibcsfile}
      done

Index: jbossas-5.0.0-componentmap
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas-5.0.0-componentmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** jbossas-5.0.0-componentmap	3 Feb 2009 17:02:49 -0000	1.7
--- jbossas-5.0.0-componentmap	11 Feb 2009 16:04:06 -0000	1.8
***************
*** 27,30 ****
--- 27,31 ----
  commons-el 1.0-brew
  commons-io 1.4-brew
+ com/sun/facelets 1.1.15-brew
  dom4j 1.6.1-brew
  easymock 1.2-brew
***************
*** 39,42 ****
--- 40,47 ----
  javassist 3.9.0.GA-brew
  jaxen 1.1-brew
+ jboss/common-core 2.2.10.GA-brew
+ jboss/common-logging-jdk 2.0.5.GA-brew
+ jboss/common-logging-log4j 2.0.5.GA-brew
+ jboss/common-logging-spi 2.0.5.GA-brew
  jboss/jaxbintros 1.0.0.GA-brew
  jfreechart 1.0.9-brew
***************
*** 48,51 ****
--- 53,58 ----
  odmg 3.0-brew
  org/codehaus/jettison 1.0.1-brew
+ org/jvnet 1.2-brew
+ org/slf4j 1.5.6-brew
  oswego-concurrent 1.3.4.patch01-brew
  qdox 1.6.1-brew
***************
*** 55,59 ****
  sun-fi 1.2.2-brew
  sun-javacc 4.0-brew
! sun-jaxb 2.1.4-brew
  sun-jaxws 2.1.1-brew
  trove 1.0.2-brew
--- 62,66 ----
  sun-fi 1.2.2-brew
  sun-javacc 4.0-brew
! sun-jaxb 2.1.9-brew
  sun-jaxws 2.1.1-brew
  trove 1.0.2-brew

Index: jbossas-5.0.0-thirdparty-versions.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas-5.0.0-thirdparty-versions.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** jbossas-5.0.0-thirdparty-versions.patch	3 Feb 2009 17:02:49 -0000	1.3
--- jbossas-5.0.0-thirdparty-versions.patch	11 Feb 2009 16:04:06 -0000	1.4
***************
*** 66,70 ****
   <path id="sun.jstl.classpath">
  --- component-matrix/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
! +++ component-matrix/pom.xml	2009-02-03 11:11:33.218260612 -0500
  @@ -28,7 +28,7 @@
   
--- 66,70 ----
   <path id="sun.jstl.classpath">
  --- component-matrix/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
! +++ component-matrix/pom.xml	2009-02-10 16:40:49.138658020 -0500
  @@ -28,7 +28,7 @@
   
***************
*** 76,79 ****
--- 76,88 ----
       <version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
       <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
+ @@ -50,7 +50,7 @@
+      <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
+      <version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
+      <version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
+ -    <version.org.jboss.common.core>2.2.10.GA</version.org.jboss.common.core>
+ +    <version.org.jboss.common.core>2.2.10.GA-brew</version.org.jboss.common.core>
+      <version.org.jboss.ejb3>1.0.0-Beta10</version.org.jboss.ejb3>
+      <version.org.jboss.ejb3.common.client>1.0.0-Beta3</version.org.jboss.ejb3.common.client>
+      <version.org.jboss.ejb3.core.client>1.0.0-Beta10</version.org.jboss.ejb3.core.client>
  @@ -76,12 +76,12 @@
       <version.org.jboss.naming>5.0.0.SP1</version.org.jboss.naming>
***************
*** 321,324 ****
--- 330,342 ----
         
         <dependency>
+ @@ -568,7 +568,7 @@
+        <dependency>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+ -        <version>2.0.5.GA</version>
+ +        <version>2.0.5.GA-brew</version>
+        </dependency>  
+        
+        <dependency>
  @@ -976,13 +976,13 @@
         <dependency>
***************
*** 382,386 ****
         
         <dependency>
! @@ -1072,13 +1072,13 @@
         <dependency>
           <groupId>org.beanshell</groupId>
--- 400,404 ----
         
         <dependency>
! @@ -1072,19 +1072,19 @@
         <dependency>
           <groupId>org.beanshell</groupId>
***************
*** 398,401 ****
--- 416,426 ----
         
         <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+ -        <version>1.5.0</version>
+ +        <version>1.5.6-brew</version>
+        </dependency>
+        
+        <dependency>
  @@ -1188,7 +1188,7 @@
         <dependency>

Index: jbossas-buildziponly.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas-buildziponly.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jbossas-buildziponly.patch	13 Aug 2008 20:44:46 -0000	1.2
--- jbossas-buildziponly.patch	11 Feb 2009 16:04:06 -0000	1.3
***************
*** 1,14 ****
! --- build-release.xml.full	2007-01-05 17:45:10.000000000 -0500
! +++ build-release.xml	2007-01-05 17:45:32.000000000 -0500
! @@ -189,7 +189,7 @@
      </target>
   
      <target name="release"
! -      depends="bundle-docs, bin-tgz, bin-zip, source-tgz, repository-zip, repository-jars-zip"
! +      depends="bundle-docs, bin-zip, repository-zip, repository-jars-zip"
         description="Creates the release binary and source archives from the dist"
         >
         <!-- Build a war of the release DTDs -->
! @@ -266,6 +266,7 @@
   
      <target name="bin-zip" description="Build zip archive">
--- 1,14 ----
! --- build-release.xml.orig	2007-12-21 10:53:33.000000000 -0500
! +++ build-release.xml	2009-02-10 19:18:38.428784274 -0500
! @@ -177,7 +177,7 @@
      </target>
   
      <target name="release"
! -      depends="bundle-docs, bin-tgz, bin-zip, source-tgz"
! +      depends="bundle-docs, bin-zip"
         description="Creates the release binary and source archives from the dist"
         >
         <!-- Build a war of the release DTDs -->
! @@ -254,6 +254,7 @@
   
      <target name="bin-zip" description="Build zip archive">

--- jbossas-4.2.3-version-release-maxmemory.patch DELETED ---

--- jbossas-4.2.3-jarmap DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** sources	21 Jan 2009 02:19:01 -0000	1.11
--- sources	11 Feb 2009 16:04:06 -0000	1.12
***************
*** 1,2 ****
- 8bc0d855607149aa1d376137a9282f8e  jbossas-5.0.0.GA-tp.tar.bz2
  a02d3357aa55944d2ca3926115eeec9e  jboss-5.0.0.GA-src.tar.bz2
--- 1,2 ----
  a02d3357aa55944d2ca3926115eeec9e  jboss-5.0.0.GA-src.tar.bz2
+ 1fba4ebef170ea23568783a8a75456d3  jbossas-5.0.0.GA-tp.tar.bz2

--- jbossas-4.2.3-no-pluggable-instrumentor.patch DELETED ---

--- jbossas-4.2.3-compute_jar_signature DELETED ---

--- jbossas-4.2.3-thirdparty-versions.patch DELETED ---

--- jbossas-4.2.3-glassfish.patch DELETED ---

--- jbossas-4.2.3-ant17.patch DELETED ---

Index: jbossas-5.0.0-jarmap
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas-5.0.0-jarmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** jbossas-5.0.0-jarmap	21 Jan 2009 02:19:01 -0000	1.3
--- jbossas-5.0.0-jarmap	11 Feb 2009 16:04:06 -0000	1.4
***************
*** 22,26 ****
--- 22,30 ----
  jaxws-rt.jar sun-jaxws/jaxws-rt
  jaxws-tools.jar sun-jaxws/jaxws-tools
+ jboss-common-core.jar jboss-common-core
  jboss-jaxb-intros.jar jboss/jaxbintros
+ jboss-logging-jdk.jar jboss-common-logging-jdk
+ jboss-logging-log4j.jar jboss-common-logging-log4j
+ jboss-logging-spi.jar jboss-common-logging-spi
  jcommon.jar jcommon
  jettison.jar jettison
***************
*** 39,43 ****
--- 43,49 ----
  scout.jar ws-scout0/scout
  serializer.jar xalan-j2-serializer
+ slf4j-api.jar slf4j/api
  stax-api.jar codehaus-stax11-api
+ stax-ex.jar stax-ex
  streambuffer.jar sun-jaxws/streambuffer
  trove.jar gnu-trove




More information about the JPackage-commits mailing list