[springframework-security] Initial import (#882477).
gil
gil at fedoraproject.org
Mon Jun 3 16:15:19 UTC 2013
commit e7382dc4a850624ed52af82e2e23ca8e46a8b905
Author: gil <puntogil at libero.it>
Date: Mon Jun 3 18:14:56 2013 +0200
Initial import (#882477).
.gitignore | 1 +
sources | 1 +
spring-security-acl-3.1.4.RELEASE.pom | 98 +++
spring-security-cas-3.1.4.RELEASE.pom | 104 +++
spring-security-config-3.1.4.RELEASE.pom | 112 ++++
spring-security-core-3.1.4.RELEASE.pom | 120 ++++
spring-security-crypto-3.1.4.RELEASE.pom | 55 ++
spring-security-ldap-3.1.4.RELEASE.pom | 152 +++++
spring-security-openid-3.1.4.RELEASE.pom | 121 ++++
spring-security-remoting-3.1.4.RELEASE.pom | 85 +++
spring-security-taglibs-3.1.4.RELEASE.pom | 116 ++++
spring-security-web-3.1.4.RELEASE.pom | 115 ++++
...-security-3.1.3.RELEASE-aggregate-javadoc.patch | 20 +
...security-3.1.3.RELEASE-config-groovy-deps.patch | 14 +
...LEASE-config-remove-unavailable-test-deps.patch | 16 +
...work-security-3.1.3.RELEASE-osgi-manifest.patch | 255 ++++++++
...curity-3.1.3.RELEASE-web-FilterInvocation.patch | 112 ++++
springframework-security-3.1.4.RELEASE-build.patch | 654 ++++++++++++++++++++
...k-security-3.1.4.RELEASE-ldap-apacheds155.patch | 68 ++
springframework-security.spec | 299 +++++++++
20 files changed, 2518 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..4304a9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/3.1.4.RELEASE.tar.gz
diff --git a/sources b/sources
index e69de29..a6512bf 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e9b3d52d6d7c026e93337009e5abfa3f 3.1.4.RELEASE.tar.gz
diff --git a/spring-security-acl-3.1.4.RELEASE.pom b/spring-security-acl-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..62e26c2
--- /dev/null
+++ b/spring-security-acl-3.1.4.RELEASE.pom
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-acl</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-acl</name>
+ <description>spring-security-acl</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-cas-3.1.4.RELEASE.pom b/spring-security-cas-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..cc01c26
--- /dev/null
+++ b/spring-security-cas-3.1.4.RELEASE.pom
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-cas</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-cas</name>
+ <description>spring-security-cas</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jasig.cas.client</groupId>
+ <artifactId>cas-client-core</artifactId>
+ <version>3.1.12</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-config-3.1.4.RELEASE.pom b/spring-security-config-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..75257c6
--- /dev/null
+++ b/spring-security-config-3.1.4.RELEASE.pom
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-config</name>
+ <description>spring-security-config</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.10</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-core-3.1.4.RELEASE.pom b/spring-security-core-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..3a8f668
--- /dev/null
+++ b/spring-security-core-3.1.4.RELEASE.pom
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-core</name>
+ <description>spring-security-core</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.10</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-crypto-3.1.4.RELEASE.pom b/spring-security-crypto-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..8e67d40
--- /dev/null
+++ b/spring-security-crypto-3.1.4.RELEASE.pom
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-crypto</name>
+ <description>spring-security-crypto</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-ldap-3.1.4.RELEASE.pom b/spring-security-ldap-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..63b22a7
--- /dev/null
+++ b/spring-security-ldap-3.1.4.RELEASE.pom
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-ldap</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-ldap</name>
+ <description>spring-security-ldap</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-jndi</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ <version>4.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-entry</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>0.9.15</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap-core</artifactId>
+ <version>1.3.1.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-beans</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-core</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-tx</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-openid-3.1.4.RELEASE.pom b/spring-security-openid-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..1e5523b
--- /dev/null
+++ b/spring-security-openid-3.1.4.RELEASE.pom
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-openid</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-openid</name>
+ <description>spring-security-openid</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ <version>0.9.6</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>guice</artifactId>
+ <groupId>com.google.code.guice</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-remoting-3.1.4.RELEASE.pom b/spring-security-remoting-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..cf804be
--- /dev/null
+++ b/spring-security-remoting-3.1.4.RELEASE.pom
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-remoting</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-remoting</name>
+ <description>spring-security-remoting</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-taglibs-3.1.4.RELEASE.pom b/spring-security-taglibs-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..e0ef70f
--- /dev/null
+++ b/spring-security-taglibs-3.1.4.RELEASE.pom
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-taglibs</name>
+ <description>spring-security-taglibs</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-acl</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/spring-security-web-3.1.4.RELEASE.pom b/spring-security-web-3.1.4.RELEASE.pom
new file mode 100644
index 0000000..bbeb8d5
--- /dev/null
+++ b/spring-security-web-3.1.4.RELEASE.pom
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <name>spring-security-web</name>
+ <description>spring-security-web</description>
+ <url>http://springsource.org/spring-security</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/</url>
+ </organization>
+ <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>
+ <developers>
+ <developer>
+ <id>rwinch</id>
+ <name>Rob Winch</name>
+ <email>rwinch at vmware.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-security</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-security</developerConnection>
+ <url>https://github.com/SpringSource/spring-security</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.0.7.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>3.1.4.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/springframework-security-3.1.3.RELEASE-aggregate-javadoc.patch b/springframework-security-3.1.3.RELEASE-aggregate-javadoc.patch
new file mode 100644
index 0000000..286e210
--- /dev/null
+++ b/springframework-security-3.1.3.RELEASE-aggregate-javadoc.patch
@@ -0,0 +1,20 @@
+--- build.gradle 2012-11-30 07:48:28.758136242 +0100
++++ build.gradle-gil 2012-11-30 10:44:30.969133525 +0100
+@@ -77,6 +77,17 @@
+
+ //apply from: "$rootDir/gradle/ide-integration.gradle"
+
++task javadoc(type: Javadoc) {
++ source subprojects.collect { project ->
++ project.sourceSets.main.allJava
++ }
++ destinationDir = new File(buildDir, 'javadoc')
++ // Might need a classpath
++ classpath = files(subprojects.collect { project ->
++ project.sourceSets.main.compileClasspath
++ })
++}
++
+ task wrapper(type: Wrapper) {
+ gradleVersion = '1.2'
+ }
diff --git a/springframework-security-3.1.3.RELEASE-config-groovy-deps.patch b/springframework-security-3.1.3.RELEASE-config-groovy-deps.patch
new file mode 100644
index 0000000..3539660
--- /dev/null
+++ b/springframework-security-3.1.3.RELEASE-config-groovy-deps.patch
@@ -0,0 +1,14 @@
+--- config/config.gradle 2012-11-30 14:11:31.866931596 +0100
++++ config/config.gradle-gil 2012-11-30 14:11:39.154492149 +0100
+@@ -23,7 +23,10 @@
+
+ compile "javax.servlet:tomcat-servlet-3.0-api:2.5"
+
+- groovy 'org.codehaus.groovy:groovy:1.8.7'
++ groovy 'org.codehaus.groovy:groovy:1.8.7',
++ 'asm:objectweb-asm/asm-all:3.3.1',
++ 'antlr:antlr:2.7.7',
++ 'commons-cli:commons-cli:1.2'
+
+ testCompile project(':spring-security-ldap'),
+ project(':spring-security-openid'),
diff --git a/springframework-security-3.1.3.RELEASE-config-remove-unavailable-test-deps.patch b/springframework-security-3.1.3.RELEASE-config-remove-unavailable-test-deps.patch
new file mode 100644
index 0000000..9e48689
--- /dev/null
+++ b/springframework-security-3.1.3.RELEASE-config-remove-unavailable-test-deps.patch
@@ -0,0 +1,16 @@
+--- config/config.gradle 2012-11-30 14:21:03.973384445 +0100
++++ config/config.gradle-gil 2012-11-30 14:21:08.227129125 +0100
+@@ -28,11 +28,10 @@
+ 'antlr:antlr:2.7.7',
+ 'commons-cli:commons-cli:1.2'
+
+- testCompile project(':spring-security-ldap'),
+- project(':spring-security-openid'),
++ testCompile project(':spring-security-openid'),
+ project(':spring-security-core').sourceSets.test.output,
+ 'javax.annotation:geronimo-annotation:1.0',
+- "org.springframework.ldap:spring-ldap-core:$springLdapVersion",
++ "org.springframework.ldap:spring-ldap/spring-ldap-core:$springLdapVersion",
+ "org.springframework:springframework/spring-expression:$springVersion",
+ "org.springframework:springframework/spring-jdbc:$springVersion",
+ "org.springframework:springframework/spring-tx:$springVersion",
diff --git a/springframework-security-3.1.3.RELEASE-osgi-manifest.patch b/springframework-security-3.1.3.RELEASE-osgi-manifest.patch
new file mode 100644
index 0000000..bde1159
--- /dev/null
+++ b/springframework-security-3.1.3.RELEASE-osgi-manifest.patch
@@ -0,0 +1,255 @@
+diff -Nru springframework-security-3.1.3.RELEASE/acl/acl.gradle springframework-security-3.1.3.RELEASE-gil/acl/acl.gradle
+--- springframework-security-3.1.3.RELEASE/acl/acl.gradle 2012-11-30 12:01:54.627136689 +0100
++++ springframework-security-3.1.3.RELEASE-gil/acl/acl.gradle 2012-11-30 12:01:32.021437872 +0100
+@@ -15,4 +15,20 @@
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion",
+ "org.mockito:mockito:1.8.5"
++}
++
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.acls'
++ attributes 'Bundle-Name': 'Spring Security Acls'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.acls.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.acls'
++ instruction 'Implementation-Version', version
++ }
+ }
+\ Manca newline alla fine del file
+diff -Nru springframework-security-3.1.3.RELEASE/cas/cas.gradle springframework-security-3.1.3.RELEASE-gil/cas/cas.gradle
+--- springframework-security-3.1.3.RELEASE/cas/cas.gradle 2012-11-30 12:01:54.631136462 +0100
++++ springframework-security-3.1.3.RELEASE-gil/cas/cas.gradle 2012-11-30 12:05:00.038445274 +0100
+@@ -9,4 +9,19 @@
+ "net.sf.ehcache:ehcache-core:$ehcacheVersion"
+
+ compile 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+-}
+\ Manca newline alla fine del file
++}
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.cas'
++ attributes 'Bundle-Name': 'Spring Security CAS'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.cas.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.cas'
++ instruction 'Implementation-Version', version
++ }
++}
+\ Manca newline alla fine del file
+diff -Nru springframework-security-3.1.3.RELEASE/config/config.gradle springframework-security-3.1.3.RELEASE-gil/config/config.gradle
+--- springframework-security-3.1.3.RELEASE/config/config.gradle 2012-11-30 12:01:54.632136405 +0100
++++ springframework-security-3.1.3.RELEASE-gil/config/config.gradle 2012-11-30 12:08:02.763899076 +0100
+@@ -48,6 +48,22 @@
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion",
+ "cglib:cglib:2.2"
++}
++
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.config'
++ attributes 'Bundle-Name': 'Spring Security Namespace Configuration'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.config.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.config'
++ instruction 'Implementation-Version', version
++ }
+ }
+
+ test {
+@@ -57,3 +73,4 @@
+ integrationTest {
+ systemProperties['apacheDSWorkDir'] = "${buildDir}/apacheDSWork"
+ }
++
+diff -Nru springframework-security-3.1.3.RELEASE/core/core.gradle springframework-security-3.1.3.RELEASE-gil/core/core.gradle
+--- springframework-security-3.1.3.RELEASE/core/core.gradle 2012-11-30 12:01:54.633136348 +0100
++++ springframework-security-3.1.3.RELEASE-gil/core/core.gradle 2012-11-30 12:10:30.768347867 +0100
+@@ -39,6 +39,23 @@
+
+ //sourceJar.from cryptoProject.sourceSets.main.java
+
++
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.core'
++ attributes 'Bundle-Name': 'Spring Security Core'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.core.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.core'
++ instruction 'Implementation-Version', version
++ }
++}
++
+ test {
+ systemProperties['springSecurityVersion'] = version
+ systemProperties['springVersion'] = springVersion
+diff -Nru springframework-security-3.1.3.RELEASE/crypto/crypto.gradle springframework-security-3.1.3.RELEASE-gil/crypto/crypto.gradle
+--- springframework-security-3.1.3.RELEASE/crypto/crypto.gradle 2012-10-09 00:17:42.000000000 +0200
++++ springframework-security-3.1.3.RELEASE-gil/crypto/crypto.gradle 2012-11-30 12:13:28.673063001 +0100
+@@ -4,6 +4,22 @@
+ // isJdk6 = jdkVersion >= '1.6'
+ int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
+
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.crypto'
++ attributes 'Bundle-Name': 'Spring Security Crypto'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.crypto.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.crypto'
++ instruction 'Implementation-Version', version
++ }
++}
++
+ test {
+ if (maxAESKeySize < 256) {
+ println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
+diff -Nru springframework-security-3.1.3.RELEASE/ldap/ldap.gradle springframework-security-3.1.3.RELEASE-gil/ldap/ldap.gradle
+--- springframework-security-3.1.3.RELEASE/ldap/ldap.gradle 2012-11-30 12:01:54.634136291 +0100
++++ springframework-security-3.1.3.RELEASE-gil/ldap/ldap.gradle 2012-11-30 12:16:56.469024903 +0100
+@@ -29,6 +29,22 @@
+ }
+ }
+
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.ldap'
++ attributes 'Bundle-Name': 'Spring Security LDAP'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.ldap.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.ldap'
++ instruction 'Implementation-Version', version
++ }
++}
++
+ integrationTest {
+ include('**/ApacheDSServerIntegrationTests.class')
+ // exclude('**/OpenLDAPIntegrationTestSuite.class')
+diff -Nru springframework-security-3.1.3.RELEASE/openid/openid.gradle springframework-security-3.1.3.RELEASE-gil/openid/openid.gradle
+--- springframework-security-3.1.3.RELEASE/openid/openid.gradle 2012-11-30 12:01:54.634136291 +0100
++++ springframework-security-3.1.3.RELEASE-gil/openid/openid.gradle 2012-11-30 12:19:14.843015253 +0100
+@@ -20,3 +20,18 @@
+
+ runtime 'org.apache.httpcomponents:httpcomponents/httpclient:4.1.1'
+ }
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.openid'
++ attributes 'Bundle-Name': 'Spring Security OpenID'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.openid.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.openid'
++ instruction 'Implementation-Version', version
++ }
++}
+\ Manca newline alla fine del file
+diff -Nru springframework-security-3.1.3.RELEASE/remoting/remoting.gradle springframework-security-3.1.3.RELEASE-gil/remoting/remoting.gradle
+--- springframework-security-3.1.3.RELEASE/remoting/remoting.gradle 2012-11-30 12:01:54.635136234 +0100
++++ springframework-security-3.1.3.RELEASE-gil/remoting/remoting.gradle 2012-11-30 12:21:09.488392952 +0100
+@@ -9,3 +9,18 @@
+
+ testCompile project(':spring-security-core').sourceSets.test.output
+ }
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.remoting'
++ attributes 'Bundle-Name': 'Spring Security Remoting'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.remoting.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.remoting'
++ instruction 'Implementation-Version', version
++ }
++}
+\ Manca newline alla fine del file
+diff -Nru springframework-security-3.1.3.RELEASE/taglibs/taglibs.gradle springframework-security-3.1.3.RELEASE-gil/taglibs/taglibs.gradle
+--- springframework-security-3.1.3.RELEASE/taglibs/taglibs.gradle 2012-11-30 12:01:54.635136234 +0100
++++ springframework-security-3.1.3.RELEASE-gil/taglibs/taglibs.gradle 2012-11-30 12:23:45.658544939 +0100
+@@ -13,4 +13,19 @@
+ compile 'javax.servlet:tomcat-jsp-2.2-api:2.0', 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+
+ testRuntime "javax.servlet:jboss-jstl-1.2-api:$jstlVersion"
++}
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.taglibs'
++ attributes 'Bundle-Name': 'Spring Security Taglibs'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.taglibs.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.taglibs'
++ instruction 'Implementation-Version', version
++ }
+ }
+\ Manca newline alla fine del file
+diff -Nru springframework-security-3.1.3.RELEASE/web/web.gradle springframework-security-3.1.3.RELEASE-gil/web/web.gradle
+--- springframework-security-3.1.3.RELEASE/web/web.gradle 2012-11-30 12:01:54.636136177 +0100
++++ springframework-security-3.1.3.RELEASE-gil/web/web.gradle 2012-11-30 12:25:32.198502662 +0100
+@@ -22,4 +22,19 @@
+ "org.powermock:powermock/powermock-reflect:$powerMockVersion"
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion"
++}
++apply plugin: 'osgi'
++jar {
++ manifest {
++ version = version
++ symbolicName = 'org.springframework.security.web'
++ attributes 'Bundle-Name': 'Spring Security Web'
++
++ instruction 'Import-Package', '*'
++ instruction 'Export-Package', 'org.springframework.security.web.*;version=' + version
++ instruction 'Bundle-Vendor', 'SpringSource'
++ instruction 'Bundle-Version', version
++ instruction 'Implementation-Title', 'org.springframework.security.web'
++ instruction 'Implementation-Version', version
++ }
+ }
+\ Manca newline alla fine del file
diff --git a/springframework-security-3.1.3.RELEASE-web-FilterInvocation.patch b/springframework-security-3.1.3.RELEASE-web-FilterInvocation.patch
new file mode 100644
index 0000000..a8b2be5
--- /dev/null
+++ b/springframework-security-3.1.3.RELEASE-web-FilterInvocation.patch
@@ -0,0 +1,112 @@
+--- web/src/main/java/org/springframework/security/web/FilterInvocation.java 2012-10-09 00:17:42.000000000 +0200
++++ web/src/main/java/org/springframework/security/web/FilterInvocation.java-gil 2012-11-30 09:52:47.659249307 +0100
+@@ -20,12 +20,16 @@
+ import java.io.PrintWriter;
+ import java.io.UnsupportedEncodingException;
+ import java.security.Principal;
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.Locale;
+ import java.util.Map;
+
++import javax.servlet.AsyncContext;
++import javax.servlet.DispatcherType;
+ import javax.servlet.FilterChain;
+ import javax.servlet.RequestDispatcher;
++import javax.servlet.ServletContext;
+ import javax.servlet.ServletException;
+ import javax.servlet.ServletInputStream;
+ import javax.servlet.ServletOutputStream;
+@@ -35,6 +39,7 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
++import javax.servlet.http.Part;
+
+ import org.springframework.security.web.util.UrlUtils;
+
+@@ -397,6 +402,59 @@
+ public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+ throw new UnsupportedOperationException();
+ }
++
++ public String getRemoteName() {
++ throw new UnsupportedOperationException();
++ }
++
++ public Part getPart(String name) throws IOException, java.lang.IllegalStateException, ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Collection<Part> getParts() throws IOException, java.lang.IllegalStateException, ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void logout() throws ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void login(String username, String password) throws ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public DispatcherType getDispatcherType() {
++ throw new UnsupportedOperationException();
++ }
++
++ public AsyncContext getAsyncContext() {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isAsyncSupported() {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isAsyncStarted() {
++ throw new UnsupportedOperationException();
++ }
++
++ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) {
++ throw new UnsupportedOperationException();
++ }
++
++ public AsyncContext startAsync() {
++ throw new UnsupportedOperationException();
++ }
++
++ public ServletContext getServletContext() {
++ throw new UnsupportedOperationException();
++ }
++
+ }
+
+ @SuppressWarnings({"deprecation"})
+@@ -529,4 +587,24 @@
+ public void setLocale(Locale loc) {
+ throw new UnsupportedOperationException();
+ }
++
++ public Collection<String> getHeaderNames() {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getHeader(String name) {
++ throw new UnsupportedOperationException();
++ }
++
++ public Collection<String> getHeaders(String name) {
++ throw new UnsupportedOperationException();
++ }
++
++ public void logout() throws ServletException {
++ throw new UnsupportedOperationException();
++ }
++
++ public int getStatus() {
++ throw new UnsupportedOperationException();
++ }
+ }
diff --git a/springframework-security-3.1.4.RELEASE-build.patch b/springframework-security-3.1.4.RELEASE-build.patch
new file mode 100644
index 0000000..bdb8de9
--- /dev/null
+++ b/springframework-security-3.1.4.RELEASE-build.patch
@@ -0,0 +1,654 @@
+diff -Nru spring-security-3.1.4.RELEASE/acl/acl.gradle spring-security-3.1.4.RELEASE-gil/acl/acl.gradle
+--- spring-security-3.1.4.RELEASE/acl/acl.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/acl/acl.gradle 2013-06-01 06:41:24.889986783 +0200
+@@ -3,15 +3,16 @@
+ dependencies {
+ compile project(':spring-security-core'),
+ 'aopalliance:aopalliance:1.0',
+- "net.sf.ehcache:ehcache:$ehcacheVersion",
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
+- "org.springframework:spring-jdbc:$springVersion"
++ "net.sf.ehcache:ehcache-core:$ehcacheVersion",
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
++ "org.springframework:springframework/spring-jdbc:$springVersion"
+
+- testCompile "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-context-support:$springVersion",
+- "org.springframework:spring-test:$springVersion"
++ testCompile "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context-support:$springVersion"
+
+- testRuntime "hsqldb:hsqldb:$hsqlVersion"
++ testRuntime "hsqldb:hsqldb:$hsqlVersion",
++ "org.mockito:mockito:1.8.5"
+ }
+\ Manca newline alla fine del file
+diff -Nru spring-security-3.1.4.RELEASE/build.gradle spring-security-3.1.4.RELEASE-gil/build.gradle
+--- spring-security-3.1.4.RELEASE/build.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/build.gradle 2013-06-01 05:42:04.898610734 +0200
+@@ -9,16 +9,19 @@
+ group = 'org.springframework.security'
+
+ repositories {
+- mavenCentral()
++ ivy {
++ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
++ artifactPattern "/usr/share/java/[module].[ext]"
++ }
+ }
+ }
+
+ // Set up different subproject lists for individual configuration
+ ext.javaProjects = subprojects.findAll { project -> project.name != 'docs' && project.name != 'faq' && project.name != 'manual' }
+-ext.sampleProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples') }
+-ext.itestProjects = subprojects.findAll { project -> project.name.startsWith('itest') }
+-ext.coreModuleProjects = javaProjects - sampleProjects - itestProjects
+-ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-aspectj')]
++//ext.sampleProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples') }
++//ext.itestProjects = subprojects.findAll { project -> project.name.startsWith('itest') }
++ext.coreModuleProjects = javaProjects
++//ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-aspectj')]
+
+ configure(subprojects - coreModuleProjects) {
+ tasks.findByPath("artifactoryPublish")?.enabled = false
+@@ -31,19 +34,19 @@
+ configure(coreModuleProjects) {
+ // Gives better names in structure101 jar diagram
+ sourceSets.main.output.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1))
+- apply plugin: 'bundlor'
+- bundlor.expansions = bundlorProperties
+- apply from: "$rootDir/gradle/maven-deployment.gradle"
+- apply plugin: 'emma'
++ //apply plugin: 'bundlor'
++ //bundlor.expansions = bundlorProperties
++ //apply from: "$rootDir/gradle/maven-deployment.gradle"
++ //apply plugin: 'emma'
+ }
+
+ task coreBuild {
+ dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'build' }
+ }
+
+-configure (aspectjProjects) {
+- apply plugin: 'aspectj'
+-}
++//configure (aspectjProjects) {
++// apply plugin: 'aspectj'
++//}
+
+ // Task for creating the distro zip
+
+@@ -51,32 +54,32 @@
+ dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' || task.name.endsWith('Zip') }
+ classifier = 'dist'
+
+- evaluationDependsOn(':docs')
++// evaluationDependsOn(':docs')
+
+ def zipRootDir = "${project.name}-$version"
+ into(zipRootDir) {
+ from(rootDir) {
+ include '*.txt'
+ }
+- into('docs') {
+- with(project(':docs').apiSpec)
+- with(project(':docs:manual').spec)
+- }
++// into('docs') {
++// with(project(':docs').apiSpec)
++// with(project(':docs:manual').spec)
++// }
+ into('dist') {
+ from coreModuleProjects.collect {project -> project.libsDir }
+- from project(':spring-security-samples-tutorial').libsDir
+- from project(':spring-security-samples-contacts').libsDir
++// from project(':spring-security-samples-tutorial').libsDir
++// from project(':spring-security-samples-contacts').libsDir
+ }
+ }
+ }
+
+ artifacts {
+ archives dist
+- archives project(':docs').docsZip
+- archives project(':docs').schemaZip
++// archives project(':docs').docsZip
++// archives project(':docs').schemaZip
+ }
+
+-apply from: "$rootDir/gradle/ide-integration.gradle"
++//apply from: "$rootDir/gradle/ide-integration.gradle"
+
+ task wrapper(type: Wrapper) {
+ gradleVersion = '1.2'
+diff -Nru spring-security-3.1.4.RELEASE/buildSrc/build.gradle spring-security-3.1.4.RELEASE-gil/buildSrc/build.gradle
+--- spring-security-3.1.4.RELEASE/buildSrc/build.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/buildSrc/build.gradle 2013-06-01 06:37:34.537587762 +0200
+@@ -1,53 +1,49 @@
+ apply plugin: 'groovy'
+
+ repositories {
+- mavenCentral()
+- maven {
+- name = 'SpringSource Enterprise Release'
+- url = 'http://repository.springsource.com/maven/bundles/release'
+- }
+- maven {
+- name = 'SpringSource Enterprise External'
+- url = 'http://repository.springsource.com/maven/bundles/external'
+- }
++ ivy {
++ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
++ artifactPattern "/usr/share/java/[module].[ext]"
++ }
+ }
+
+ // Docbook Plugin
+-dependencies {
+- def fopDeps = [ 'org.apache.xmlgraphics:fop:0.95-1 at jar',
+- 'org.apache.xmlgraphics:xmlgraphics-commons:1.3',
+- 'org.apache.xmlgraphics:batik-bridge:1.7 at jar',
+- 'org.apache.xmlgraphics:batik-util:1.7 at jar',
+- 'org.apache.xmlgraphics:batik-css:1.7 at jar',
+- 'org.apache.xmlgraphics:batik-dom:1.7',
+- 'org.apache.xmlgraphics:batik-svg-dom:1.7 at jar',
+- 'org.apache.avalon.framework:avalon-framework-api:4.3.1']
+- groovy localGroovy()
+- compile gradleApi(),
+- 'xml-resolver:xml-resolver:1.2',
+- 'xerces:xercesImpl:2.9.1',
+- 'saxon:saxon:6.5.3',
+- 'net.java.dev.jets3t:jets3t:0.6.1',
+- fopDeps
+-
+- runtime 'net.sf.xslthl:xslthl:2.0.1',
+- 'net.sf.docbook:docbook-xsl:1.75.2:ns-resources at zip'
+-}
++//dependencies {
++// def fopDeps = [ 'org.apache.xmlgraphics:fop:0.95-1 at jar',
++// 'org.apache.xmlgraphics:xmlgraphics-commons:1.3',
++// 'org.apache.xmlgraphics:batik-bridge:1.7 at jar',
++// 'org.apache.xmlgraphics:batik-util:1.7 at jar',
++// 'org.apache.xmlgraphics:batik-css:1.7 at jar',
++// 'org.apache.xmlgraphics:batik-dom:1.7',
++// 'org.apache.xmlgraphics:batik-svg-dom:1.7 at jar',
++// 'org.apache.avalon.framework:avalon-framework-api:4.3.1']
++// groovy localGroovy()
++// compile gradleApi(),
++// 'xml-resolver:xml-resolver:1.2',
++// 'xerces:xercesImpl:2.9.1',
++// 'saxon:saxon:6.5.3',
++// 'net.java.dev.jets3t:jets3t:0.6.1',
++// fopDeps
++
++// runtime 'net.sf.xslthl:xslthl:2.0.1',
++// 'net.sf.docbook:docbook-xsl:1.75.2:ns-resources at zip'
++//}
+
+ // GAE
+-dependencies {
+- compile 'com.google.appengine:appengine-tools-sdk:1.4.2'
+-}
++//dependencies {
++// compile 'com.google.appengine:appengine-tools-sdk:1.4.2'
++//}
+
+ dependencies{
+- compile "emma:emma:2.0.5312"
++ compile 'emma:emma:2.0.5312',
++ 'emma:emma_ant:2.0.5312'
+ }
+
+ // Bundlor
+-dependencies {
+- compile 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE',
+- 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE'
+-}
++//dependencies {
++// compile 'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE',
++// 'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE'
++//}
+
+ task ide(type: Copy) {
+ from configurations.runtime
+diff -Nru spring-security-3.1.4.RELEASE/cas/cas.gradle spring-security-3.1.4.RELEASE-gil/cas/cas.gradle
+--- spring-security-3.1.4.RELEASE/cas/cas.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/cas/cas.gradle 2013-06-01 05:49:37.096454585 +0200
+@@ -2,11 +2,11 @@
+ dependencies {
+ compile project(':spring-security-core'),
+ project(':spring-security-web'),
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-web:$springVersion",
+- "org.jasig.cas.client:cas-client-core:3.1.12",
+- "net.sf.ehcache:ehcache:$ehcacheVersion"
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion",
++ "org.jasig.cas.client:cas-client/cas-client-core:3.1.12",
++ "net.sf.ehcache:ehcache-core:$ehcacheVersion"
+
+- provided 'javax.servlet:servlet-api:2.5'
++ compile 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+ }
+\ Manca newline alla fine del file
+diff -Nru spring-security-3.1.4.RELEASE/config/config.gradle spring-security-3.1.4.RELEASE-gil/config/config.gradle
+--- spring-security-3.1.4.RELEASE/config/config.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/config/config.gradle 2013-06-01 05:56:07.471637883 +0200
+@@ -16,38 +16,38 @@
+ project(':spring-security-web'),
+ "org.aspectj:aspectjweaver:$aspectjVersion",
+ 'aopalliance:aopalliance:1.0',
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-web:$springVersion",
+- "org.springframework:spring-beans:$springVersion"
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion"
+
+- provided "javax.servlet:servlet-api:2.5"
++ compile "javax.servlet:tomcat-servlet-3.0-api:2.5"
+
+ groovy 'org.codehaus.groovy:groovy:1.8.7'
+
+ testCompile project(':spring-security-ldap'),
+ project(':spring-security-openid'),
+ project(':spring-security-core').sourceSets.test.output,
+- 'javax.annotation:jsr250-api:1.0',
++ 'javax.annotation:geronimo-annotation:1.0',
+ "org.springframework.ldap:spring-ldap-core:$springLdapVersion",
+- "org.springframework:spring-expression:$springVersion",
+- "org.springframework:spring-jdbc:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
++ "org.springframework:springframework/spring-expression:$springVersion",
++ "org.springframework:springframework/spring-jdbc:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
+ 'org.spockframework:spock-core:0.6-groovy-1.8',
+- "org.slf4j:jcl-over-slf4j:$slf4jVersion",
+- "org.powermock:powermock-core:$powerMockVersion",
+- "org.powermock:powermock-api-support:$powerMockVersion",
+- "org.powermock:powermock-module-junit4-common:$powerMockVersion",
+- "org.powermock:powermock-module-junit4:$powerMockVersion",
+- "org.powermock:powermock-api-mockito:$powerMockVersion",
+- "org.powermock:powermock-reflect:$powerMockVersion"
++ "org.slf4j:slf4j/jcl-over-slf4j:$slf4jVersion",
++ "org.powermock:powermock/powermock-core:$powerMockVersion",
++ "org.powermock:powermock/powermock-api-support:$powerMockVersion",
++ "org.powermock:powermock/powermock-junit4-common:$powerMockVersion",
++ "org.powermock:powermock/powermock-junit4:$powerMockVersion",
++ "org.powermock:powermock/powermock-api-mockito:$powerMockVersion",
++ "org.powermock:powermock/powermock-reflect:$powerMockVersion"
+ testCompile('org.openid4java:openid4java-nodeps:0.9.6') {
+ exclude group: 'com.google.code.guice', module: 'guice'
+ }
+
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion",
+- "cglib:cglib-nodep:2.2"
++ "cglib:cglib:2.2"
+ }
+
+ test {
+diff -Nru spring-security-3.1.4.RELEASE/core/core.gradle spring-security-3.1.4.RELEASE-gil/core/core.gradle
+--- spring-security-3.1.4.RELEASE/core/core.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/core/core.gradle 2013-06-01 05:58:57.260650004 +0200
+@@ -7,22 +7,21 @@
+ dependencies {
+ compile cryptoProject,
+ 'aopalliance:aopalliance:1.0',
+- "net.sf.ehcache:ehcache:$ehcacheVersion",
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-expression:$springVersion",
+- "org.springframework:spring-jdbc:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
+- "org.aspectj:aspectjrt:$aspectjVersion",
+- 'javax.annotation:jsr250-api:1.0'
++ "net.sf.ehcache:ehcache-core:$ehcacheVersion",
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-expression:$springVersion",
++ "org.springframework:springframework/spring-jdbc:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
++ "org.aspectj:aspectjweaver:$aspectjVersion",
++ 'javax.annotation:geronimo-annotation:1.0'
+
+ testCompile 'commons-collections:commons-collections:3.2',
+- "org.springframework:spring-test:$springVersion",
+- "org.slf4j:jcl-over-slf4j:$slf4jVersion"
++ "org.slf4j:slf4j/jcl-over-slf4j:$slf4jVersion"
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion",
+- "cglib:cglib-nodep:$cglibVersion"
++ "cglib:cglib:$cglibVersion"
+ }
+
+ compileJava.dependsOn cryptoProject.compileJava
+@@ -38,7 +37,7 @@
+ sourceSets.main.compileClasspath += cryptoClasses
+ sourceSets.test.compileClasspath += cryptoClasses
+
+-sourceJar.from cryptoProject.sourceSets.main.java
++//sourceJar.from cryptoProject.sourceSets.main.java
+
+ test {
+ systemProperties['springSecurityVersion'] = version
+diff -Nru spring-security-3.1.4.RELEASE/gradle/javaprojects.gradle spring-security-3.1.4.RELEASE-gil/gradle/javaprojects.gradle
+--- spring-security-3.1.4.RELEASE/gradle/javaprojects.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/gradle/javaprojects.gradle 2013-06-01 06:01:03.019223322 +0200
+@@ -74,17 +74,16 @@
+ dependencies {
+ compileOnly 'commons-logging:commons-logging:1.1.1'
+
+- compile ("org.springframework:spring-core:$springVersion") {
++ compile ("org.springframework:springframework/spring-core:$springVersion") {
+ exclude(group: 'commons-logging', module: 'commons-logging')
+ }
+
+ testCompile 'junit:junit:4.7',
+- 'org.mockito:mockito-core:1.8.5',
+- "org.springframework:spring-test:$springVersion"
++ 'org.mockito:mockito:1.8.5'
+
+ // Use slf4j/logback for logging
+- testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion",
+- "ch.qos.logback:logback-classic:$logbackVersion"
++ testRuntime "org.slf4j:slf4j/jcl-over-slf4j:$slf4jVersion",
++ "ch.qos.logback:logback/logback-classic:$logbackVersion"
+ }
+
+ [configurations.runtime, configurations.default]*.exclude(module: 'commons-logging')
+diff -Nru spring-security-3.1.4.RELEASE/itest/context/itest-context.gradle spring-security-3.1.4.RELEASE-gil/itest/context/itest-context.gradle
+--- spring-security-3.1.4.RELEASE/itest/context/itest-context.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/itest/context/itest-context.gradle 2013-06-01 06:03:03.176166251 +0200
+@@ -4,14 +4,14 @@
+ compile project(':spring-security-core'),
+ 'aopalliance:aopalliance:1.0',
+ 'org.python:jython:2.5.0',
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
+- "org.springframework:spring-beans:$springVersion"
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion"
+
+ testCompile project(':spring-security-web'),
+- 'javax.servlet:servlet-api:2.5',
+- "org.springframework:spring-web:$springVersion"
++ 'javax.servlet:tomcat-servlet-3.0-api:2.5',
++ "org.springframework:springframework/spring-web:$springVersion"
+ testRuntime project(':spring-security-config')
+
+ }
+diff -Nru spring-security-3.1.4.RELEASE/itest/web/itest-web.gradle spring-security-3.1.4.RELEASE-gil/itest/web/itest-web.gradle
+--- spring-security-3.1.4.RELEASE/itest/web/itest-web.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/itest/web/itest-web.gradle 2013-06-01 06:05:00.098349921 +0200
+@@ -1,15 +1,15 @@
+
+ dependencies {
+- compile "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-web:$springVersion"
++ compile "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion"
+
+- provided 'javax.servlet:servlet-api:2.5'
++ compile 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+
+ testCompile project(':spring-security-core'),
+ project(':spring-security-web'),
+ project(':spring-security-taglibs'),
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-webmvc:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-webmvc:$springVersion",
+ "org.mortbay.jetty:jetty:$jettyVersion",
+ "org.mortbay.jetty:jetty-util:$jettyVersion",
+ 'net.sourceforge.jwebunit:jwebunit-core:2.2',
+diff -Nru spring-security-3.1.4.RELEASE/ldap/ldap.gradle spring-security-3.1.4.RELEASE-gil/ldap/ldap.gradle
+--- spring-security-3.1.4.RELEASE/ldap/ldap.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/ldap/ldap.gradle 2013-06-01 06:06:08.173359173 +0200
+@@ -1,20 +1,20 @@
+ // Ldap build file
+
+ def apacheds_libs = [
+- "org.apache.directory.server:apacheds-core:$apacheDsVersion",
+- "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
+- "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion",
+- "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion",
+- "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion",
+- 'org.apache.directory.shared:shared-ldap:0.9.15'
++ "org.apache.directory.server:apacheds/apacheds-core:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-core-entry:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-protocol-shared:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-protocol-ldap:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-server-jndi:$apacheDsVersion",
++ 'org.apache.directory.shared:apacheds/shared-ldap:0.9.15'
+ ]
+
+ dependencies {
+ compile project(':spring-security-core'),
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
+- 'ldapsdk:ldapsdk:4.1'
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
++ 'ldapsdk:ldapjdk:4.1'
+ apacheds_libs.collect {
+ compile (it) {
+ exclude group: 'org.slf4j'
+diff -Nru spring-security-3.1.4.RELEASE/openid/openid.gradle spring-security-3.1.4.RELEASE-gil/openid/openid.gradle
+--- spring-security-3.1.4.RELEASE/openid/openid.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/openid/openid.gradle 2013-06-01 06:08:15.108894594 +0200
+@@ -3,10 +3,10 @@
+ dependencies {
+ compile project(':spring-security-core'),
+ project(':spring-security-web'),
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-web:$springVersion"
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion"
+
+ // openid4java has a compile time dep on guice with a group
+ // name which is different from the maven central one.
+@@ -14,9 +14,9 @@
+ compile('org.openid4java:openid4java-nodeps:0.9.6') {
+ exclude group: 'com.google.code.guice', module: 'guice'
+ }
+- compile 'com.google.inject:guice:2.0'
++ compile 'com.google.inject:guice/google-guice:2.0'
+
+- provided 'javax.servlet:servlet-api:2.5'
++ compile 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+
+- runtime 'org.apache.httpcomponents:httpclient:4.1.1'
++ runtime 'org.apache.httpcomponents:httpcomponents/httpclient:4.1.1'
+ }
+diff -Nru spring-security-3.1.4.RELEASE/remoting/remoting.gradle spring-security-3.1.4.RELEASE-gil/remoting/remoting.gradle
+--- spring-security-3.1.4.RELEASE/remoting/remoting.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/remoting/remoting.gradle 2013-06-01 06:08:55.494517150 +0200
+@@ -3,9 +3,9 @@
+ dependencies {
+ compile project(':spring-security-core'),
+ 'aopalliance:aopalliance:1.0',
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-web:$springVersion"
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion"
+
+ testCompile project(':spring-security-core').sourceSets.test.output
+ }
+diff -Nru spring-security-3.1.4.RELEASE/settings.gradle spring-security-3.1.4.RELEASE-gil/settings.gradle
+--- spring-security-3.1.4.RELEASE/settings.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/settings.gradle 2013-06-01 06:10:29.917955350 +0200
+@@ -8,27 +8,26 @@
+ 'cas',
+ 'openid',
+ 'taglibs',
+- 'aspects',
+ 'crypto'
+ ]
+
+-def String[] samples = [
+- 'tutorial',
+- 'contacts',
+- 'openid',
+- 'aspectj',
+- 'gae',
+- 'dms',
+- 'preauth',
+- 'cas/server',
+- 'cas/sample',
+- 'ldap',
+- 'jaas'
+-]
++//def String[] samples = [
++// 'tutorial',
++// 'contacts',
++// 'openid',
++// 'aspectj',
++// 'gae',
++// 'dms',
++// 'preauth',
++// 'cas/server',
++// 'cas/sample',
++// 'ldap',
++// 'jaas'
++//]
+
+ def String[] itest = [
+- 'web',
+- 'context'
++// 'web',
++// 'context'
+ ]
+
+ include modules
+@@ -39,15 +38,15 @@
+ p.buildFileName = "${name}.gradle"
+ }
+
+-include samples
++//include samples
+
+-samples.each {name ->
+- def p = findProject(":${name}")
+- def fullName = name.replaceAll('/','')
+- p.name = "spring-security-samples-${fullName}"
+- p.buildFileName = "${fullName}.gradle"
+- p.projectDir = new File(settingsDir, "samples/${name}");
+-}
++//samples.each {name ->
++// def p = findProject(":${name}")
++// def fullName = name.replaceAll('/','')
++// p.name = "spring-security-samples-${fullName}"
++// p.buildFileName = "${fullName}.gradle"
++// p.projectDir = new File(settingsDir, "samples/${name}");
++//}
+
+ include itest
+
+@@ -58,10 +57,10 @@
+ p.projectDir = new File(settingsDir, "itest/${name}");
+ }
+
+-include 'docs', 'docs:faq', 'docs:manual'
++//include 'docs', 'docs:faq', 'docs:manual'
+
+-def docs = findProject(':docs')
+-docs.buildFileName = 'docs.gradle'
++//def docs = findProject(':docs')
++//docs.buildFileName = 'docs.gradle'
+
+ rootProject.name = 'spring-security'
+
+diff -Nru spring-security-3.1.4.RELEASE/taglibs/taglibs.gradle spring-security-3.1.4.RELEASE-gil/taglibs/taglibs.gradle
+--- spring-security-3.1.4.RELEASE/taglibs/taglibs.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/taglibs/taglibs.gradle 2013-06-01 06:11:59.619490683 +0200
+@@ -4,13 +4,13 @@
+ compile project(':spring-security-core'),
+ project(':spring-security-web'),
+ project(':spring-security-acl'),
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-expression:$springVersion",
+- "org.springframework:spring-web:$springVersion"
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-expression:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion"
+
+- provided 'javax.servlet:jsp-api:2.0', 'javax.servlet:servlet-api:2.5'
++ compile 'javax.servlet:tomcat-jsp-2.2-api:2.0', 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+
+- testRuntime "javax.servlet:jstl:$jstlVersion"
++ testRuntime "javax.servlet:jboss-jstl-1.2-api:$jstlVersion"
+ }
+\ Manca newline alla fine del file
+diff -Nru spring-security-3.1.4.RELEASE/web/web.gradle spring-security-3.1.4.RELEASE-gil/web/web.gradle
+--- spring-security-3.1.4.RELEASE/web/web.gradle 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/web/web.gradle 2013-06-01 06:13:27.457196806 +0200
+@@ -1,26 +1,25 @@
+ dependencies {
+ compile project(':spring-security-core'),
+ 'aopalliance:aopalliance:1.0',
+- "org.springframework:spring-aop:$springVersion",
+- "org.springframework:spring-beans:$springVersion",
+- "org.springframework:spring-context:$springVersion",
+- "org.springframework:spring-expression:$springVersion",
+- "org.springframework:spring-jdbc:$springVersion",
+- "org.springframework:spring-tx:$springVersion",
+- "org.springframework:spring-web:$springVersion"
++ "org.springframework:springframework/spring-aop:$springVersion",
++ "org.springframework:springframework/spring-beans:$springVersion",
++ "org.springframework:springframework/spring-context:$springVersion",
++ "org.springframework:springframework/spring-expression:$springVersion",
++ "org.springframework:springframework/spring-jdbc:$springVersion",
++ "org.springframework:springframework/spring-tx:$springVersion",
++ "org.springframework:springframework/spring-web:$springVersion"
+
+- provided 'javax.servlet:servlet-api:2.5'
++ compile 'javax.servlet:tomcat-servlet-3.0-api:2.5'
+
+ testCompile project(':spring-security-core').sourceSets.test.output,
+ 'commons-codec:commons-codec:1.3',
+- "org.slf4j:jcl-over-slf4j:$slf4jVersion",
+- "org.springframework:spring-test:$springVersion",
+- "org.powermock:powermock-core:$powerMockVersion",
+- "org.powermock:powermock-api-support:$powerMockVersion",
+- "org.powermock:powermock-module-junit4-common:$powerMockVersion",
+- "org.powermock:powermock-module-junit4:$powerMockVersion",
+- "org.powermock:powermock-api-mockito:$powerMockVersion",
+- "org.powermock:powermock-reflect:$powerMockVersion"
++ "org.slf4j:slf4j/jcl-over-slf4j:$slf4jVersion",
++ "org.powermock:powermock/powermock-core:$powerMockVersion",
++ "org.powermock:powermock/powermock-api-support:$powerMockVersion",
++ "org.powermock:powermock/powermock-junit4-common:$powerMockVersion",
++ "org.powermock:powermock/powermock-junit4:$powerMockVersion",
++ "org.powermock:powermock/powermock-api-mockito:$powerMockVersion",
++ "org.powermock:powermock/powermock-reflect:$powerMockVersion"
+
+ testRuntime "hsqldb:hsqldb:$hsqlVersion"
+ }
+\ Manca newline alla fine del file
diff --git a/springframework-security-3.1.4.RELEASE-ldap-apacheds155.patch b/springframework-security-3.1.4.RELEASE-ldap-apacheds155.patch
new file mode 100644
index 0000000..492992b
--- /dev/null
+++ b/springframework-security-3.1.4.RELEASE-ldap-apacheds155.patch
@@ -0,0 +1,68 @@
+diff -Nru spring-security-3.1.4.RELEASE/ldap/ldap.gradle spring-security-3.1.4.RELEASE-gil/ldap/ldap.gradle
+--- spring-security-3.1.4.RELEASE/ldap/ldap.gradle 2013-06-01 07:01:14.259729495 +0200
++++ spring-security-3.1.4.RELEASE-gil/ldap/ldap.gradle 2013-06-01 06:23:22.402906465 +0200
+@@ -2,10 +2,13 @@
+
+ def apacheds_libs = [
+ "org.apache.directory.server:apacheds/apacheds-core:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-core-api:$apacheDsVersion",
+ "org.apache.directory.server:apacheds/apacheds-core-entry:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-jdbm-partition:$apacheDsVersion",
+ "org.apache.directory.server:apacheds/apacheds-protocol-shared:$apacheDsVersion",
+ "org.apache.directory.server:apacheds/apacheds-protocol-ldap:$apacheDsVersion",
+ "org.apache.directory.server:apacheds/apacheds-server-jndi:$apacheDsVersion",
++ "org.apache.directory.server:apacheds/apacheds-xdbm-base:$apacheDsVersion",
+ 'org.apache.directory.shared:apacheds/shared-ldap:0.9.15'
+ ]
+
+@@ -21,7 +24,7 @@
+ }
+ }
+
+- compile ("org.springframework.ldap:spring-ldap-core:$springLdapVersion") {
++ compile ("org.springframework.ldap:spring-ldap/spring-ldap-core:$springLdapVersion") {
+ exclude(group: 'commons-logging', module: 'commons-logging')
+ exclude(group: 'org.springframework', module: 'spring-core')
+ exclude(group: 'org.springframework', module: 'spring-tx')
+diff -Nru spring-security-3.1.4.RELEASE/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java spring-security-3.1.4.RELEASE-gil/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
+--- spring-security-3.1.4.RELEASE/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java 2013-04-27 22:05:30.000000000 +0200
++++ spring-security-3.1.4.RELEASE-gil/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java 2013-06-01 07:03:26.611901358 +0200
+@@ -24,7 +24,6 @@
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.directory.server.core.DefaultDirectoryService;
+ import org.apache.directory.server.core.authn.AuthenticationInterceptor;
+-import org.apache.directory.server.core.entry.ServerEntry;
+ import org.apache.directory.server.core.exception.ExceptionInterceptor;
+ import org.apache.directory.server.core.interceptor.Interceptor;
+ import org.apache.directory.server.core.normalization.NormalizationInterceptor;
+@@ -35,8 +34,8 @@
+ import org.apache.directory.server.ldap.LdapServer;
+ import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+ import org.apache.directory.server.protocol.shared.transport.TcpTransport;
+-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+-import org.apache.directory.shared.ldap.name.LdapDN;
++import org.apache.directory.shared.ldap.entry.ServerEntry;
++import org.apache.directory.shared.ldap.name.DN;
+ import org.springframework.beans.BeansException;
+ import org.springframework.beans.factory.DisposableBean;
+ import org.springframework.beans.factory.InitializingBean;
+@@ -45,6 +44,7 @@
+ import org.springframework.context.Lifecycle;
+ import org.springframework.core.io.Resource;
+ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
++import org.springframework.ldap.NameNotFoundException;
+ import org.springframework.util.Assert;
+
+ /**
+@@ -183,9 +183,9 @@
+ try {
+ service.getAdminSession().lookup(partition.getSuffixDn());
+ }
+- catch (LdapNameNotFoundException e) {
++ catch (NameNotFoundException e) {
+ try {
+- LdapDN dn = new LdapDN(root);
++ DN dn = new DN(root);
+ Assert.isTrue(root.startsWith("dc="));
+ String dc = root.substring(3,root.indexOf(','));
+ ServerEntry entry = service.newEntry(dn);
diff --git a/springframework-security.spec b/springframework-security.spec
new file mode 100644
index 0000000..3e5166f
--- /dev/null
+++ b/springframework-security.spec
@@ -0,0 +1,299 @@
+%global namedreltag .RELEASE
+%global namedversion %{version}%{?namedreltag}
+Name: springframework-security
+Version: 3.1.4
+Release: 1%{?dist}
+Summary: Modular Java/J2EE application security framework
+Group: Development/Libraries
+# Public Domain: crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
+# ISC: crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
+# crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java
+License: ASL 2.0 and ISC and Public Domain
+Url: http://static.springsource.org/spring-security/site/index.html
+Source0: https://github.com/SpringSource/spring-security/archive/%{namedversion}.tar.gz
+Source1: http://repo1.maven.org/maven2/org/springframework/security/spring-security-acl/3.1.4.RELEASE/spring-security-acl-3.1.4.RELEASE.pom
+Source2: http://repo1.maven.org/maven2/org/springframework/security/spring-security-cas/3.1.4.RELEASE/spring-security-cas-3.1.4.RELEASE.pom
+Source3: http://repo1.maven.org/maven2/org/springframework/security/spring-security-config/3.1.4.RELEASE/spring-security-config-3.1.4.RELEASE.pom
+Source4: http://repo1.maven.org/maven2/org/springframework/security/spring-security-core/3.1.4.RELEASE/spring-security-core-3.1.4.RELEASE.pom
+Source5: http://repo1.maven.org/maven2/org/springframework/security/spring-security-crypto/3.1.4.RELEASE/spring-security-crypto-3.1.4.RELEASE.pom
+Source6: http://repo1.maven.org/maven2/org/springframework/security/spring-security-ldap/3.1.4.RELEASE/spring-security-ldap-3.1.4.RELEASE.pom
+Source7: http://repo1.maven.org/maven2/org/springframework/security/spring-security-openid/3.1.4.RELEASE/spring-security-openid-3.1.4.RELEASE.pom
+Source8: http://repo1.maven.org/maven2/org/springframework/security/spring-security-remoting/3.1.4.RELEASE/spring-security-remoting-3.1.4.RELEASE.pom
+Source9: http://repo1.maven.org/maven2/org/springframework/security/spring-security-taglibs/3.1.4.RELEASE/spring-security-taglibs-3.1.4.RELEASE.pom
+Source10: http://repo1.maven.org/maven2/org/springframework/security/spring-security-web/3.1.4.RELEASE/spring-security-web-3.1.4.RELEASE.pom
+
+# fix system libraries
+# disable unavailable plugins
+# disable: docs, itest, and samples. (unavailable build deps)
+Patch0: %{name}-3.1.4.RELEASE-build.patch
+# tomcat 7.x apis support
+Patch1: %{name}-3.1.3.RELEASE-web-FilterInvocation.patch
+
+Patch2: %{name}-3.1.3.RELEASE-aggregate-javadoc.patch
+# fix empty manifests header (require springframework bundlor)
+Patch3: %{name}-3.1.3.RELEASE-osgi-manifest.patch
+# require groovy with its embedded deps
+Patch4: %{name}-3.1.3.RELEASE-config-groovy-deps.patch
+# depends on ldap module for test
+Patch5: %{name}-3.1.3.RELEASE-config-remove-unavailable-test-deps.patch
+# build fix for apacheds 1.5.7 and apacheds-shared 0.9.19
+Patch6: %{name}-3.1.4.RELEASE-ldap-apacheds155.patch
+
+BuildRequires: java-devel
+
+# build tools and deps
+BuildRequires: antlr-tool
+BuildRequires: apache-commons-cli
+BuildRequires: emma
+BuildRequires: gradle
+BuildRequires: groovy
+BuildRequires: objectweb-asm
+
+# build deps
+BuildRequires: apache-commons-logging
+BuildRequires: apacheds-core
+BuildRequires: apacheds-protocols
+BuildRequires: apacheds-server
+BuildRequires: apacheds-shared
+BuildRequires: apacheds-xdbm
+BuildRequires: aopalliance
+BuildRequires: aspectjweaver
+BuildRequires: cas-client
+BuildRequires: ehcache-core
+BuildRequires: geronimo-annotation
+BuildRequires: google-guice
+BuildRequires: httpcomponents-client
+BuildRequires: ldapjdk
+BuildRequires: openid4java
+BuildRequires: slf4j
+BuildRequires: spring-ldap
+BuildRequires: springframework
+BuildRequires: springframework-aop
+BuildRequires: springframework-beans
+BuildRequires: springframework-context
+BuildRequires: springframework-expression
+BuildRequires: springframework-jdbc
+BuildRequires: springframework-web
+BuildRequires: springframework-tx
+BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: tomcat-servlet-3.0-api
+
+# test deps
+BuildRequires: apache-commons-collections
+BuildRequires: apache-commons-codec
+BuildRequires: cglib
+BuildRequires: hsqldb
+BuildRequires: jboss-jstl-1.2-api
+BuildRequires: junit
+%if 0
+# unavailable test deps
+BuildRequires: mvn(org.python:jython) >= 2.5.0
+BuildRequires: mvn(org.springframework:spring-test)
+%endif
+BuildRequires: logback
+BuildRequires: mockito
+BuildRequires: powermock-api-mockito
+BuildRequires: powermock-api-support
+BuildRequires: powermock-common
+BuildRequires: powermock-core
+BuildRequires: powermock-junit4
+BuildRequires: powermock-reflect
+BuildRequires: spock-core
+BuildRequires: springframework-context-support
+
+Requires: apache-commons-logging
+Requires: apacheds-core
+Requires: apacheds-protocols
+Requires: apacheds-server
+Requires: apacheds-shared
+Requires: aopalliance
+Requires: aspectjweaver
+Requires: cas-client
+Requires: ehcache-core
+Requires: geronimo-annotation
+Requires: google-guice
+Requires: groovy
+Requires: httpcomponents-client
+Requires: ldapjdk
+Requires: openid4java
+Requires: slf4j
+Requires: spring-ldap
+Requires: springframework
+Requires: springframework-aop
+Requires: springframework-beans
+Requires: springframework-context
+Requires: springframework-expression
+Requires: springframework-jdbc
+Requires: springframework-web
+Requires: springframework-tx
+Requires: tomcat-jsp-2.2-api
+Requires: tomcat-servlet-3.0-api
+
+Requires: java
+BuildArch: noarch
+
+%description
+Spring Security is a Java/Java EE framework that provides advanced
+authentication, authorization and other comprehensive security features for
+enterprise applications. In addition to having a comprehensive list of
+security functionality, Spring Security is very configurable and employs the
+Spring Framework for configuration, it allows for reuse and portability of
+security components, and it can also be used with non-Spring applications.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n spring-security-%{namedversion}
+find . -name "*.jar" -print -delete
+find . -name "*.class" -print -delete
+
+%patch0 -p1
+%patch1 -p0
+sed -i "s|Map<String,Object> parameters = request.getParameterMap();|Map<String,String[]> parameters = request.getParameterMap();|" \
+ web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
+
+%patch2 -p0
+%patch3 -p1
+%patch4 -p0
+%patch5 -p0
+%patch6 -p1
+
+# unavailable build deps
+# gId aId version
+# com.springsource.bundlor com.springsource.bundlor 1.0.0.RELEASE
+# com.springsource.bundlor com.springsource.bundlor.blint 1.0.0.RELEASE
+# saxon saxon 6.5.3
+# net.java.dev.jets3t jets3t 0.6.1
+# net.sf.xslthl xslthl 2.0.1
+# net.sf.docbook docbook-xsl 1.75.2 ns-resources zip
+# com.google.appengine appengine-tools-sdk 1.4.2
+rm -r buildSrc/src/main/groovy/bundlor/BundlorPlugin.groovy \
+ buildSrc/src/main/groovy/docbook/DocbookPlugin.groovy \
+ buildSrc/src/main/groovy/gae/GaePlugin.groovy
+
+# require unavailable build deps org.springframework spring-test and gradle maven plugin
+rm -r acl/src/test/java/* \
+ cas/src/test/java/* \
+ config/src/test/java/* \
+ config/src/test/groovy/* \
+ core/src/test/java/* \
+ ldap/src/integration-test/java/* \
+ ldap/src/test/java/* \
+ openid/src/test/java/* \
+ remoting/src/test/java/* \
+ taglibs/src/test/java/* \
+ web/src/test/java/*
+
+cp -p %{SOURCE1} acl.pom
+cp -p %{SOURCE2} cas.pom
+cp -p %{SOURCE4} core.pom
+cp -p %{SOURCE6} ldap.pom
+%pom_xpath_inject "pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>" ldap.pom
+%pom_xpath_inject "pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-jdbm-partition</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>" ldap.pom
+%pom_xpath_inject "pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-xdbm-base</artifactId>
+ <version>1.5.5</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>" ldap.pom
+
+cp -p %{SOURCE9} taglibs.pom
+sed -i "s|<artifactId>ehcache</artifactId>|<artifactId>ehcache-core</artifactId>|" acl.pom cas.pom core.pom
+sed -i "s|<artifactId>aspectjrt</artifactId>|<artifactId>aspectjweaver</artifactId>|" core.pom
+%pom_remove_dep javax.servlet:jsp-api taglibs.pom
+%pom_xpath_inject "pom:dependencies" "
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>" taglibs.pom
+
+%build
+
+export GRADLE_USER_HOME=$PWD
+mkdir -p gradlehome
+gradle --debug build javadoc -g $PWD/gradlehome -b $PWD/build.gradle
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}/%{name}
+
+for m in acl \
+ cas \
+ config \
+ core \
+ crypto \
+ ldap \
+ openid \
+ remoting \
+ taglibs \
+ web; do
+ install -m 644 ${m}/build/libs/spring-security-${m}-%{namedversion}.jar \
+ %{buildroot}%{_javadir}/%{name}/spring-security-${m}.jar
+done
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 acl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-acl.pom
+%add_maven_depmap JPP.%{name}-spring-security-acl.pom %{name}/spring-security-acl.jar
+install -pm 644 cas.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-cas.pom
+%add_maven_depmap JPP.%{name}-spring-security-cas.pom %{name}/spring-security-cas.jar
+install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-config.pom
+%add_maven_depmap JPP.%{name}-spring-security-config.pom %{name}/spring-security-config.jar
+install -pm 644 core.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-core.pom
+%add_maven_depmap JPP.%{name}-spring-security-core.pom %{name}/spring-security-core.jar
+install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-crypto.pom
+%add_maven_depmap JPP.%{name}-spring-security-crypto.pom %{name}/spring-security-crypto.jar
+install -pm 644 ldap.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-ldap.pom
+%add_maven_depmap JPP.%{name}-spring-security-ldap.pom %{name}/spring-security-ldap.jar
+install -pm 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-openid.pom
+%add_maven_depmap JPP.%{name}-spring-security-openid.pom %{name}/spring-security-openid.jar
+install -pm 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-remoting.pom
+%add_maven_depmap JPP.%{name}-spring-security-remoting.pom %{name}/spring-security-remoting.jar
+install -pm 644 taglibs.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-taglibs.pom
+%add_maven_depmap JPP.%{name}-spring-security-taglibs.pom %{name}/spring-security-taglibs.jar
+install -pm 644 %{SOURCE10} %{buildroot}%{_mavenpomdir}/JPP.%{name}-spring-security-web.pom
+%add_maven_depmap JPP.%{name}-spring-security-web.pom %{name}/spring-security-web.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/spring-security-*.jar
+%{_mavenpomdir}/JPP.%{name}-spring-security-*.pom
+%{_mavendepmapfragdir}/%{name}
+%doc license.txt notice.txt readme.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc license.txt notice.txt
+
+%changelog
+* Sat Jun 01 2013 gil cattaneo <puntogil at libero.it> 3.1.4-1
+- update to 3.1.4.RELEASE
+
+* Fri Nov 16 2012 gil cattaneo <puntogil at libero.it> 3.1.3-1
+- initial rpm
\ No newline at end of file
More information about the scm-commits
mailing list