From d6d9bc9d6b4c2cbb94a7efbf8d8407e3c35dc0c2 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Mon, 23 Jun 2008 14:08:17 +0000 Subject: [PATCH] [maven-release-plugin] copy for tag spring-security-parent-2.0.3 --- acl/pom.xml | 4 ++-- adapters/catalina/pom.xml | 2 +- adapters/jboss/pom.xml | 2 +- adapters/jetty/pom.xml | 2 +- adapters/pom.xml | 2 +- adapters/resin/pom.xml | 2 +- cas/pom.xml | 2 +- core-tiger/pom.xml | 2 +- core/pom.xml | 2 +- ntlm/pom.xml | 2 +- openid/pom.xml | 4 ++-- pom.xml | 10 ++++---- portlet/pom.xml | 6 ++--- readme.txt | 8 +++---- samples/cas/client/pom.xml | 2 +- samples/cas/pom.xml | 2 +- samples/cas/server/pom.xml | 24 +++++++++---------- samples/contacts/pom.xml | 2 +- samples/dms/pom.xml | 2 +- samples/ldap/pom.xml | 2 +- samples/openid/pom.xml | 2 +- .../WEB-INF/applicationContext-security.xml | 6 ++--- samples/pom.xml | 2 +- samples/portlet/pom.xml | 2 +- samples/preauth/pom.xml | 3 +-- samples/tutorial/pom.xml | 2 +- sandbox/heavyduty/pom.xml | 4 ++-- .../web/TestMultiActionController.java | 8 ++++++- .../WEB-INF/freemarker/multi-action-test.ftl | 4 +++- taglibs/pom.xml | 4 ++-- 30 files changed, 64 insertions(+), 57 deletions(-) diff --git a/acl/pom.xml b/acl/pom.xml index 4b8bc1fc7d..d71b2eb34c 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -3,13 +3,13 @@ spring-security-parent org.springframework.security - 2.0.3-SNAPSHOT + 2.0.3 4.0.0 org.springframework.security spring-security-acl Spring Security - ACL module - 2.0.3-SNAPSHOT + 2.0.3 bundle diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml index 3e0c0cd3df..13d2d35e95 100644 --- a/adapters/catalina/pom.xml +++ b/adapters/catalina/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.3-SNAPSHOT + 2.0.3 spring-security-catalina Spring Security - Catalina adapter diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml index bfc9d8173f..b34a586522 100644 --- a/adapters/jboss/pom.xml +++ b/adapters/jboss/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.3-SNAPSHOT + 2.0.3 spring-security-jboss Spring Security - JBoss adapter diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml index 8374c50053..7b03d2bf9b 100644 --- a/adapters/jetty/pom.xml +++ b/adapters/jetty/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.3-SNAPSHOT + 2.0.3 spring-security-jetty Spring Security - Jetty adapter diff --git a/adapters/pom.xml b/adapters/pom.xml index 2fc41d2c17..861ad143a6 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 spring-security-adapters Spring Security - Adapters diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml index abd40ae15b..6038584ac8 100644 --- a/adapters/resin/pom.xml +++ b/adapters/resin/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0.3-SNAPSHOT + 2.0.3 spring-security-resin Spring Security - Resin adapter diff --git a/cas/pom.xml b/cas/pom.xml index a586e70cde..3b75a627cc 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 spring-security-cas-client Spring Security - CAS support diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml index 4a64805a7a..a6a7c60d4b 100644 --- a/core-tiger/pom.xml +++ b/core-tiger/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 bundle spring-security-core-tiger diff --git a/core/pom.xml b/core/pom.xml index 5eb661c754..ea47e737c4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 bundle spring-security-core diff --git a/ntlm/pom.xml b/ntlm/pom.xml index ed0166d0fa..55b3b66c5c 100755 --- a/ntlm/pom.xml +++ b/ntlm/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 jar spring-security-ntlm diff --git a/openid/pom.xml b/openid/pom.xml index c118998ed9..ad0cf5f73a 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -3,12 +3,12 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 spring-security-openid Spring Security - OpenID support Spring Security - Support for OpenID - 2.0.3-SNAPSHOT + 2.0.3 bundle diff --git a/pom.xml b/pom.xml index 3007b0ff20..42bc9f25c8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 Spring Security pom @@ -38,9 +38,9 @@ - scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk - scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk - http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk/ + scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/spring-security-parent-2.0.3 + scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/spring-security-parent-2.0.3 + http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/tags/spring-security-parent-2.0.3 @@ -732,7 +732,7 @@ - 2.0.2.SNAPSHOT + 2.0.3.RELEASE 2.0.8 [2.0.8, 3.0.0) 1.1.2 diff --git a/portlet/pom.xml b/portlet/pom.xml index 1f131f3a4a..c9af6ade27 100644 --- a/portlet/pom.xml +++ b/portlet/pom.xml @@ -3,18 +3,18 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 spring-security-portlet Spring Security - Portlet support Spring Security - Support for JSR 168 Portlets - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-core - 2.0.3-SNAPSHOT + 2.0.3 javax.servlet diff --git a/readme.txt b/readme.txt index 229d04d999..55401aa17e 100644 --- a/readme.txt +++ b/readme.txt @@ -18,15 +18,15 @@ BUILDING ------------------------------------------------------------------------------- Spring Security is built using Maven. Please read the "Building from Source" page -at http://static.springframework.org/spring-security/site/. -This page is also included in the /docs directory of official release ZIPs. +at http://static.springframework.org/spring-security/site/. ------------------------------------------------------------------------------- DOCUMENTATION ------------------------------------------------------------------------------- -Be sure to read the Reference Guide, which is available from the web site. -Every class also has thorough JavaDocs, which are also available on the web site. +Be sure to read the Reference Guide (docs/reference/html/springsecurity.html). +Extensive JavaDoc for the Spring Security code is also available (in docs/apidocs). +Both can also be found on the website. ------------------------------------------------------------------------------- QUICK START diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml index 8743471611..ecc84dadfc 100644 --- a/samples/cas/client/pom.xml +++ b/samples/cas/client/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-cas-client diff --git a/samples/cas/pom.xml b/samples/cas/pom.xml index dfbdab708c..6508157da5 100644 --- a/samples/cas/pom.xml +++ b/samples/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-cas diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index 4efbad9b3d..37161d4c74 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-cas-server @@ -29,19 +29,19 @@ true false - - - - javax.net.ssl.trustStore - ../../certificates/server.jks - - - javax.net.ssl.trustStorePassword - password - + + + + javax.net.ssl.trustStore + ../../certificates/server.jks + + + javax.net.ssl.trustStorePassword + password + - + \ No newline at end of file diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml index 2ec79ceb07..7198fca1be 100644 --- a/samples/contacts/pom.xml +++ b/samples/contacts/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 spring-security-samples-contacts Spring Security - Contacts sample diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml index fe2598e964..4fef17c4cc 100644 --- a/samples/dms/pom.xml +++ b/samples/dms/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 spring-security-samples-dms Spring Security - DMS sample diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml index aec7800631..9991847081 100644 --- a/samples/ldap/pom.xml +++ b/samples/ldap/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-ldap diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml index 6f8c11290e..5b4c0cfc7f 100644 --- a/samples/openid/pom.xml +++ b/samples/openid/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-openid diff --git a/samples/openid/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/openid/src/main/webapp/WEB-INF/applicationContext-security.xml index 2cb8385ff6..1b4efc325a 100644 --- a/samples/openid/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/openid/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -15,8 +15,8 @@ - - + + @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/samples/pom.xml b/samples/pom.xml index 6c2efff764..423dbeca0f 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml index f2fc6e423e..97c56cfb02 100644 --- a/samples/portlet/pom.xml +++ b/samples/portlet/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-portlet diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml index 0fd8335e92..6ad24e6f1b 100644 --- a/samples/preauth/pom.xml +++ b/samples/preauth/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-preauth @@ -42,7 +42,6 @@ jaxen jaxen 1.1.1 - true diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index 75a77c48d5..eb31db21b5 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 2.0.3-SNAPSHOT + 2.0.3 org.springframework.security spring-security-samples-tutorial diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml index d83036c881..8dbdb580e5 100755 --- a/sandbox/heavyduty/pom.xml +++ b/sandbox/heavyduty/pom.xml @@ -4,7 +4,7 @@ spring-security-heavyduty Spring Security - Heavy Duty Sample war - 2.0.2-SNAPSHOT + 2.0.3-SNAPSHOT org.springframework.security @@ -166,7 +166,7 @@ 2.5.4 - 2.0.2-SNAPSHOT + 2.0.3-SNAPSHOT diff --git a/sandbox/heavyduty/src/main/java/heavyduty/web/TestMultiActionController.java b/sandbox/heavyduty/src/main/java/heavyduty/web/TestMultiActionController.java index 9315cca8b1..8f281cf06f 100644 --- a/sandbox/heavyduty/src/main/java/heavyduty/web/TestMultiActionController.java +++ b/sandbox/heavyduty/src/main/java/heavyduty/web/TestMultiActionController.java @@ -1,6 +1,7 @@ package heavyduty.web; import java.io.IOException; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -23,10 +24,15 @@ public class TestMultiActionController extends MultiActionController { } public void step1(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - request.getRequestDispatcher("/testMulti.htm?action=step1xtra").forward(request, response); + String[] x = request.getParameterValues("x"); + logger.info("x= " + (x == null ? "null" : Arrays.asList(x))); + String[] y = request.getParameterValues("y"); + logger.info("y = " + (y == null ? "null" : Arrays.asList(y))); + request.getRequestDispatcher("/testMulti.htm?action=step1xtra&x=5&x=5").forward(request, response); } public ModelAndView step1xtra(HttpServletRequest request, HttpServletResponse response) throws ServletRequestBindingException { + logger.info("x = " + Arrays.asList(request.getParameterValues("x"))); return createView("step2"); } diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/freemarker/multi-action-test.ftl b/sandbox/heavyduty/src/main/webapp/WEB-INF/freemarker/multi-action-test.ftl index bac2503081..0c73d37961 100644 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/freemarker/multi-action-test.ftl +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/freemarker/multi-action-test.ftl @@ -6,7 +6,9 @@
- +
+
+
diff --git a/taglibs/pom.xml b/taglibs/pom.xml index 0cf7ac4b10..6773c50dff 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -3,13 +3,13 @@ spring-security-parent org.springframework.security - 2.0.3-SNAPSHOT + 2.0.3 4.0.0 org.springframework.security spring-security-taglibs Spring Security - JSP taglibs - 2.0.3-SNAPSHOT + 2.0.3 jar