[SCM] acegi-security packaging branch, master, updated. debian/1.0.7-2-4-g0c73d80
James Page
james.page at ubuntu.com
Tue Jan 31 12:49:47 UTC 2012
The following commit has been merged in the master branch:
commit 11d017f4eaccf92b880e523d7a8926310e300ca6
Author: James Page <james.page at ubuntu.com>
Date: Mon Jan 30 22:26:59 2012 +0000
Team upload.
* Team upload.
* Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
* Add spring3.patch. (Closes: #655903).
diff --git a/debian/changelog b/debian/changelog
index d4ae52e..2a57c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+acegi-security (1.0.7-3) unstable; urgency=low
+
+ * Team upload.
+ * Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
+ * Add spring3.patch. (Closes: #655903).
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sun, 22 Jan 2012 18:56:56 -0430
+
acegi-security (1.0.7-2) unstable; urgency=low
[James Page]
diff --git a/debian/control b/debian/control
index 95a1db9..e1356a7 100644
--- a/debian/control
+++ b/debian/control
@@ -30,16 +30,15 @@ Build-Depends-Indep:
liboro-java,
libservlet2.5-java,
libservlet2.5-java-doc,
- libspring-aop-2.5-java,
- libspring-context-2.5-java,
- libspring-context-support-2.5-java,
- libspring-core-2.5-java,
- libspring-jdbc-2.5-java,
+ libspring-aop-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
+ libspring-jdbc-java,
libspring-ldap-java (>= 1.3.1),
libspring-ldap-java-doc,
- libspring-test-2.5-java,
- libspring-web-2.5-java,
- libspring-webmvc-2.5-java
+ libspring-test-java,
+ libspring-web-java,
Standards-Version: 3.9.2
Homepage: http://acegisecurity.org/
Vcs-Git: git://git.debian.org/git/pkg-java/acegi-security.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 32f3a8f..f71527b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,10 +23,10 @@ net.sf.ehcache s/ehcache/ehcache-core/ * s/.*/debian/ * *
s/aspectj/org.aspectj/ aspectjrt * s/.*/debian/ * *
s/javax\.servlet/javax.servlet.jsp/ jsp-api * s/.*/2.1/ * *
s/org\.springframework/org.springframework.ldap/ s/spring-ldap/spring-ldap-core/ * s/1\..*/debian/ * *
-org.springframework s/spring-remoting/spring-context/ * s/.*/2.x/ * *
-org.springframework s/spring-support/spring-context-support/ * s/.*/2.x/ * *
-org.springframework s/spring-mock/spring-test/ * s/.*/2.x/ * *
-org.springframework * * s/.*/2.x/ * *
+org.springframework s/spring-remoting/spring-context/ * s/.*/3.x/ * *
+org.springframework s/spring-support/spring-context-support/ * s/.*/3.x/ * *
+org.springframework s/spring-mock/spring-test/ * s/.*/3.x/ * *
+org.springframework * * s/.*/3.x/ * *
org.springframework.security * * s/2\..*/2.x/ * *
s/org\.apache\.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
s/org\.apache\.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index aecc074..26c2429 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -31,18 +31,6 @@ Index: acegi-security/pom.xml
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
-@@ -542,6 +544,11 @@
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
-+ <dependency>
-+ <groupId>org.springframework</groupId>
-+ <artifactId>spring-webmvc</artifactId>
-+ <version>${spring.version}</version>
-+ </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
@@ -563,7 +570,7 @@
</dependencyManagement>
@@ -68,16 +56,7 @@ Index: acegi-security/core/pom.xml
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
-@@ -32,10 +37,21 @@
- <artifactId>spring-web</artifactId>
- <optional>true</optional>
- </dependency>
-+ <dependency>
-+ <groupId>org.springframework</groupId>
-+ <artifactId>spring-webmvc</artifactId>
-+ <optional>true</optional>
-+ </dependency>
- <dependency>
+@@ -36,6 +41,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<optional>true</optional>
@@ -90,7 +69,7 @@ Index: acegi-security/core/pom.xml
</dependency>
<dependency>
<!-- TODO: Upgrade to 1.2 before 2.0 release -->
-@@ -157,7 +173,7 @@
+@@ -157,7 +168,7 @@
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
diff --git a/debian/patches/series b/debian/patches/series
index 9df7300..0adae42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
build.patch
no_cas.patch
+spring3.patch
diff --git a/debian/patches/spring3.patch b/debian/patches/spring3.patch
new file mode 100644
index 0000000..fb971ce
--- /dev/null
+++ b/debian/patches/spring3.patch
@@ -0,0 +1,127 @@
+Description: Add compatibility with Spring 3.0 Framework
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/655903
+Forwarded: no
+Last-Update: 2012-01-22
+
+--- acegi-security-1.0.7.orig/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java
++++ acegi-security-1.0.7/core/src/main/java/org/acegisecurity/ui/rememberme/TokenBasedRememberMeServices.java
+@@ -39,7 +39,7 @@ import org.springframework.beans.factory
+ import org.springframework.context.ApplicationContext;
+ import org.springframework.util.Assert;
+ import org.springframework.util.StringUtils;
+-import org.springframework.web.bind.RequestUtils;
++import org.springframework.web.bind.ServletRequestUtils;
+
+ /**
+ * Identifies previously remembered users by a Base-64 encoded cookie.
+@@ -357,7 +357,7 @@ public class TokenBasedRememberMeService
+ return true;
+ }
+
+- return RequestUtils.getBooleanParameter(request, parameter, false);
++ return ServletRequestUtils.getBooleanParameter(request, parameter, false);
+ }
+
+ public void loginSuccess(HttpServletRequest request, HttpServletResponse response,
+--- /dev/null
++++ acegi-security-1.0.7/core/src/main/java/org/springframework/metadata/Attributes.java
+@@ -0,0 +1,98 @@
++/*
++ * Copyright 2002-2005 the original author or authors.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++package org.springframework.metadata;
++
++import java.lang.reflect.Field;
++import java.lang.reflect.Method;
++import java.util.Collection;
++
++/**
++ * Interface for accessing attributes at runtime. This is a facade,
++ * which can accommodate any attributes API such as Jakarta Commons Attributes,
++ * or (possibly in future) a Spring attributes implementation.
++ *
++ * <p>The purpose of using this interface is to decouple Spring code from any
++ * specific attributes implementation. Even once JSR-175 is available, there
++ * is still value in such a facade interface, as it allows for hierarchical
++ * attribute sources: for example, an XML file or properties file might override
++ * some attributes defined in source-level metadata with JSR-175 or another framework.
++ *
++ * @author Mark Pollack
++ * @author Rod Johnson
++ * @since 30.09.2003
++ * @see org.springframework.metadata.commons.CommonsAttributes
++ */
++public interface Attributes {
++
++ /**
++ * Return the class attributes of the target class.
++ * @param targetClass the class that contains attribute information
++ * @return a collection of attributes, possibly an empty collection, never <code>null</code>
++ */
++ Collection getAttributes(Class targetClass);
++
++ /**
++ * Return the class attributes of the target class of a given type.
++ * <p>The class attributes are filtered by providing a <code>Class</code>
++ * reference to indicate the type to filter on. This is useful if you know
++ * the type of the attribute you are looking for and don't want to sort
++ * through the unfiltered Collection yourself.
++ * @param targetClass the class that contains attribute information
++ * @param filter specify that only this type of class should be returned
++ * @return return only the Collection of attributes that are of the filter type
++ */
++ Collection getAttributes(Class targetClass, Class filter);
++
++ /**
++ * Return the method attributes of the target method.
++ * @param targetMethod the method that contains attribute information
++ * @return a Collection of attributes, possibly an empty Collection, never <code>null</code>
++ */
++ Collection getAttributes(Method targetMethod);
++
++ /**
++ * Return the method attributes of the target method of a given type.
++ * <p>The method attributes are filtered by providing a <code>Class</code>
++ * reference to indicate the type to filter on. This is useful if you know
++ * the type of the attribute you are looking for and don't want to sort
++ * through the unfiltered Collection yourself.
++ * @param targetMethod the method that contains attribute information
++ * @param filter specify that only this type of class should be returned
++ * @return a Collection of attributes, possibly an empty Collection, never <code>null</code>
++ */
++ Collection getAttributes(Method targetMethod, Class filter);
++
++ /**
++ * Return the field attributes of the target field.
++ * @param targetField the field that contains attribute information
++ * @return a Collection of attribute, possibly an empty Collection, never <code>null</code>
++ */
++ Collection getAttributes(Field targetField);
++
++ /**
++ * Return the field attributes of the target method of a given type.
++ * <p>The field attributes are filtered by providing a <code>Class</code>
++ * reference to indicate the type to filter on. This is useful if you know
++ * the type of the attribute you are looking for and don't want to sort
++ * through the unfiltered Collection yourself.
++ * @param targetField the field that contains attribute information
++ * @param filter specify that only this type of class should be returned
++ * @return a Collection of attributes, possibly an empty Collection, never <code>null</code>
++ */
++ Collection getAttributes(Field targetField, Class filter);
++
++}
--
acegi-security packaging
More information about the pkg-java-commits
mailing list