[Jpackage-commits] dist/jbossas/JPP-6 jbossas-5.0.0-componentmap, 1.6, 1.7 jbossas-5.0.0-thirdparty-versions.patch, 1.2, 1.3 jbossas.spec, 1.52, 1.53

David Walluck david at ryu.zarb.org
Tue Feb 3 18:02:51 CET 2009


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

Modified Files:
	jbossas-5.0.0-componentmap 
	jbossas-5.0.0-thirdparty-versions.patch jbossas.spec 
Log Message:
- add external easymock, httpunit, jtidy
- change apache-beanutils from 1.7.0-brew to 1.8.0clean-brew
- remove jcommon-repolib requirement (part of jfreechart-repolib now)


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.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** jbossas-5.0.0-thirdparty-versions.patch	15 Jan 2009 20:56:09 -0000	1.2
--- jbossas-5.0.0-thirdparty-versions.patch	3 Feb 2009 17:02:49 -0000	1.3
***************
*** 1,31 ****
- --- thirdparty/libraries.ent.thirdparty-versions	2008-12-12 17:26:10.000000000 -0500
- +++ thirdparty/libraries.ent	2009-01-08 14:44:05.216274350 -0500
- @@ -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">
  --- thirdparty/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
  +++ thirdparty/pom.xml	2009-01-08 14:44:05.215191669 -0500
--- 1,2 ----
***************
*** 56,61 ****
               </dependency>
               <!-- End mapped dependecies -->
  --- component-matrix/pom.xml.thirdparty-versions	2008-12-04 15:37:23.000000000 -0500
! +++ component-matrix/pom.xml	2009-01-12 17:30:44.116985009 -0500
  @@ -28,7 +28,7 @@
   
--- 27,70 ----
               </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-03 11:11:33.218260612 -0500
  @@ -28,7 +28,7 @@
   
***************
*** 221,225 ****
           <artifactId>commons-beanutils</artifactId>
  -        <version>1.7.0</version>
! +        <version>1.7.0-brew</version>
         </dependency>
         
--- 230,234 ----
           <artifactId>commons-beanutils</artifactId>
  -        <version>1.7.0</version>
! +        <version>1.8.0clean-brew</version>
         </dependency>
         
***************
*** 271,275 ****
             <exclusion>
               <groupId>xml-apis</groupId>
! @@ -420,7 +420,7 @@
         <dependency>
           <groupId>hsqldb</groupId>
--- 280,300 ----
             <exclusion>
               <groupId>xml-apis</groupId>
! @@ -402,13 +402,13 @@
!        <dependency>
!          <groupId>easymock</groupId>
!          <artifactId>easymock</artifactId>
! -        <version>1.1</version>
! +        <version>1.2-brew</version>
!        </dependency>
!        
!        <dependency>
!          <groupId>easymock</groupId>
!          <artifactId>easymockclassextension</artifactId>
! -        <version>1.1</version>
! +        <version>1.2-brew</version>
!        </dependency>
!        
!        <dependency>
! @@ -420,13 +420,13 @@
         <dependency>
           <groupId>hsqldb</groupId>
***************
*** 280,283 ****
--- 305,315 ----
         
         <dependency>
+          <groupId>httpunit</groupId>
+          <artifactId>httpunit</artifactId>
+ -        <version>1.6</version>
+ +        <version>1.7-brew</version>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.servlet</groupId>
  @@ -474,7 +474,7 @@
         <dependency>

Index: jbossas.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jbossas/JPP-6/jbossas.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -C 2 -d -r1.52 -r1.53
*** jbossas.spec	21 Jan 2009 23:25:36 -0000	1.52
--- jbossas.spec	3 Feb 2009 17:02:49 -0000	1.53
***************
*** 141,144 ****
--- 141,146 ----
  BuildRequires:  dtdparser >= 0:1.21
  BuildRequires:  dtdparser-repolib = 0:1.21
+ BuildRequires:  easymock >= 0:1.2
+ BuildRequires:  easymock-repolib = 0:1.2
  BuildRequires:  excalibur-avalon-framework >= 1:4.3.1
  BuildRequires:  excalibur-avalon-framework-repolib = 1:4.3.1
***************
*** 172,179 ****
  BuildRequires:  hsqldb >= 1:1.8.0.8-2.patch01
  BuildRequires:  hsqldb-repolib >= 1:1.8.0.8-2.patch01
  BuildRequires:  jacorb >= 0:2.3.0-1jpp.ep1.4
  BuildRequires:  jacorb-repolib >= 0:2.3.0-1jpp.ep1.4
! BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
! BuildRequires:  jakarta-commons-beanutils-repolib = 0:1.7.0
  BuildRequires:  jakarta-commons-codec >= 0:1.3
  BuildRequires:  jakarta-commons-codec-repolib = 0:1.3
--- 174,183 ----
  BuildRequires:  hsqldb >= 1:1.8.0.8-2.patch01
  BuildRequires:  hsqldb-repolib >= 1:1.8.0.8-2.patch01
+ BuildRequires:  httpunit >= 0:1.7
+ BuildRequires:  httpunit-repolib = 0:1.7
  BuildRequires:  jacorb >= 0:2.3.0-1jpp.ep1.4
  BuildRequires:  jacorb-repolib >= 0:2.3.0-1jpp.ep1.4
! BuildRequires:  jakarta-commons-beanutils >= 0:1.8.0
! BuildRequires:  jakarta-commons-beanutils-repolib = 0:1.8.0
  BuildRequires:  jakarta-commons-codec >= 0:1.3
  BuildRequires:  jakarta-commons-codec-repolib = 0:1.3
***************
*** 246,250 ****
  BuildRequires:  jbossxb-repolib >= 1:1.0.0-3
  BuildRequires:  jcommon >= 0:1.0.12
- BuildRequires:  jcommon-repolib >= 0:1.0.12
  BuildRequires:  jettison >= 0:1.0.1
  BuildRequires:  jettison-repolib >= 0:1.0.1
--- 250,253 ----
***************
*** 258,261 ****
--- 261,266 ----
  BuildRequires:  joramtests-repolib >= 0:1.1
  BuildRequires:  jpackage-utils >= 0:1.7.3
+ BuildRequires:  jtidy >= 2:7.0
+ BuildRequires:  jtidy-repolib = 2:7.0
  BuildRequires:  juddi >= 0:0.9-0.rc4
  BuildRequires:  juddi-repolib >= 0:0.9-0.rc4

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.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** jbossas-5.0.0-componentmap	21 Jan 2009 23:25:36 -0000	1.6
--- jbossas-5.0.0-componentmap	3 Feb 2009 17:02:49 -0000	1.7
***************
*** 4,8 ****
  apache-avalon-logkit 2.2.1-brew
  apache-bcel 5.1-brew
! apache-beanutils 1.7.0-brew
  apache-bsf 2.4.0-brew
  apache-codec 1.3.0-brew
--- 4,8 ----
  apache-avalon-logkit 2.2.1-brew
  apache-bcel 5.1-brew
! apache-beanutils 1.8.0clean-brew
  apache-bsf 2.4.0-brew
  apache-codec 1.3.0-brew
***************
*** 28,31 ****
--- 28,32 ----
  commons-io 1.4-brew
  dom4j 1.6.1-brew
+ easymock 1.2-brew
  glassfish/jaf 1.1.0-brew
  glassfish/javamail 1.4.0-brew
***************
*** 33,36 ****
--- 34,38 ----
  gnu-getopt 1.0.12-brew
  hsqldb 1.8.0.8.patch01-brew
+ httpunit 1.7-brew
  ibm-wsdl4j 1.6.2-brew
  jacorb 2.3.0jboss.patch5-brew
***************
*** 38,45 ****
  jaxen 1.1-brew
  jboss/jaxbintros 1.0.0.GA-brew
- jcommon 1.0.12-brew
  jfreechart 1.0.9-brew
  jgroups 2.6.7.GA-brew
  joesnmp 0.3.4-brew
  juddi 0.9RC4-brew
  junit 3.8.2-brew
--- 40,47 ----
  jaxen 1.1-brew
  jboss/jaxbintros 1.0.0.GA-brew
  jfreechart 1.0.9-brew
  jgroups 2.6.7.GA-brew
  joesnmp 0.3.4-brew
+ jtidy 7.0-brew
  juddi 0.9RC4-brew
  junit 3.8.2-brew




More information about the JPackage-commits mailing list