[pkg-java] r12571 - in trunk/libspring-2.5-java/debian: . patches poms
Onkar Shinde
onkarshinde-guest at alioth.debian.org
Tue Jun 15 08:08:54 UTC 2010
Author: onkarshinde-guest
Date: 2010-06-15 08:08:46 +0000 (Tue, 15 Jun 2010)
New Revision: 12571
Added:
trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff
trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml
Modified:
trunk/libspring-2.5-java/debian/changelog
trunk/libspring-2.5-java/debian/classpath-debian
trunk/libspring-2.5-java/debian/control
trunk/libspring-2.5-java/debian/patches/series
trunk/libspring-2.5-java/debian/rules
Log:
asm2 -> asm3 transition
Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2010-06-15 03:05:53 UTC (rev 12570)
+++ trunk/libspring-2.5-java/debian/changelog 2010-06-15 08:08:46 UTC (rev 12571)
@@ -1,3 +1,13 @@
+libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
+
+ * Team upload.
+ * asm2 -> asm3 transition.
+ * Build a new package libspring-aspects-2.5-java and include
+ spring-aspects.jar file in it. This is needed to build xwork2.
+ (Closes: #582510)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Tue, 25 May 2010 17:32:40 +0530
+
libspring-2.5-java (2.5.6.SEC01-9) unstable; urgency=low
[ Miguel Landaeta ]
Modified: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian 2010-06-15 03:05:53 UTC (rev 12570)
+++ trunk/libspring-2.5-java/debian/classpath-debian 2010-06-15 08:08:46 UTC (rev 12571)
@@ -2,13 +2,13 @@
usr/share/java/commons-logging.jar
usr/share/java/aopalliance.jar
usr/share/java/cglib.jar
-usr/share/java/asm2.jar
+usr/share/java/asm3.jar
usr/share/java/jamon.jar
usr/share/java/commons-pool.jar
usr/share/java/commons-collections3.jar
usr/share/java/backport-util-concurrent.jar
-usr/share/java/asm2.jar
-usr/share/java/asm2-commons.jar
+usr/share/java/asm3.jar
+usr/share/java/asm3-commons.jar
usr/share/java/c3p0.jar
usr/share/java/xapool.jar
usr/share/java/jdo2-api.jar
Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2010-06-15 03:05:53 UTC (rev 12570)
+++ trunk/libspring-2.5-java/debian/control 2010-06-15 08:08:46 UTC (rev 12571)
@@ -5,7 +5,7 @@
Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
- libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm2-java,
+ libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm3-java,
libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
@@ -21,7 +21,7 @@
Package: libspring-core-2.5-java
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm2-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libasm3-java, libcommons-collections3-java, libcommons-logging-java, liblog4j1.2-java, libbackport-util-concurrent-java
Recommends: libcommons-attributes-java
Description: modular Java/J2EE application framework - Core
Spring is a layered Java/J2EE application framework offering a lot of freedom
@@ -179,3 +179,13 @@
.
This package provide spring-orm.jar : JDO support, JPA support, Hibernate
support, TopLink support, iBATIS support
+
+Package: libspring-aspects-2.5-java
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime
+Description: modular Java/J2EE application framework - ORM tools
+ Spring is a layered Java/J2EE application framework offering a lot of freedom
+ to Java developers yet providing well documented and easy-to-use solutions for
+ common practices in the industry.
+ .
+ This package provide spring-aspects.jar.
Added: trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff
===================================================================
--- trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/15_fix_build_with_asm3.diff 2010-06-15 08:08:46 UTC (rev 12571)
@@ -0,0 +1,42 @@
+Index: libspring-2.5-java-2.5.6.SEC01/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+===================================================================
+--- libspring-2.5-java-2.5.6.SEC01.orig/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java 2010-06-14 18:47:23.000000000 +0530
++++ libspring-2.5-java-2.5.6.SEC01/src/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java 2010-06-14 18:48:21.000000000 +0530
+@@ -109,7 +109,7 @@
+ private ParameterNameDiscoveringVisitor visitMethod(Method method) throws IOException {
+ ClassReader classReader = getClassReader(method.getDeclaringClass());
+ FindMethodParameterNamesClassVisitor classVisitor = new FindMethodParameterNamesClassVisitor(method);
+- classReader.accept(classVisitor, false);
++ classReader.accept(classVisitor, 0);
+ return classVisitor;
+ }
+
+@@ -119,7 +119,7 @@
+ private ParameterNameDiscoveringVisitor visitConstructor(Constructor ctor) throws IOException {
+ ClassReader classReader = getClassReader(ctor.getDeclaringClass());
+ FindConstructorParameterNamesClassVisitor classVisitor = new FindConstructorParameterNamesClassVisitor(ctor);
+- classReader.accept(classVisitor, false);
++ classReader.accept(classVisitor, 0);
+ return classVisitor;
+ }
+
+Index: libspring-2.5-java-2.5.6.SEC01/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java
+===================================================================
+--- libspring-2.5-java-2.5.6.SEC01.orig/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java 2010-06-14 19:07:18.000000000 +0530
++++ libspring-2.5-java-2.5.6.SEC01/tiger/src/org/springframework/core/type/classreading/SimpleMetadataReader.java 2010-06-14 19:07:48.000000000 +0530
+@@ -46,13 +46,13 @@
+
+ public ClassMetadata getClassMetadata() {
+ ClassMetadataReadingVisitor visitor = new ClassMetadataReadingVisitor();
+- this.classReader.accept(visitor, true);
++ this.classReader.accept(visitor, ClassReader.SKIP_DEBUG);
+ return visitor;
+ }
+
+ public AnnotationMetadata getAnnotationMetadata() {
+ AnnotationMetadataReadingVisitor visitor = new AnnotationMetadataReadingVisitor(this.classLoader);
+- this.classReader.accept(visitor, true);
++ this.classReader.accept(visitor, ClassReader.SKIP_DEBUG);
+ return visitor;
+ }
+
Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series 2010-06-15 03:05:53 UTC (rev 12570)
+++ trunk/libspring-2.5-java/debian/patches/series 2010-06-15 08:08:46 UTC (rev 12571)
@@ -11,3 +11,4 @@
12_aspectj_164.diff
13_tiles_22.diff
14_portlet_api.diff
+15_fix_build_with_asm3.diff
Added: trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml
===================================================================
--- trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml (rev 0)
+++ trunk/libspring-2.5-java/debian/poms/spring-aspects-2.5.xml 2010-06-15 08:08:46 UTC (rev 12571)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring Framework: Aspects</name>
+ <version>2.5.6.SEC01</version>
+ <description>Spring Framework: Aspects</description>
+ <url>http://www.springframework.org</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+ <developerConnection>scm:cvs:ext:username at springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+ <url>http://springframework.cvs.sourceforge.net/springframework/</url>
+ </scm>
+ <organization>
+ <name>Spring Framework</name>
+ <url>http://www.springframework.org/</url>
+ </organization>
+ <dependencies>
+<!-- External Dependencies -->
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+<!-- Spring Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>local</id>
+ <name>Spring Release Repository</name>
+ <url>file:///Users/benhale/brm/repos/repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>spring-snapshot</id>
+ <name>Spring Snapshot Repository</name>
+ <url>s3://maven.springframework.org/snapshot</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
Modified: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules 2010-06-15 03:05:53 UTC (rev 12570)
+++ trunk/libspring-2.5-java/debian/rules 2010-06-15 08:08:46 UTC (rev 12571)
@@ -8,6 +8,7 @@
MODULES = aop beans context context-support core jdbc jms orm test tx web webmvc \
webmvc-struts webmvc-portlet
+WEAVINGS = aspects
JAVA_HOME := /usr/lib/jvm/default-java
ANT := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
@@ -30,6 +31,14 @@
mh_installpom -p$$PACKAGE $$POM ; \
mh_installjar -p$$PACKAGE -nspring-$$MYMOD -i2.5 -l $$POM $$JAR ; \
done
+ for MYWEAVING in $(WEAVINGS); do \
+ BASENAME=`echo spring-$$MYWEAVING-2.5`; \
+ JAR=`echo dist/weaving/spring-$$MYWEAVING.jar`; \
+ POM=`echo debian/poms/$$BASENAME.xml`; \
+ PACKAGE=`echo lib$$BASENAME-java`; \
+ mh_installpom -p$$PACKAGE $$POM ; \
+ mh_installjar -p$$PACKAGE -nspring-$$MYWEAVING -i2.5 -l $$POM $$JAR ; \
+ done
# Make a Debian version of upstream tarball
# Details given in README.source
@@ -51,4 +60,9 @@
POM=`echo debian/poms/$$BASENAME.xml`; \
wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYMOD/$(POM_VERSION)/spring-$$MYMOD-$(POM_VERSION).pom; \
done
+ for MYWEAVING in $(WEAVINGS); do \
+ BASENAME=`echo spring-$$MYWEAVING-2.5`; \
+ POM=`echo debian/poms/$$BASENAME.xml`; \
+ wget -O $$POM $(MAVEN_REPO)/org/springframework/spring-$$MYWEAVING/$(POM_VERSION)/spring-$$MYWEAVING-$(POM_VERSION).pom; \
+ done
perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(VERSION)/' debian/poms/*.xml
More information about the pkg-java-commits
mailing list