[RPM (6.0)] [DIST generic] acegi-security-1.0.7-3.jpp6
Ralph Apel <[email protected]>
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : acegi-security Relocations: (not relocatable) Version : 1.0.7 Vendor: JPackage Project Release : 3.jpp6 Build Date: Mon 30 Jul 2012 10:12:10 AM CEST Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Libraries Source RPM: (none) Size : 878093 License: Apache License 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://www.acegisecurity.org/ Summary : ACEGI spring security Description : Acegi Security is an open source project that provides comprehensive authentication and authorisation services for enterprise applications based on The Spring Framework. Acegi Security can authenticate using a variety of pluggable providers, and can authorise both web requests and method invocations. Acegi Security provides an integrated security approach across these various targets, and also offers access control list (ACL) capabilities to enable individual domain object instances to be secured. At an implementation level, Acegi Security is managed through Spring's inversion of control and lifecycle services, and actually enforces security using interception through servlet Filters and Java AOP frameworks. In terms of AOP framework support, Acegi Security currently supports AOP Alliance (which is what the Spring IoC container uses internally) and AspectJ, although additional frameworks can be easily supported. --------------- Ralph Apel <r.apel at r-apel.de> 0:1.0.7-3 - rebuild for JPP-6 --------------- acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-nojetty.patch acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-nocas.patch acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-core-pom.patch acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-adapters-cas-pom.patch acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-noresin.patch acegi-security.src: W: source-or-patch-not-bzipped acegi-security-site.patch acegi-security.src: W: source-or-patch-not-bzipped acegisecurity-adapters-jboss-pom.patch acegi-security.src: W: no-signature acegi-security.src:332: W: libdir-macro-in-noarch-package (main package) %attr(-,root,root) %dir %{_libdir}/gcj/%{name} acegi-security.src:333: W: libdir-macro-in-noarch-package (main package) %attr(-,root,root) %{_libdir}/gcj/%{name}/core-%{version}.jar.* acegi-security.src:334: W: libdir-macro-in-noarch-package (main package) %attr(-,root,root) %{_libdir}/gcj/%{name}/tiger-%{version}.jar.* 1 packages and 0 specfiles checked; 0 errors, 11 warnings. --------------- Index: acegi-security-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/acegi-security/acegi-security-jpp-depmap.xml,v retrieving revision 1.1 diff -u -r1.1 acegi-security-jpp-depmap.xml --- acegi-security-jpp-depmap.xml 17 Jul 2008 15:22:13 -0000 1.1 +++ acegi-security-jpp-depmap.xml 30 Jul 2012 08:20:15 -0000 @@ -67,12 +67,12 @@ <dependency> <maven> <groupId>cas</groupId> - <artifactId>casclient</artifactId> - <version>2.0.11</version> + <artifactId>cas</artifactId> + <version>2.0.12</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>cas-client</artifactId> + <artifactId>cas-client2</artifactId> <version>2.0.11</version> </jpp> </dependency> @@ -143,36 +143,475 @@ <dependency> <maven> - <groupId>hessian</groupId> - <artifactId>hessian</artifactId> - <version>3.0.1</version> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.0.1</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>hessian</artifactId> + <groupId>JPP/excalibur</groupId> + <artifactId>avalon-logkit</artifactId> <version>3.0.8</version> </jpp> </dependency> <dependency> <maven> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - <version>1.0.1</version> + <groupId>tomcat</groupId> + <artifactId>cataina</artifactId> + <version>4.1.9</version> </maven> <jpp> - <groupId>JPP/excalibur</groupId> - <artifactId>avalon-logkit</artifactId> - <version>3.0.8</version> + <groupId>JPP/tomcat5</groupId> + <artifactId>catalina</artifactId> + <version>5.5.27</version> </jpp> </dependency> -logkit:logkit:jar:1.0.1 <!-- -1) cas:cas-server:jar:3.0.4 -2) cas:cas:jar:2.0.12 -3) org.springframework:spring-ldap:jar:1.1.2 --> +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>spring</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>aop</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>beans</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>context</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>core</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-dao</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>dao</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-full</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>full</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-hibernate</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>hibernate</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>jdbc</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-mock</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>mock</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>orm</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-parent</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>parent</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-remoting</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>remoting</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-support</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>support</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>web</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>1.2.9</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>webmvc</artifactId> + <version>1.2.9</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-asn1-codec</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-asn1-codec</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-asn1</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-asn1</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-cursor</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-cursor</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-dsml-parser</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-dsml-parser</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-i18n</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-i18n</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-constants</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-constants</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-converter</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-converter</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-jndi</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-jndi</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldif</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldif</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-schema-dao</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-schema-dao</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-schema-loader</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-schema-loader</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-schema-manager</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-schema-manager</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-ldap-schema</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-ldap-schema</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-all</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-all</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.directory.shared</groupId> + <artifactId>shared-parent</artifactId> + <version>0.9.19</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>apacheds-shared-parent</artifactId> + <version>0.9.19</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.springframework</groupId> + <artifactId>spring-ldap</artifactId> + <version>1.3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>spring-ldap-all</artifactId> + <version>1.3.0</version> + </jpp> +</dependency> + + +<dependency> + <maven> + <groupId>hessian</groupId> + <artifactId>hessian</artifactId> + <version>3.1.3</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>hessian-nodep</artifactId> + <version>3.1.3</version> + </jpp> +</dependency> + </dependencies> Index: acegi-security.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/acegi-security/acegi-security.spec,v retrieving revision 1.1 diff -u -r1.1 acegi-security.spec --- acegi-security.spec 17 Jul 2008 15:22:13 -0000 1.1 +++ acegi-security.spec 30 Jul 2012 08:20:15 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2008, JPackage Project +# Copyright (c) 2000-2012, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,13 +30,18 @@ %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} %define full_build %{?_with_full_build:1}%{!?_with_full_build:%{?_without_full_build:0}%{!?_without_full_build:%{?_full_build:%{_full_build}}%{!?_full_build:0}}} +%define _full_build 0 %define section free +%define _binary_payload w9.gzdio +%define _source_payload w9.gzdio +%define _binary_filedigest_algorithm 1 +%define _source_filedigest_algorithm 1 Summary: ACEGI spring security Name: acegi-security Version: 1.0.7 -Release: 1%{dist} +Release: 3%{?dist} Epoch: 0 Group: Development/Libraries License: Apache License 2.0 @@ -54,15 +59,14 @@ Patch3: acegisecurity-adapters-jboss-pom.patch Patch4: acegisecurity-noresin.patch Patch5: acegisecurity-nocas.patch -Patch6: acegisecurity-nosamples.patch -Patch7: acegisecurity-nospringldap.patch +#Patch6: acegisecurity-nosamples.patch +#Patch7: acegisecurity-nospringldap.patch +Patch8: acegi-security-site.patch -#Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}} -#Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} BuildRequires: jpackage-utils >= 0:1.7.5 -BuildRequires: java-devel = 0:1.5.0 +BuildRequires: java-devel >= 0:1.6.0 BuildRequires: junit -BuildRequires: maven2 >= 0:2.0.7 +BuildRequires: maven2 >= 0:2.0.8 BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-assembly BuildRequires: maven2-plugin-clean @@ -80,37 +84,50 @@ BuildRequires: maven2-plugin-war BuildRequires: maven-release BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit3 BuildRequires: docbkx +BuildRequires: jetty6-maven2-plugins +BuildRequires: apacheds-base BuildRequires: apacheds10-core BuildRequires: apacheds-shared-ldap BuildRequires: cas-client +BuildRequires: cas-client2 BuildRequires: ehcache +BuildRequires: hessian-nodep BuildRequires: hsqldb -BuildRequires: jakarta-commons-modeler +BuildRequires: apache-commons-modeler BuildRequires: jakarta-taglibs-standard BuildRequires: jboss4-common BuildRequires: jboss4-security +BuildRequires: jetty5 BuildRequires: slf4j BuildRequires: spring-aop BuildRequires: spring-core -BuildRequires: spring-jdbc +BuildRequires: spring-ldap BuildRequires: spring-mock BuildRequires: spring-remoting BuildRequires: spring-web -BuildRequires: tomcat5-server-lib +BuildRequires: spring2-context-support +BuildRequires: spring2-jdbc +BuildRequires: spring2-tx +BuildRequires: spring2-webmvc +BuildRequires: tomcat5 -Requires: java >= 0:1.5.0 +Requires: java >= 0:1.6.0 Requires: ehcache Requires: jakarta-taglibs-standard Requires: slf4j Requires: spring-aop Requires: spring-core -Requires: spring-jdbc Requires: spring-mock Requires: spring-remoting Requires: spring-web +Requires: spring2-context-support +Requires: spring2-jdbc +Requires: spring2-tx +Requires: spring2-webmvc Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 @@ -146,8 +163,8 @@ %package adapter-catalina Group: Development/Libraries Summary: Catalina adapter for %{name} -Requires: %{name} = %{epoch}:%{version}-%release} -Requires: jakarta-commons-modeler +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: apache-commons-modeler Requires: tomcat5-server-lib %description adapter-catalina @@ -156,7 +173,7 @@ %package adapter-jboss Group: Development/Libraries Summary: JBoss adapter for %{name} -Requires: %{name} = %{epoch}:%{version}-%release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: jboss4-common Requires: jboss4-security @@ -167,7 +184,7 @@ %package adapter-cas Group: Development/Libraries Summary: CAS adapter for %{name} -Requires: %{name} = %{epoch}:%{version}-%release} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: cas-client %description adapter-cas @@ -178,8 +195,6 @@ %package javadoc Group: Development/Documentation Summary: Javadoc for %{name} -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm %description javadoc %{summary}. @@ -195,11 +210,12 @@ %patch2 -b .sav2 %patch3 -b .sav3 %patch4 -b .sav4 -%if ! %{full_build} %patch5 -b .sav5 -%patch6 -b .sav6 -%patch7 -b .sav7 -%endif +#%if ! %{full_build} +#%patch6 -b .sav6 +#%patch7 -b .sav7 +#%endif +%patch8 -b .sav8 %build @@ -214,9 +230,6 @@ mkdir external_repo ln -s %{_javadir} external_repo/JPP -export JAVA_HOME=%{_jvmdir}/java-1.5.0 - - export M2SETTINGS=$(pwd)/maven2-settings.xml export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository @@ -238,7 +251,7 @@ -Daggregate=true \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven2.jpp.depmap.file=%{SOURCE1} \ - javadoc:javadoc + javadoc:aggregate %install rm -rf $RPM_BUILD_ROOT @@ -290,15 +303,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - %post %update_maven_depmap %if %{gcj_support} @@ -322,8 +326,8 @@ %dir %{_javadir}/%{name} %{_javadir}/%{name}/core*.jar %{_javadir}/%{name}/tiger*.jar -%{_datadir}/maven2/poms -%{_mavendepmapfragdir} +%{_datadir}/maven2/poms/* +%{_mavendepmapfragdir}/* %if %{gcj_support} %attr(-,root,root) %dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/core-%{version}.jar.* @@ -343,15 +347,20 @@ %files adapter-cas %defattr(0644,root,root,0755) %{_javadir}/%{name}/cas*.jar - %endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{name} %changelog +* Mon Jul 30 2012 Ralph Apel <r.apel at r-apel.de> 0:1.0.7-3 +- rebuild for JPP-6 + +* Mon Jan 19 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0.7-2.jpp5 +- BR tomcat5 instead of tomcat5-server-lib: poms + * Wed Jul 16 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.7-1.jpp5 - Initial release Index: acegisecurity-adapters-cas-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/acegi-security/acegisecurity-adapters-cas-pom.patch,v retrieving revision 1.1 diff -u -r1.1 acegisecurity-adapters-cas-pom.patch --- acegisecurity-adapters-cas-pom.patch 17 Jul 2008 15:22:13 -0000 1.1 +++ acegisecurity-adapters-cas-pom.patch 30 Jul 2012 08:20:15 -0000 @@ -1,6 +1,6 @@ ---- adapters/cas/pom.xml.sav 2008-07-15 17:43:31.000000000 +0200 -+++ adapters/cas/pom.xml 2008-07-15 17:44:14.000000000 +0200 -@@ -8,6 +8,7 @@ +--- adapters/cas/pom.xml.sav1 2008-04-15 13:38:16.000000000 +0200 ++++ adapters/cas/pom.xml 2012-07-23 14:26:48.057034856 +0200 +@@ -8,11 +8,13 @@ <artifactId>acegi-security-cas</artifactId> <name>Acegi Security System for Spring - CAS adapter</name> <dependencies> @@ -8,11 +8,9 @@ <dependency> <groupId>cas</groupId> <artifactId>cas-server</artifactId> -@@ -18,6 +19,7 @@ - <artifactId>cas</artifactId> - <version>2.0.12</version> + <version>3.0.4</version> </dependency> +--> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <groupId>cas</groupId> + <artifactId>cas</artifactId> Index: acegisecurity-core-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/acegi-security/acegisecurity-core-pom.patch,v retrieving revision 1.1 diff -u -r1.1 acegisecurity-core-pom.patch --- acegisecurity-core-pom.patch 17 Jul 2008 15:22:13 -0000 1.1 +++ acegisecurity-core-pom.patch 30 Jul 2012 08:20:15 -0000 @@ -1,6 +1,6 @@ --- core/pom.xml.sav0 2008-04-15 13:38:16.000000000 +0200 -+++ core/pom.xml 2008-07-16 15:24:36.000000000 +0200 -@@ -36,9 +36,14 @@ ++++ core/pom.xml 2012-07-23 13:32:44.617150597 +0200 +@@ -36,10 +36,15 @@ <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> <optional>true</optional> @@ -14,6 +14,26 @@ + <!-- TODO: Upgrade to 1.2 before 2.0 release --> <dependency> - <!-- TODO: Upgrade to 1.2 before 2.0 release --> - <groupId>org.springframework</groupId> +- <groupId>org.springframework</groupId> ++ <groupId>org.springframework.ldap</groupId> <artifactId>spring-ldap</artifactId> <version>1.1.2</version> + <optional>true</optional> +@@ -82,7 +87,7 @@ + <version>3.1</version> + </dependency> + <dependency> +- <groupId>aspectj</groupId> ++ <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.2</version> + <optional>true</optional> +@@ -157,7 +162,7 @@ + </resource> + <resource> + <directory>${basedir}/src/main/resources</directory> +- <targetPath>/</targetPath> ++ <targetPath>.</targetPath> + <includes> + <include>**/*</include> + </includes> Index: acegisecurity-nocas.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/acegi-security/acegisecurity-nocas.patch,v retrieving revision 1.1 diff -u -r1.1 acegisecurity-nocas.patch --- acegisecurity-nocas.patch 17 Jul 2008 15:22:13 -0000 1.1 +++ acegisecurity-nocas.patch 30 Jul 2012 08:20:15 -0000 @@ -1,5 +1,5 @@ ---- adapters/pom.xml.sav 2008-07-16 13:22:21.000000000 +0200 -+++ adapters/pom.xml 2008-07-16 13:22:42.000000000 +0200 +--- adapters/pom.xml.sav5 2012-07-29 09:15:11.000000000 +0200 ++++ adapters/pom.xml 2012-07-29 09:15:49.431435275 +0200 @@ -21,7 +21,9 @@ </dependency> </dependencies> @@ -9,4 +9,4 @@ +--> <module>catalina</module> <module>jboss</module> - <module>jetty</module> + <!--