[pkg-java] r10536 - in trunk/libspring-2.5-java/debian: . excludesfiles patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Tue Sep 22 22:46:55 UTC 2009
Author: drazzib-guest
Date: 2009-09-22 22:46:54 +0000 (Tue, 22 Sep 2009)
New Revision: 10536
Added:
trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch
Removed:
trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch
Modified:
trunk/libspring-2.5-java/debian/README.Debian
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/excludesfiles/main.excludes
trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes
trunk/libspring-2.5-java/debian/patches/00list
Log:
libspring-2.5-java (2.5.6.SEC01-3) UNRELEASED; urgency=low
* Now build with jasperreports and aspectj helpers
- Add Build-Depends on libjasperreports-java and aspectj
in debian/control
- Add Recommends on aspectj for libspring-aop-2.5-java
- Update debian/excludesfiles/{main,tiger,tigermock} accordingly
- Add this JARs to debian/classpath-debian for build
- Update exclusion list in README.Debian
- Remove 07_no_aspectj patch
* New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
* Bump Standards-Version to 3.8.3: no changes needed
-- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 14 Sep 2009 23:08:29 +0200
Modified: trunk/libspring-2.5-java/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/README.Debian 2009-09-22 22:46:54 UTC (rev 10536)
@@ -10,13 +10,6 @@
Here is a list of excluded files regarding original content of SpringFramework.
-* spring-aop
- [contrib] AspectJ is in contrib (#480132)
- org/springframework/aop/aspectj/**
- org/springframework/aop/config/ConfigBeanDefinitionParser.java
- org/springframework/context/weaving/AspectJWeavingEnabler.java
- org/springframework/core/type/filter/AspectJTypeFilter.java
-
* spring-context
[not-in-debian] Glassfish Debian package is too old
org/springframework/instrument/classloading/glassfish/**
@@ -40,17 +33,12 @@
org/springframework/web/context/request/Faces*
[not-in-debian] no Caucho package in Debbian
org/springframework/remoting/caucho/**
- [not-in-debian] JasperReport is not yet in Debian (#281346)
- org/springframework/ui/jasperreports/**
- org/springframework/web/servlet/view/jasperreports/**
* spring-webmvc-portlet
[non-free] Portlet RI is not DFSG-free
org/springframework/web/portlet/**
* spring-test
- [contrib] AspectJ is in contrib (#480132)
- org/springframework/test/jpa/AbstractAspectjJpaTests.java
[non-free] Portlet RI is not DFSG-free
org/springframework/mock/web/portlet/**
@@ -80,4 +68,7 @@
Use debian ASM2 JAR instead of CGLIB-nodep version
see debian/patches/03_use_debian_asm2.dpatch in debian diff
+AspectJ 1.6.4 instead of AspectJ 1.4
+ see debian/patches/12_aspectj_164.dpatch in debian diff
+
-- Damien Raude-Morvan <drazzib at drazzib.com> Wed, 27 May 2009 20:32:25 +0200
Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/changelog 2009-09-22 22:46:54 UTC (rev 10536)
@@ -1,3 +1,18 @@
+libspring-2.5-java (2.5.6.SEC01-3) UNRELEASED; urgency=low
+
+ * Now build with jasperreports and aspectj helpers
+ - Add Build-Depends on libjasperreports-java and aspectj
+ in debian/control
+ - Add Recommends on aspectj for libspring-aop-2.5-java
+ - Update debian/excludesfiles/{main,tiger,tigermock} accordingly
+ - Add this JARs to debian/classpath-debian for build
+ - Update exclusion list in README.Debian
+ - Remove 07_no_aspectj patch
+ * New 12_aspectj_164 patch for compatibility with AspectJ version in Debian
+ * Bump Standards-Version to 3.8.3: no changes needed
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 14 Sep 2009 23:08:29 +0200
+
libspring-2.5-java (2.5.6.SEC01-2) unstable; urgency=low
[ Damien Raude-Morvan ]
Modified: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/classpath-debian 2009-09-22 22:46:54 UTC (rev 10536)
@@ -28,10 +28,10 @@
usr/share/java/glassfish-javaee.jar
usr/share/java/jsp-api.jar
usr/share/java/bsh.jar
-#usr/share/java/jasperreports.jar
+usr/share/java/jasperreports.jar
usr/share/java/ehcache.jar
-#usr/share/java/aspectjlib.jar
-#usr/share/java/aspectjweaver.jar
+usr/share/java/aspectjrt.jar
+usr/share/java/aspectjweaver.jar
usr/share/java/quartz-all.jar
usr/share/java/tiles-api.jar
usr/share/java/tiles-core.jar
Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/control 2009-09-22 22:46:54 UTC (rev 10536)
@@ -12,7 +12,7 @@
libcglib2.1-java, bsh, glassfish-javaee, glassfish-appserv, libqdox-java, libjarjar-java,
libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java, libvelocity-tools-java,
- glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng
+ glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, aspectj, libjasperreports-java
Standards-Version: 3.8.2
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
@@ -43,7 +43,7 @@
Package: libspring-aop-2.5-java
Architecture: all
Depends: openjdk-6-jre | java2-runtime, libspring-core-2.5-java, libjamon-java, libcommons-pool-java
-Recommends: libaopalliance-java
+Recommends: libaopalliance-java, aspectj
Description: modular Java/J2EE application framework - AOP
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
Modified: trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/main.excludes 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/excludesfiles/main.excludes 2009-09-22 22:46:54 UTC (rev 10536)
@@ -1,8 +1,3 @@
-# spring-aop
-# aspectj is in contrib (#480132)
-org/springframework/aop/aspectj/**
-org/springframework/aop/config/ConfigBeanDefinitionParser.java
-
# spring-context-support
# BEA CommonJ is non-free
org/springframework/scheduling/commonj/**
@@ -24,9 +19,6 @@
org/springframework/web/context/request/Faces*
# no Caucho package in Debbian
org/springframework/remoting/caucho/**
-# JasperReport is not yet in Debian (#281346)
-org/springframework/ui/jasperreports/**
-org/springframework/web/servlet/view/jasperreports/**
# spring-webmvc-portlet
# Portlet RI is not DFSG-free
Modified: trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/excludesfiles/tiger.excludes 2009-09-22 22:46:54 UTC (rev 10536)
@@ -1,9 +1,3 @@
-# spring-aop
-# aspectj is in contrib (#480132)
-org/springframework/aop/aspectj/**
-org/springframework/context/weaving/AspectJWeavingEnabler.java
-org/springframework/core/type/filter/AspectJTypeFilter.java
-
# spring-context
# Glassfish Debian package is too old
org/springframework/instrument/classloading/glassfish/**
Modified: trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/excludesfiles/tigermock.excludes 2009-09-22 22:46:54 UTC (rev 10536)
@@ -1,2 +1 @@
-# aspectj is in contrib (#480132)
-org/springframework/test/jpa/AbstractAspectjJpaTests.java
+
Modified: trunk/libspring-2.5-java/debian/patches/00list
===================================================================
--- trunk/libspring-2.5-java/debian/patches/00list 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/patches/00list 2009-09-22 22:46:54 UTC (rev 10536)
@@ -4,9 +4,10 @@
04_remove_oc4j_weaving
05_remove_glassfish_weaving
06_no_jsf
-07_no_aspectj
+#07_no_aspectj
08_use_glasshfish_toplink
09_junit_45
10_jruby_11
11_servlet_jsp_api
+12_aspectj_164
Deleted: trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch 2009-09-22 21:53:47 UTC (rev 10535)
+++ trunk/libspring-2.5-java/debian/patches/07_no_aspectj.dpatch 2009-09-22 22:46:54 UTC (rev 10536)
@@ -1,87 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_no_aspectj.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: AspectJ is not in main, so disable it
-## DP: <http://bugs.debian.org/480132>
-
- at DPATCH@
-diff -urNad trunk~/src/org/springframework/aop/config/AopConfigUtils.java trunk/src/org/springframework/aop/config/AopConfigUtils.java
---- trunk~/src/org/springframework/aop/config/AopConfigUtils.java 2009-02-14 13:40:10.000000000 +0100
-+++ trunk/src/org/springframework/aop/config/AopConfigUtils.java 2009-02-14 13:40:12.000000000 +0100
-@@ -19,7 +19,7 @@
- import java.util.ArrayList;
- import java.util.List;
-
--import org.springframework.aop.aspectj.autoproxy.AspectJAwareAdvisorAutoProxyCreator;
-+//import org.springframework.aop.aspectj.autoproxy.AspectJAwareAdvisorAutoProxyCreator;
- import org.springframework.aop.framework.autoproxy.InfrastructureAdvisorAutoProxyCreator;
- import org.springframework.beans.factory.config.BeanDefinition;
- import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-@@ -70,7 +70,7 @@
- */
- static {
- APC_PRIORITY_LIST.add(InfrastructureAdvisorAutoProxyCreator.class.getName());
-- APC_PRIORITY_LIST.add(AspectJAwareAdvisorAutoProxyCreator.class.getName());
-+ //APC_PRIORITY_LIST.add(AspectJAwareAdvisorAutoProxyCreator.class.getName());
- APC_PRIORITY_LIST.add(ASPECTJ_ANNOTATION_AUTO_PROXY_CREATOR_CLASS_NAME);
- }
-
-@@ -88,7 +88,8 @@
- }
-
- public static BeanDefinition registerAspectJAutoProxyCreatorIfNecessary(BeanDefinitionRegistry registry, Object source) {
-- return registerOrEscalateApcAsRequired(AspectJAwareAdvisorAutoProxyCreator.class, registry, source);
-+ //return registerOrEscalateApcAsRequired(AspectJAwareAdvisorAutoProxyCreator.class, registry, source);
-+ return null;
- }
-
- public static BeanDefinition registerAspectJAnnotationAutoProxyCreatorIfNecessary(BeanDefinitionRegistry registry) {
-diff -urNad trunk~/src/org/springframework/aop/config/AopNamespaceHandler.java trunk/src/org/springframework/aop/config/AopNamespaceHandler.java
---- trunk~/src/org/springframework/aop/config/AopNamespaceHandler.java 2009-02-14 13:40:10.000000000 +0100
-+++ trunk/src/org/springframework/aop/config/AopNamespaceHandler.java 2009-02-14 13:40:12.000000000 +0100
-@@ -16,7 +16,7 @@
-
- package org.springframework.aop.config;
-
--import org.springframework.aop.aspectj.AspectJExpressionPointcut;
-+//import org.springframework.aop.aspectj.AspectJExpressionPointcut;
- import org.springframework.beans.factory.xml.BeanDefinitionParser;
- import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-
-@@ -61,8 +61,8 @@
- */
- public void init() {
- // In 2.0 XSD as well as in 2.1 XSD.
-- registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
-- registerBeanDefinitionParser("aspectj-autoproxy", new AspectJAutoProxyBeanDefinitionParser());
-+ // registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
-+ // registerBeanDefinitionParser("aspectj-autoproxy", new AspectJAutoProxyBeanDefinitionParser());
- registerBeanDefinitionDecorator("scoped-proxy", new ScopedProxyBeanDefinitionDecorator());
-
- // Only in 2.0 XSD: moved to context namespace as of 2.1
-diff -urNad trunk~/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java trunk/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
---- trunk~/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java 2008-05-19 13:44:56.000000000 +0200
-+++ trunk/tiger/src/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java 2009-02-14 13:40:42.000000000 +0100
-@@ -37,7 +37,7 @@
- import org.springframework.beans.factory.xml.ParserContext;
- import org.springframework.beans.factory.xml.XmlReaderContext;
- import org.springframework.core.type.filter.AnnotationTypeFilter;
--import org.springframework.core.type.filter.AspectJTypeFilter;
-+//import org.springframework.core.type.filter.AspectJTypeFilter;
- import org.springframework.core.type.filter.AssignableTypeFilter;
- import org.springframework.core.type.filter.RegexPatternTypeFilter;
- import org.springframework.core.type.filter.TypeFilter;
-@@ -235,9 +235,9 @@
- else if ("assignable".equals(filterType)) {
- return new AssignableTypeFilter(classLoader.loadClass(expression));
- }
-- else if ("aspectj".equals(filterType)) {
-- return new AspectJTypeFilter(expression, classLoader);
-- }
-+ //else if ("aspectj".equals(filterType)) {
-+ // return new AspectJTypeFilter(expression, classLoader);
-+ //}
- else if ("regex".equals(filterType)) {
- return new RegexPatternTypeFilter(Pattern.compile(expression));
- }
Added: trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch
===================================================================
--- trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch (rev 0)
+++ trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch 2009-09-22 22:46:54 UTC (rev 10536)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_aspectj_164.dpatch by Damien Raude-Morvan <drazzib at drazzib.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Compatibility fix for AspectJ 1.6.4
+## DP: Taken from Spring Framework 3 trunk :
+## DP: <https://fisheye.springsource.org/changelog/spring-framework?cs=1792>
+
+ at DPATCH@
+diff -urNad libspring-2.5-java~/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java libspring-2.5-java/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+--- libspring-2.5-java~/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java 2009-09-20 18:43:57.465941316 +0200
++++ libspring-2.5-java/src/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java 2009-09-20 18:44:48.342337677 +0200
+@@ -58,7 +58,6 @@
+ /** Lazily initialized source location object */
+ private SourceLocation sourceLocation;
+
+-
+ /**
+ * Create a new MethodInvocationProceedingJoinPoint, wrapping the given
+ * Spring ProxyMethodInvocation object.
+@@ -69,6 +68,11 @@
+ this.methodInvocation = methodInvocation;
+ }
+
++ public int getId() {
++ // TODO: It's just an adapter but returning 0 might still have side effects...
++ return 0;
++ }
++
+ public void set$AroundClosure(AroundClosure aroundClosure) {
+ throw new UnsupportedOperationException();
+ }
Property changes on: trunk/libspring-2.5-java/debian/patches/12_aspectj_164.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list