[SCM] Spring Security 2.0: Java libraries that provide security services for the Spring Framework branch, master, updated. debian/2.0.6.RELEASE-3
Miguel Landaeta
miguel at miguel.cc
Sat Feb 4 01:09:01 UTC 2012
The following commit has been merged in the master branch:
commit cb112fce79718f44dd932340926dfee6ff7903a4
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Fri Feb 3 19:50:44 2012 -0430
Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones
diff --git a/debian/build.properties b/debian/build.properties
index 1a1cd84..ccb04d5 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -21,12 +21,12 @@ dir.build.spring-security-ntlm=${basedir}/../build/spring-security-ntlm
dir.build.spring-security-portlet=${basedir}/../build/spring-security-portlet
dir.build.spring-security-taglibs=${basedir}/../build/spring-security-taglibs
-classpath.spring-security-core="servlet-api.jar ehcache.jar aopalliance.jar commons-codec.jar commons-collections.jar commons-logging.jar aspectjtools.jar aspectjweaver.jar jaxen.jar spring-aop.jar spring-beans.jar spring-tx.jar spring-jdbc.jar spring-ldap-core.jar spring-test.jar spring-context.jar spring-core.jar spring-web.jar"
-classpath.spring-security-core-tiger="spring-security-core.jar spring-core.jar"
-classpath.spring-security-acl="ehcache.jar commons-logging.jar spring-context.jar spring-tx.jar spring-jdbc.jar spring-security-core.jar spring-core.jar"
-classpath.spring-security-ntlm="servlet-api.jar jcifs.jar commons-logging.jar spring-beans.jar spring-ldap-core.jar spring-core.jar spring-security-core.jar"
-classpath.spring-security-portlet="portlet-api.jar commons-logging-jar spring-beans.jar spring-webmvc.jar spring-webmvc-portlet.jar spring-tx.jar spring-core.jar spring-context.jar spring-security-core.jar"
-classpath.spring-security-taglibs="servlet-api.jar jsp-api.jar commons-logging.jar spring-beans.jar spring-context.jar spring-core.jar spring-web.jar spring-webmvc.jar spring-webmvc-portlet.jar spring-security-core.jar"
+classpath.spring-security-core="servlet-api-2.5.jar ehcache.jar aopalliance.jar commons-codec.jar commons-collections.jar commons-logging.jar aspectjtools.jar aspectjweaver.jar jaxen.jar spring3-aop.jar spring3-beans.jar spring3-tx.jar spring3-jdbc.jar spring-ldap-core.jar spring3-test.jar spring3-context.jar spring3-core.jar spring3-web.jar"
+classpath.spring-security-core-tiger="spring-security-core.jar spring3-core.jar"
+classpath.spring-security-acl="ehcache.jar commons-logging.jar spring3-context.jar spring3-transaction.jar spring3-jdbc.jar spring-security-core.jar spring3-core.jar"
+classpath.spring-security-ntlm="servlet-api.jar jcifs.jar commons-logging.jar spring3-beans.jar spring-ldap-core.jar spring3-core.jar spring-security-core.jar"
+classpath.spring-security-portlet="portlet-api.jar commons-logging-jar spring3-beans.jar spring3-web.jar spring3-web.portlet.jar spring3-transaction.jar spring3-core.jar spring3-context.jar spring-security-core.jar"
+classpath.spring-security-taglibs="servlet-api.jar jsp-api-2.1.jar commons-logging.jar spring3-beans.jar spring3-context.jar spring3-core.jar spring3-web.jar spring3-web.portlet.jar spring-security-core.jar"
dist.file.spring-security-core=${basedir}/../build/dist/spring-security-core-${version}.jar
dist.file.spring-security-core-tiger=${basedir}/../build/dist/spring-security-core-tiger-${version}.jar
diff --git a/debian/changelog b/debian/changelog
index 9233d52..11d5339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libspring-security-2.0-java (2.0.6.RELEASE-3) unstable; urgency=low
+
+ * Replace dependencies on Spring Framework 2.5 libraries with 3.0 ones.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Fri, 03 Feb 2012 19:50:02 -0430
+
libspring-security-2.0-java (2.0.6.RELEASE-2) unstable; urgency=low
[Miguel Landaeta]
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 3fc945c..efd66f5 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -7,15 +7,15 @@ usr/share/java/commons-logging.jar
usr/share/java/ehcache.jar
usr/share/java/jaxen.jar
usr/share/java/servlet-api-2.5.jar
-usr/share/java/spring-aop.jar
-usr/share/java/spring-beans.jar
-usr/share/java/spring-context.jar
-usr/share/java/spring-core.jar
-usr/share/java/spring-jdbc.jar
+usr/share/java/spring3-aop.jar
+usr/share/java/spring3-beans.jar
+usr/share/java/spring3-context.jar
+usr/share/java/spring3-core.jar
+usr/share/java/spring3-jdbc.jar
usr/share/java/spring-ldap-core.jar
-usr/share/java/spring-test.jar
-usr/share/java/spring-tx.jar
-usr/share/java/spring-web.jar
+usr/share/java/spring3-test.jar
+usr/share/java/spring3-transaction.jar
+usr/share/java/spring3-web.jar
# spring-security-core-tiger
usr/share/java/jboss-ejb3x.jar
@@ -24,7 +24,7 @@ usr/share/java/jboss-ejb3x.jar
usr/share/java/jcifs.jar
# spring-security-portlet
-usr/share/java/spring-webmvc-portlet.jar
+usr/share/java/spring3-web.portlet.jar
usr/share/java/portlet-api.jar
# spring-security-taglibs
diff --git a/debian/control b/debian/control
index bb0a593..32397c6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Priority: optional
Build-Depends: debhelper (>= 7.0.50), ant, default-jdk, javahelper,
libaopalliance-java, aspectj, libcommons-codec-java,
libcommons-collections-java, libcommons-logging-java, libehcache-java,
- libjaxen-java, libspring-aop-2.5-java, libspring-beans-2.5-java,
- libspring-context-2.5-java, libspring-core-2.5-java, libspring-ldap-java,
- libspring-test-2.5-java, libspring-tx-2.5-java, libspring-web-2.5-java,
- libjboss-ejb3x-java, libjcifs-java, libspring-webmvc-portlet-2.5-java,
- libspring-jdbc-2.5-java, libportlet-api-2.0-spec-java, libservlet2.5-java,
+ libjaxen-java, libspring-aop-java, libspring-beans-java,
+ libspring-context-java, libspring-core-java, libspring-ldap-java,
+ libspring-test-java, libspring-transaction-java, libspring-web-java,
+ libjboss-ejb3x-java, libjcifs-java, libspring-web-portlet-java,
+ libspring-jdbc-java, libportlet-api-2.0-spec-java, libservlet2.5-java,
xmlto, fop
Standards-Version: 3.9.2
Homepage: http://static.springsource.org/spring-security/site/index.html
@@ -22,10 +22,10 @@ Package: libspring-security-core-2.0-java
Architecture: all
Depends: libservlet2.5-java, libehcache-java, libaopalliance-java,
libcommons-codec-java, libcommons-collections-java, libcommons-logging-java,
- aspectj, libjaxen-java, libspring-aop-2.5-java, libspring-beans-2.5-java,
- libspring-tx-2.5-java, libspring-jdbc-2.5-java, libspring-ldap-java,
- libspring-test-2.5-java, libspring-context-2.5-java, libspring-core-2.5-java,
- libspring-web-2.5-java, ${misc:Depends}
+ aspectj, libjaxen-java, libspring-aop-java, libspring-beans-java,
+ libspring-transaction-java, libspring-jdbc-java, libspring-ldap-java,
+ libspring-test-java, libspring-context-java, libspring-core-java,
+ libspring-web--java, ${misc:Depends}
Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
Description: modular Java/J2EE application security framework - Core
Spring Security is a Java/Java EE framework that provides advanced
@@ -55,9 +55,9 @@ Description: modular Java/J2EE application security framework - Core
Package: libspring-security-acl-2.0-java
Architecture: all
-Depends: libehcache-java, libcommons-logging-java, libspring-context-2.5-java,
- libspring-tx-2.5-java, libspring-jdbc-2.5-java,
- libspring-security-core-2.0-java, libspring-core-2.5-java, ${misc:Depends}
+Depends: libehcache-java, libcommons-logging-java, libspring-context-java,
+ libspring-transaction-java, libspring-jdbc-java,
+ libspring-security-core-2.0-java, libspring-core-java, ${misc:Depends}
Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
Description: modular Java/J2EE application security framework - ACL
Spring Security is a Java/Java EE framework that provides advanced
@@ -88,7 +88,7 @@ Description: modular Java/J2EE application security framework - ACL
Package: libspring-security-ntlm-2.0-java
Architecture: all
Depends: libservlet2.5-java, libjcifs-java, libcommons-logging-java,
- libspring-beans-2.5-java, libspring-ldap-java, libspring-core-2.5-java,
+ libspring-beans-java, libspring-ldap-java, libspring-core-java,
libspring-security-core-2.0-java, ${misc:Depends}
Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
Description: modular Java/J2EE application security framework - NTLM
@@ -120,9 +120,9 @@ Description: modular Java/J2EE application security framework - NTLM
Package: libspring-security-portlet-2.0-java
Architecture: all
Depends: libportlet-api-2.0-spec-java, libcommons-logging-java,
- libspring-beans-2.5-java, libspring-webmvc-2.5-java,
- libspring-webmvc-portlet-2.5-java, libspring-tx-2.5-java,
- libspring-core-2.5-java, libspring-context-2.5-java,
+ libspring-beans-java, libspring-web-java,
+ libspring-web-portlet-java, libspring-transaction-java,
+ libspring-core-java, libspring-context-java,
libspring-security-core-2.0-java, ${misc:Depends}
Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
Description: modular Java/J2EE application security framework - Portlet
@@ -154,10 +154,9 @@ Description: modular Java/J2EE application security framework - Portlet
Package: libspring-security-taglibs-2.0-java
Architecture: all
-Depends: libservlet2.5-java, libcommons-logging-java, libspring-beans-2.5-java,
- libspring-context-2.5-java, libspring-core-2.5-java, libspring-web-2.5-java,
- libspring-webmvc-2.5-java, libspring-webmvc-portlet-2.5-java,
- libspring-security-core-2.0-java, ${misc:Depends}
+Depends: libservlet2.5-java, libcommons-logging-java, libspring-beans-java,
+ libspring-context-java, libspring-core-java, libspring-web-java,
+ libspring-web-portlet-java, libspring-security-core-2.0-java, ${misc:Depends}
Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
Description: modular Java/J2EE application security framework - Taglibs
Spring Security is a Java/Java EE framework that provides advanced
diff --git a/debian/patches/02_spring3.diff b/debian/patches/02_spring3.diff
new file mode 100644
index 0000000..70f012b
--- /dev/null
+++ b/debian/patches/02_spring3.diff
@@ -0,0 +1,196 @@
+Description: Add compatibility with Spring 3.0 Framework
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2012-02-03
+
+--- /dev/null
++++ libspring-security-2.0-java-2.0.6.RELEASE/dist/spring-security-core/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);
++
++}
+diff --git a/dist/spring-security-portlet/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java b/dist/spring-security-portlet/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
+index 1ddec5c..4c4707e 100644
+--- a/dist/spring-security-portlet/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
++++ b/dist/spring-security-portlet/org/springframework/security/context/PortletSessionContextIntegrationInterceptor.java
+@@ -26,6 +26,10 @@ import javax.portlet.PortletResponse;
+ import javax.portlet.PortletSession;
+ import javax.portlet.RenderRequest;
+ import javax.portlet.RenderResponse;
++import javax.portlet.EventRequest;
++import javax.portlet.EventResponse;
++import javax.portlet.ResourceRequest;
++import javax.portlet.ResourceResponse;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -434,4 +438,29 @@ public class PortletSessionContextIntegrationInterceptor
+ this.useApplicationScopePortletSession = useApplicationScopePortletSession;
+ }
+
++ public void afterEventCompletion(EventRequest request, EventResponse response, Object handler, Exception ex)
++ throws Exception {
++ throw new UnsupportedOperationException("afterEventCompletion");
++ }
++
++ public boolean preHandleEvent(EventRequest request, EventResponse response, Object handler)
++ throws Exception {
++ throw new UnsupportedOperationException("preHandleEvent");
++ }
++
++ public void afterResourceCompletion(ResourceRequest request, ResourceResponse response, Object handler, Exception ex)
++ throws Exception {
++ throw new UnsupportedOperationException("afterResourceCompletation");
++ }
++
++ public void postHandleResource(ResourceRequest request, ResourceResponse response, Object handler, ModelAndView modelAndView)
++ throws Exception {
++ throw new UnsupportedOperationException("postHandleResource");
++ }
++
++ public boolean preHandleResource(ResourceRequest request, ResourceResponse response, Object handler)
++ throws Exception {
++ throw new UnsupportedOperationException("preHandleResource");
++ }
++
+ }
+diff --git a/dist/spring-security-portlet/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java b/dist/spring-security-portlet/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
+index 06307c1..7572e4b 100644
+--- a/dist/spring-security-portlet/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
++++ b/dist/spring-security-portlet/org/springframework/security/ui/portlet/PortletProcessingInterceptor.java
+@@ -29,6 +29,10 @@ import javax.portlet.PortletResponse;
+ import javax.portlet.PortletSession;
+ import javax.portlet.RenderRequest;
+ import javax.portlet.RenderResponse;
++import javax.portlet.EventRequest;
++import javax.portlet.EventResponse;
++import javax.portlet.ResourceRequest;
++import javax.portlet.ResourceResponse;
+
+ import org.springframework.security.Authentication;
+ import org.springframework.security.AuthenticationException;
+@@ -319,4 +323,29 @@ public class PortletProcessingInterceptor implements HandlerInterceptor, Initial
+ public void setUseAuthTypeAsCredentials(boolean useAuthTypeAsCredentials) {
+ this.useAuthTypeAsCredentials = useAuthTypeAsCredentials;
+ }
++
++ public void afterEventCompletion(EventRequest request, EventResponse response, Object handler, Exception ex)
++ throws Exception {
++ throw new UnsupportedOperationException("afterEventCompletion");
++ }
++
++ public boolean preHandleEvent(EventRequest request, EventResponse response, Object handler)
++ throws Exception {
++ throw new UnsupportedOperationException("preHandleEvent");
++ }
++
++ public void afterResourceCompletion(ResourceRequest request, ResourceResponse response, Object handler, Exception ex)
++ throws Exception {
++ throw new UnsupportedOperationException("afterResourceCompletion");
++ }
++
++ public void postHandleResource(ResourceRequest request, ResourceResponse response, Object handler, ModelAndView modelAndView)
++ throws Exception {
++ throw new UnsupportedOperationException("postHandleResource");
++ }
++
++ public boolean preHandleResource(ResourceRequest request, ResourceResponse response, Object handler)
++ throws Exception {
++ throw new UnsupportedOperationException("preHandleResource");
++ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 81eee0c..99ae0a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_fix_compilation.diff
+02_spring3.diff
diff --git a/debian/rules b/debian/rules
index 8ab810d..845e8b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh --with javahelper $@
+ dh $@ --with javahelper
override_dh_auto_build:
dh_auto_build
--
Spring Security 2.0: Java libraries that provide security services for the Spring Framework
More information about the pkg-java-commits
mailing list