[Jpackage-commits] dist/jbossas/JPP-6 jbossas-5.0.0-componentmap, 1.8, 1.9 jbossas-5.0.0-thirdparty-versions.patch, 1.4, 1.5 jbossas.init, 1.6, 1.7 jbossas.spec, 1.55, 1.56 sources, 1.12, 1.13

David Walluck david at ryu.zarb.org
Fri Feb 13 00:22:33 CET 2009


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

Modified Files:
	jbossas-5.0.0-componentmap 
	jbossas-5.0.0-thirdparty-versions.patch jbossas.init 
	jbossas.spec sources 
Log Message:
- add external jcip-annotations, nekohtml, rhino, stax-ex,
  sun-xmlstreambuffer, and xmlunit
- fix check for /etc/rc.d/init.d/functions in jbossas initscript
- correctly set ant OPT_JAR_LIST


Index: jbossas.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -C 2 -d -r1.55 -r1.56
*** jbossas.spec	11 Feb 2009 16:15:26 -0000	1.55
--- jbossas.spec	12 Feb 2009 23:22:31 -0000	1.56
***************
*** 32,36 ****
  Source3:        jbossas.init
  Source4:        jbossas-%{taggedversion}-tp.tar.bz2
! #Source5:        jbossas-%{taggedversion}-tp-licenses.tar.bz2
  Source7:        jbossas-%{version}-jarmap
  Source8:        jbossas-webconsole-context.xml
--- 32,36 ----
  Source3:        jbossas.init
  Source4:        jbossas-%{taggedversion}-tp.tar.bz2
! #Source5:       jbossas-%{taggedversion}-tp-licenses.tar.bz2
  Source7:        jbossas-%{version}-jarmap
  Source8:        jbossas-webconsole-context.xml
***************
*** 260,263 ****
--- 260,265 ----
  BuildRequires:  jbossxb >= 1:1.0.0-3
  BuildRequires:  jbossxb-repolib >= 1:1.0.0-3
+ BuildRequires:  jcip-annotations >= 0:1.0
+ BuildRequires:  jcip-annotations-repolib = 0:1.0
  BuildRequires:  jcommon >= 0:1.0.12
  BuildRequires:  jettison >= 0:1.0.1
***************
*** 280,283 ****
--- 282,287 ----
  BuildRequires:  log4j >= 0:1.2.14
  BuildRequires:  log4j-repolib = 0:1.2.14
+ BuildRequires:  nekohtml >= 0:1.9.11
+ BuildRequires:  nekohtml-repolib = 0:1.9.11
  BuildRequires:  odmg >= 0:3.0
  BuildRequires:  odmg-repolib = 0:3.0
***************
*** 286,289 ****
--- 290,295 ----
  BuildRequires:  quartz >= 0:1.5.2
  BuildRequires:  quartz-repolib = 0:1.5.2
+ BuildRequires:  rhino >= 0:1.7
+ BuildRequires:  rhino-repolib = 0:1.7
  BuildRequires:  sed
  BuildRequires:  servletapi6 >= 0:6.0.18
***************
*** 293,300 ****
--- 299,310 ----
  BuildRequires:  snmptrapappender >= 0:1.2.8
  BuildRequires:  snmptrapappender-repolib = 0:1.2.8
+ BuildRequires:  stax-ex >= 0:1.2
+ BuildRequires:  stax-ex-repolib = 0:1.2
  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:  sun-xmlstreambuffer >= 0:0.7
+ BuildRequires:  sun-xmlstreambuffer = 0:0.7
  BuildRequires:  unzip
  BuildRequires:  velocity-jboss >= 0:1.4
***************
*** 314,325 ****
  BuildRequires:  xdoclet >= 0:1.2.3
  BuildRequires:  xdoclet-repolib = 0:1.2.3
- BuildRequires:  xjavadoc >= 0:1.1
- BuildRequires:  xjavadoc-repolib = 0:1.1
  BuildRequires:  xerces-j2 >= 0:2.9.1
  BuildRequires:  xerces-j2-repolib = 0:2.9.1
! BuildRequires:  xml-security >= 0:1.3.0
! BuildRequires:  xml-security-repolib = 0:1.3.0
  BuildRequires:  xml-commons >= 0:1.3.04
  BuildRequires:  xml-commons-repolib = 0:1.3.04
  Provides:       %{name}-ejb3 = %{epoch}:1.0.0-0.2.rc10
  Obsoletes:      %{name}-ejb3 < 0:1.0.0-0.2.rc10
--- 324,337 ----
  BuildRequires:  xdoclet >= 0:1.2.3
  BuildRequires:  xdoclet-repolib = 0:1.2.3
  BuildRequires:  xerces-j2 >= 0:2.9.1
  BuildRequires:  xerces-j2-repolib = 0:2.9.1
! BuildRequires:  xjavadoc >= 0:1.1
! BuildRequires:  xjavadoc-repolib = 0:1.1
! BuildRequires:  xmlunit >= 0:1.2
! BuildRequires:  xmlunit-repolib = 0:1.2
  BuildRequires:  xml-commons >= 0:1.3.04
  BuildRequires:  xml-commons-repolib = 0:1.3.04
+ BuildRequires:  xml-security >= 0:1.3.0
+ BuildRequires:  xml-security-repolib = 0:1.3.0
  Provides:       %{name}-ejb3 = %{epoch}:1.0.0-0.2.rc10
  Obsoletes:      %{name}-ejb3 < 0:1.0.0-0.2.rc10
***************
*** 418,422 ****
  %build
  export CLASSPATH=
! export OPT_JAR_LIST="ant/ant-nodeps"
  export ANT_OPTS="-Xms500m -Xmx1500m -Xss1m"
  # FIXME: (dwalluck): Work around <https://issues.apache.org/bugzilla/show_bug.cgi?id=42263>
--- 430,434 ----
  %build
  export CLASSPATH=
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/nodeps`"
  export ANT_OPTS="-Xms500m -Xmx1500m -Xss1m"
  # FIXME: (dwalluck): Work around <https://issues.apache.org/bugzilla/show_bug.cgi?id=42263>

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.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** jbossas-5.0.0-componentmap	11 Feb 2009 16:04:06 -0000	1.8
--- jbossas-5.0.0-componentmap	12 Feb 2009 23:22:31 -0000	1.9
***************
*** 28,31 ****
--- 28,32 ----
  commons-io 1.4-brew
  com/sun/facelets 1.1.15-brew
+ com/sun/xml/stream/buffer 0.7-brew
  dom4j 1.6.1-brew
  easymock 1.2-brew
***************
*** 51,61 ****
--- 52,66 ----
  juddi 0.9RC4-brew
  junit 3.8.2-brew
+ nekohtml 1.9.11-brew
+ net/jcip 1.0-brew
  odmg 3.0-brew
  org/codehaus/jettison 1.0.1-brew
  org/jvnet 1.2-brew
+ org/jvnet/staxex 1.2-brew
  org/slf4j 1.5.6-brew
  oswego-concurrent 1.3.4.patch01-brew
  qdox 1.6.1-brew
  quartz 1.5.2-brew
+ rhino 1.7R2-brew
  snmptrapappender 1.2.8-brew
  stax-api 1.0-brew
***************
*** 69,71 ****
--- 74,77 ----
  wutka-dtdparser 1.21-brew
  xdoclet 1.2.3-brew
+ xmlunit-xmlunit 1.2-brew
  xml-security 1.3.0-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.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** jbossas-5.0.0-thirdparty-versions.patch	11 Feb 2009 16:04:06 -0000	1.4
--- jbossas-5.0.0-thirdparty-versions.patch	12 Feb 2009 23:22:31 -0000	1.5
***************
*** 1,70 ****
! --- thirdparty/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
! +++ thirdparty/pom.xml	2009-01-08 14:44:05.215191669 -0500
! @@ -260,14 +260,14 @@
!                <groupId>javax.mail</groupId>
!                <artifactId>mail</artifactId>
!                <mapping>
! -                <componentId>sun-javamail</componentId>
! +                <componentId>glassfish/javamail</componentId>
!                </mapping>
!              </dependency>
!              <dependency>
!                <groupId>javax.servlet</groupId>
!                <artifactId>jstl</artifactId>
!                <mapping>
! -                <componentId>sun-jstl</componentId>
! +                <componentId>glassfish/jstl</componentId>
!                </mapping>
!              </dependency>
!              <dependency>
! @@ -908,7 +908,7 @@
!                <groupId>javax.activation</groupId>
!                <artifactId>activation</artifactId>
!                <mapping>
! -                <componentId>sun-jaf</componentId>
! +                <componentId>glassfish/jaf</componentId>
!                </mapping>
!              </dependency>
!              <!-- End mapped dependecies -->
! --- thirdparty/libraries.ent.thirdparty-versions	2008-12-12 17:26:10.000000000 -0500
! +++ thirdparty/libraries.ent	2009-02-03 11:12:27.196388201 -0500
! @@ -279,7 +279,7 @@
!  <property name="easymock.easymock.lib" value="${easymock.easymock.root}/lib/"/>
!  <property name="easymock.easymock.resources" value="${easymock.easymock.root}/resources/"/>
!  <path id="easymock.easymock.classpath">
! -   <pathelement path="${easymock.easymock.lib}/easymock-1.1.jar"/>
! +   <pathelement path="${easymock.easymock.lib}/easymock.jar"/>
!     <pathelement path="${easymock.easymock.lib}/easymockclassextension.jar"/>
!  </path>
!  
! @@ -1189,7 +1189,7 @@
!  </path>
!  
!  <!-- sun-jaf -->
! -<property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
! +<property name="sun.jaf.root" value="${project.thirdparty}/glassfish/jaf"/>
!  <property name="sun.jaf.lib" value="${sun.jaf.root}/lib/"/>
!  <property name="sun.jaf.resources" value="${sun.jaf.root}/resources/"/>
!  <path id="sun.jaf.classpath">
! @@ -1205,7 +1205,7 @@
!  </path>
!  
!  <!-- sun-javamail -->
! -<property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
! +<property name="sun.javamail.root" value="${project.thirdparty}/glassfish/javamail"/>
!  <property name="sun.javamail.lib" value="${sun.javamail.root}/lib/"/>
!  <property name="sun.javamail.resources" value="${sun.javamail.root}/resources/"/>
!  <path id="sun.javamail.classpath">
! @@ -1245,7 +1245,7 @@
!  </path>
!  
!  <!-- sun-jstl -->
! -<property name="sun.jstl.root" value="${project.thirdparty}/sun-jstl"/>
! +<property name="sun.jstl.root" value="${project.thirdparty}/glassfish/jstl"/>
!  <property name="sun.jstl.lib" value="${sun.jstl.root}/lib/"/>
!  <property name="sun.jstl.resources" value="${sun.jstl.root}/resources/"/>
!  <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 @@
   
--- 1,4 ----
! --- ./component-matrix/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
! +++ ./component-matrix/pom.xml	2009-02-12 15:13:44.163522004 -0500
  @@ -28,7 +28,7 @@
   
***************
*** 373,377 ****
         
         <dependency>
! @@ -1030,7 +1030,7 @@
         <dependency>
           <groupId>log4j</groupId>
--- 307,311 ----
         
         <dependency>
! @@ -1030,25 +1030,25 @@
         <dependency>
           <groupId>log4j</groupId>
***************
*** 382,386 ****
         
         <dependency>
! @@ -1042,7 +1042,7 @@
         <dependency>
           <groupId>net.java.dev.javacc</groupId>
--- 316,325 ----
         
         <dependency>
!          <groupId>nekohtml</groupId>
!          <artifactId>nekohtml</artifactId>
! -        <version>0.9.1</version>
! +        <version>0.9.11-brew</version>
!        </dependency>
!        
         <dependency>
           <groupId>net.java.dev.javacc</groupId>
***************
*** 391,394 ****
--- 330,340 ----
         
         <dependency>
+          <groupId>net.jcip</groupId>
+          <artifactId>jcip-annotations</artifactId>
+ -        <version>1.0</version>
+ +        <version>1.0-brew</version>
+        </dependency>
+        
+        <dependency>
  @@ -1060,7 +1060,7 @@
         <dependency>
***************
*** 524,525 ****
--- 470,564 ----
         
         <dependency>
+ @@ -2066,7 +2066,7 @@
+        <dependency>
+          <groupId>xmlunit</groupId>
+          <artifactId>xmlunit</artifactId>
+ -        <version>1.0</version>
+ +        <version>1.2-brew</version>
+        </dependency>
+  
+      </dependencies>
+ --- ./thirdparty/libraries.ent.thirdparty-versions	2008-12-12 17:26:10.000000000 -0500
+ +++ ./thirdparty/libraries.ent	2009-02-12 13:49:51.328648397 -0500
+ @@ -279,7 +279,7 @@
+  <property name="easymock.easymock.lib" value="${easymock.easymock.root}/lib/"/>
+  <property name="easymock.easymock.resources" value="${easymock.easymock.root}/resources/"/>
+  <path id="easymock.easymock.classpath">
+ -   <pathelement path="${easymock.easymock.lib}/easymock-1.1.jar"/>
+ +   <pathelement path="${easymock.easymock.lib}/easymock.jar"/>
+     <pathelement path="${easymock.easymock.lib}/easymockclassextension.jar"/>
+  </path>
+  
+ @@ -1189,7 +1189,7 @@
+  </path>
+  
+  <!-- sun-jaf -->
+ -<property name="sun.jaf.root" value="${project.thirdparty}/sun-jaf"/>
+ +<property name="sun.jaf.root" value="${project.thirdparty}/glassfish/jaf"/>
+  <property name="sun.jaf.lib" value="${sun.jaf.root}/lib/"/>
+  <property name="sun.jaf.resources" value="${sun.jaf.root}/resources/"/>
+  <path id="sun.jaf.classpath">
+ @@ -1205,7 +1205,7 @@
+  </path>
+  
+  <!-- sun-javamail -->
+ -<property name="sun.javamail.root" value="${project.thirdparty}/sun-javamail"/>
+ +<property name="sun.javamail.root" value="${project.thirdparty}/glassfish/javamail"/>
+  <property name="sun.javamail.lib" value="${sun.javamail.root}/lib/"/>
+  <property name="sun.javamail.resources" value="${sun.javamail.root}/resources/"/>
+  <path id="sun.javamail.classpath">
+ @@ -1245,7 +1245,7 @@
+  </path>
+  
+  <!-- sun-jstl -->
+ -<property name="sun.jstl.root" value="${project.thirdparty}/sun-jstl"/>
+ +<property name="sun.jstl.root" value="${project.thirdparty}/glassfish/jstl"/>
+  <property name="sun.jstl.lib" value="${sun.jstl.root}/lib/"/>
+  <property name="sun.jstl.resources" value="${sun.jstl.root}/resources/"/>
+  <path id="sun.jstl.classpath">
+ @@ -1323,7 +1323,7 @@
+  <property name="xmlunit.xmlunit.lib" value="${xmlunit.xmlunit.root}/lib/"/>
+  <property name="xmlunit.xmlunit.resources" value="${xmlunit.xmlunit.root}/resources/"/>
+  <path id="xmlunit.xmlunit.classpath">
+ -   <pathelement path="${xmlunit.xmlunit.lib}/xmlunit1.0.jar"/>
+ +   <pathelement path="${xmlunit.xmlunit.lib}/xmlunit.jar"/>
+  </path>
+  
+  <!-- list of aliases used to bridge gap between buildmagic defs and jbossbuild -->
+ --- ./thirdparty/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
+ +++ ./thirdparty/pom.xml	2009-02-12 13:49:51.339648458 -0500
+ @@ -260,14 +260,14 @@
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <mapping>
+ -                <componentId>sun-javamail</componentId>
+ +                <componentId>glassfish/javamail</componentId>
+                </mapping>
+              </dependency>
+              <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <mapping>
+ -                <componentId>sun-jstl</componentId>
+ +                <componentId>glassfish/jstl</componentId>
+                </mapping>
+              </dependency>
+              <dependency>
+ @@ -288,7 +288,7 @@
+                <artifactId>xmlunit</artifactId>
+                <mapping>
+                  <componentId>xmlunit-xmlunit</componentId>
+ -                <artifactId>xmlunit1.0</artifactId>
+ +                <artifactId>xmlunit</artifactId>
+                </mapping>
+              </dependency>
+              <dependency>
+ @@ -908,7 +908,7 @@
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <mapping>
+ -                <componentId>sun-jaf</componentId>
+ +                <componentId>glassfish/jaf</componentId>
+                </mapping>
+              </dependency>
+              <!-- End mapped dependecies -->

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** sources	11 Feb 2009 16:04:06 -0000	1.12
--- sources	12 Feb 2009 23:22:31 -0000	1.13
***************
*** 1,2 ****
  a02d3357aa55944d2ca3926115eeec9e  jboss-5.0.0.GA-src.tar.bz2
! 1fba4ebef170ea23568783a8a75456d3  jbossas-5.0.0.GA-tp.tar.bz2
--- 1,2 ----
  a02d3357aa55944d2ca3926115eeec9e  jboss-5.0.0.GA-src.tar.bz2
! 1ccb9fb46dd1825ad7c137d2082174e2  jbossas-5.0.0.GA-tp.tar.bz2

Index: jbossas.init
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** jbossas.init	8 Jan 2009 23:11:25 -0000	1.6
--- jbossas.init	12 Feb 2009 23:22:31 -0000	1.7
***************
*** 395,399 ****
      rm $JBOSS_HOME/server/$JBOSSCONF/log/temp.file
  
!     if [ -x /etc/rc.d/init.d/functions ]; then
          if [ $RETVAL -eq 0 ]; then
              success $"${NAME} startup"
--- 395,399 ----
      rm $JBOSS_HOME/server/$JBOSSCONF/log/temp.file
  
!     if [ -r /etc/rc.d/init.d/functions ]; then
          if [ $RETVAL -eq 0 ]; then
              success $"${NAME} startup"
***************
*** 480,484 ****
          failure $"${NAME} shutdown"
      else
!         if [ -x /etc/rc.d/init.d/functions ]; then
                  success $"${NAME} shutdown"
          fi
--- 480,484 ----
          failure $"${NAME} shutdown"
      else
!         if [ -r /etc/rc.d/init.d/functions ]; then
                  success $"${NAME} shutdown"
          fi




More information about the JPackage-commits mailing list