[Jpackage-commits] dist/xbean/JPP-6 xbean-asm.patch, NONE, 1.1 xbean-jpp-depmap.xml, 1.4, 1.5 xbean-settings.xml, 1.1, 1.2 xbean.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Tue Dec 21 01:27:33 CET 2010


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

Modified Files:
	xbean-jpp-depmap.xml xbean-settings.xml xbean.spec 
Added Files:
	xbean-asm.patch 
Log Message:
- patch to use objectweb-asm instead of asm2 (maven class loader issue)

--- NEW FILE: xbean-asm.patch ---
--- xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java.orig	2008-02-28 14:26:28.000000000 -0500
+++ xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java	2010-12-20 19:23:07.103378547 -0500
@@ -111,7 +111,7 @@
             ClassReader reader = AsmParameterNameLoader.createClassReader(clazz);
 
             AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor visitor = new AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor(clazz);
-            reader.accept(visitor, false);
+            reader.accept(visitor, 0);
 
             Map exceptions = visitor.getExceptions();
             if (exceptions.size() == 1) {
@@ -160,7 +160,7 @@
             ClassReader reader = AsmParameterNameLoader.createClassReader(clazz);
 
             AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor visitor = new AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor(clazz, methodName);
-            reader.accept(visitor, false);
+            reader.accept(visitor, 0);
 
             Map exceptions = visitor.getExceptions();
             if (exceptions.size() == 1) {

Index: xbean-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xbean/JPP-6/xbean-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** xbean-jpp-depmap.xml	7 Dec 2010 22:19:33 -0000	1.4
--- xbean-jpp-depmap.xml	21 Dec 2010 00:27:31 -0000	1.5
***************
*** 1,328 ****
  <dependencies>
- <!--
-    <dependency>
-       <maven>
-          <groupId>ant</groupId>
-          <artifactId>ant</artifactId>
-          <version>1.6.2</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>ant</artifactId>
-          <version>1.6.2</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>backport-util-concurrent</groupId>
-          <artifactId>backport-util-concurrent</artifactId>
-          <version>2.0_01_pd</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>backport-util-concurrent</artifactId>
-          <version>2.0_01_pd</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          <version>1.0.3</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>commons-logging</artifactId>
-          <version>1.0.3</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>3.8.1</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>junit</artifactId>
-          <version>3.8.1</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-project</artifactId>
-          <version>2.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/maven2</groupId>
-          <artifactId>project</artifactId>
-          <version>2.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-archiver</artifactId>
-          <version>1.0-alpha-5</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/plexus</groupId>
-          <artifactId>archiver</artifactId>
-          <version>1.0-alpha-5</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-artifact</artifactId>
-          <version>2.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/maven2</groupId>
-          <artifactId>artifact</artifactId>
-          <version>2.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-archiver</artifactId>
-          <version>2.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/maven2</groupId>
-          <artifactId>archiver</artifactId>
-          <version>2.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-          <version>1.1</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/plexus</groupId>
-          <artifactId>utils</artifactId>
-          <version>1.1</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-plugin-api</artifactId>
-          <version>2.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/maven2</groupId>
-          <artifactId>plugin-api</artifactId>
-          <version>2.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>groovy</groupId>
-          <artifactId>groovy</artifactId>
-          <version>1.0-jsr-03</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>groovy15</artifactId>
-          <version>1.5.6</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-          <version>1.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>stax_1_0_api</artifactId>
-          <version>1.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j</artifactId>
-          <version>3.0.1</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/mx4j</groupId>
-          <artifactId>mx4j</artifactId>
-          <version>3.0.1</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>springframework</groupId>
-          <artifactId>spring</artifactId>
-          <version>1.2.4</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>spring</artifactId>
-          <version>1.2.9</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-          <version>2.0-m5</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>spring2</artifactId>
-          <version>2.5.1</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring</artifactId>
-          <version>2.0-rc2</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>spring2</artifactId>
-          <version>2.5.1</version>
-       </jpp>
-    </dependency>
-    <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>
-          <version>2.1_2</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>cglib-nodep</artifactId>
-          <version>2.1.3</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>ant</groupId>
-          <artifactId>ant-junit</artifactId>
-          <version>1.6.5</version>
-       </maven>
-       <jpp>
-          <groupId>JPP/ant</groupId>
-          <artifactId>ant-junit</artifactId>
-          <version>1.6.5</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>commons-primitives</groupId>
-          <artifactId>commons-primitives</artifactId>
-          <version>1.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>commons-primitives</artifactId>
-          <version>1.0</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>radeox</groupId>
-          <artifactId>radeox</artifactId>
-          <version>0.9</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>radeox</artifactId>
-          <version>0.9</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>idb</groupId>
-          <artifactId>idb</artifactId>
-          <version>3.26</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>hsqldb</artifactId>
-          <version>1.8.0.8</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>mockobjects</groupId>
-          <artifactId>mockobjects-core</artifactId>
-          <version>0.09</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>mockobjects-core</artifactId>
-          <version>0.09</version>
-       </jpp>
-    </dependency>
-    <dependency>
-       <maven>
-          <groupId>xpp3</groupId>
-          <artifactId>xpp3</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>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>
!          <version>2.O</version>
        </maven>
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>jsp_2_0_api</artifactId>
!          <version>2.0</version>
        </jpp>
     </dependency>
     <dependency>
        <maven>
--- 1,16 ----
  <dependencies>
     <dependency>
        <maven>
!          <groupId>org.mortbay.jetty</groupId>
!          <artifactId>servlet-api</artifactId>
!          <version>2.5-20081211</version>
        </maven>
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>servlet_2_5_api</artifactId>
!          <version>2.5</version>
        </jpp>
     </dependency>
+ 
     <dependency>
        <maven>
***************
*** 334,341 ****
           <groupId>JPP</groupId>
           <artifactId>qdox</artifactId>
!          <version>1.6.3</version>
        </jpp>
     </dependency>
! -->
     <dependency>
        <maven>
--- 22,29 ----
           <groupId>JPP</groupId>
           <artifactId>qdox</artifactId>
!          <version>1.12</version>
        </jpp>
     </dependency>
! 
     <dependency>
        <maven>

Index: xbean-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xbean/JPP-6/xbean-settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** xbean-settings.xml	7 Dec 2010 19:24:37 -0000	1.1
--- xbean-settings.xml	21 Dec 2010 00:27:31 -0000	1.2
***************
*** 1,47 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>local</id>
! 					<layout>jpp</layout>
! 					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-maven</id>
! 					<name>plugins-maven</name>
! 					<layout>jpp</layout>
! 					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,47 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>local</id>
!                     <layout>jpp</layout>
!                     <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-maven</id>
!                     <name>plugins-maven</name>
!                     <layout>jpp</layout>
!                     <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

Index: xbean.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/xbean/JPP-6/xbean.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** xbean.spec	7 Dec 2010 21:00:37 -0000	1.6
--- xbean.spec	21 Dec 2010 00:27:31 -0000	1.7
***************
*** 36,43 ****
  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
--- 36,43 ----
  Name:           xbean
  Version:        3.4.3
! Release:        2%{?dist}
  Epoch:          0
  Summary:        XBean plugin based server
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://geronimo.apache.org/xbean
***************
*** 52,55 ****
--- 52,56 ----
  Patch0:         %{name}-site.patch
  Patch1:         %{name}-finder-pom.patch
+ Patch2:         %{name}-asm.patch
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
***************
*** 79,83 ****
  BuildRequires:  geronimo-genesis
  
! BuildRequires:  asm2
  BuildRequires:  axion
  BuildRequires:  backport-util-concurrent
--- 80,84 ----
  BuildRequires:  geronimo-genesis
  
! BuildRequires:  objectweb-asm
  BuildRequires:  axion
  BuildRequires:  backport-util-concurrent
***************
*** 101,105 ****
  Requires:  java >= 0:1.5.0
  Requires:  ant >= 0:1.6.5
! Requires:  asm2
  Requires:  backport-util-concurrent
  Requires:  stax_1_0_api
--- 102,106 ----
  Requires:  java >= 0:1.5.0
  Requires:  ant >= 0:1.6.5
! Requires:  objectweb-asm
  Requires:  backport-util-concurrent
  Requires:  stax_1_0_api
***************
*** 148,151 ****
--- 149,153 ----
  %patch0 -b .sav0
  %patch1 -b .sav1
+ %patch2 -b .sav2
  
  cp %{SOURCE3} maven2-settings.xml
***************
*** 281,284 ****
--- 283,289 ----
  
  %changelog
+ * Mon Dec 20 2010 David Walluck <dwalluck at redhat.com> 0:3.4.3-2
+ - patch to use objectweb-asm instead of asm2 (maven class loader issue)
+ 
  * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> - 0:3.4.3-1
  - 3.4.3 for JPP-6




More information about the JPackage-commits mailing list