From 8c00bb1537a67d21a365f1407c69cb6c6eb6eafb Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Fri, 22 Feb 2008 16:21:37 +0000
Subject: [PATCH] SEC-674: Updated samples to work with new module layout.
 Changed taglib build to copy tld file to META-INF directory.

Also standardized JSTL version to 1.1.0 (impl 1.1.2), moving deps to root sample pom.
---
 core/pom.xml                                  |  10 -
 samples/cas/server/pom.xml                    |   2 +-
 samples/contacts/pom.xml                      | 176 +++++++++---------
 .../src/main/webapp/WEB-INF/jsp/hello.jsp     |   2 +-
 .../src/main/webapp/WEB-INF/jsp/include.jsp   |   4 +-
 .../contacts/src/main/webapp/WEB-INF/web.xml  |  10 +-
 .../contacts/src/main/webapp/acegilogin.jsp   |   2 +-
 samples/dms/pom.xml                           |   1 -
 samples/pom.xml                               |  61 +++---
 samples/preauth/pom.xml                       |  12 --
 .../src/main/webapp/secure/extreme/index.jsp  |   5 -
 samples/tutorial/pom.xml                      |  17 +-
 .../applicationContext-security-ns.xml        |   2 +-
 .../main/webapp/WEB-INF/jsp/listAccounts.jsp  |   2 +-
 taglibs/pom.xml                               |  14 ++
 15 files changed, 153 insertions(+), 167 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 335ed0c606..7702563b37 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -149,16 +149,6 @@
                 </includes>
                 <filtering>false</filtering>
             </resource>
-            <resource>
-                <directory>
-                    ${basedir}/src/main/resources/org/springframework/security/taglibs
-                </directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>*.tld</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
             <resource>
                 <directory>${basedir}/src/main/resources</directory>
                 <targetPath>/</targetPath>
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index d03ee96890..53900ecf35 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -17,7 +17,7 @@
                 <version>6.1.7</version>
                 <configuration>
                     <contextPath>/cas</contextPath>
-                    <webApp>${basedir}/cas-server-webapp-3.1.1.war</webApp>
+                    <webApp>${basedir}/cas-server-webapp-3.2.war</webApp>
                     <connectors>
                         <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
                             <port>9443</port>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 089ea5472f..379155b3ca 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -1,89 +1,83 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.security</groupId>
-    <artifactId>spring-security-samples</artifactId>
-    <version>2.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>spring-security-samples-contacts</artifactId>
-  <name>Spring Security - Contacts sample</name>
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
         <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-acl</artifactId>
-        <version>${project.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${spring.version}</version>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jdbc</artifactId>
-        <scope>compile</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <scope>runtime</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-remoting</artifactId>
-        <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-      <version>1.2.4</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>hessian</groupId>
-      <artifactId>hessian</artifactId>
-      <version>3.0.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.4</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.0.6</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+        <artifactId>spring-security-samples</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-security-samples-contacts</artifactId>
+    <name>Spring Security - Contacts sample</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-acl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-remoting</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>1.3.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>hessian</groupId>
+            <artifactId>hessian</artifactId>
+            <version>3.0.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.4</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -96,12 +90,12 @@
                 <artifactId>maven-jetty-plugin</artifactId>
                 <version>6.1.7</version>
                 <configuration>
-                <contextPath>/contacts</contextPath>
-                <!--jettyConfig>${basedir}/src/test/resources/jetty.xml</jettyConfig-->
-                <scanIntervalSeconds>10</scanIntervalSeconds>
-                <!--scanTargets>
-                    <scanTarget>src/main/webapp/css</scanTarget>
-                </scanTargets-->
+                    <contextPath>/contacts</contextPath>
+                    <!--jettyConfig>${basedir}/src/test/resources/jetty.xml</jettyConfig-->
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <!--scanTargets>
+                        <scanTarget>src/main/webapp/css</scanTarget>
+                    </scanTargets-->
                 </configuration>
             </plugin>
         </plugins>
diff --git a/samples/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp b/samples/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp
index 4f018bcc74..04d01e98b4 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp
+++ b/samples/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp
@@ -46,6 +46,6 @@ here's a random <code>Contact</code>:
 </code>
 <p>Get started by clicking "Manage"...
 <p><A HREF="<c:url value="secure/index.htm"/>">Manage</a>
-<A HREF="<c:url value="secure/debug.jsp"/>">Debug</a>
+<a href="<c:url value="secure/debug.jsp"/>">Debug</a>
 </body>
 </html>
diff --git a/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp b/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp
index 9002df7977..738209fe39 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp
+++ b/samples/contacts/src/main/webapp/WEB-INF/jsp/include.jsp
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
 
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %>
diff --git a/samples/contacts/src/main/webapp/WEB-INF/web.xml b/samples/contacts/src/main/webapp/WEB-INF/web.xml
index 078681e31c..38a3ac734c 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/web.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
 
 <!--
   - Contacts web application
@@ -7,7 +6,9 @@
   - $Id: web.xml 1741 2006-11-14 03:18:42Z benalex $
   -->
 
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 
     <display-name>Contacts Sample Application</display-name>
 
@@ -114,9 +115,4 @@
 		<location>/error.html</location>
 	</error-page>
 
-    <taglib>
-      <taglib-uri>/spring</taglib-uri>
-      <taglib-location>/WEB-INF/spring.tld</taglib-location>
-  	</taglib>
-
 </web-app>
diff --git a/samples/contacts/src/main/webapp/acegilogin.jsp b/samples/contacts/src/main/webapp/acegilogin.jsp
index 9950356282..8a9ca679a2 100644
--- a/samples/contacts/src/main/webapp/acegilogin.jsp
+++ b/samples/contacts/src/main/webapp/acegilogin.jsp
@@ -1,4 +1,4 @@
-<%@ taglib prefix='c' uri='http://java.sun.com/jstl/core' %>
+<%@ taglib prefix='c' uri='http://java.sun.com/jstl/core_rt' %>
 <%@ page import="org.springframework.security.ui.AbstractProcessingFilter" %>
 <%@ page import="org.springframework.security.ui.webapp.AuthenticationProcessingFilter" %>
 <%@ page import="org.springframework.security.AuthenticationException" %>
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index e70a4f8416..243432f7ca 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -19,7 +19,6 @@
             <artifactId>spring-security-acl</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 3e1cf88a3e..63b0f8b703 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -1,23 +1,40 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
-   <groupId>org.springframework.security</groupId>
-   <artifactId>spring-security-parent</artifactId>
-   <version>2.0-SNAPSHOT</version>
- </parent>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-samples</artifactId>
- <name>Spring Security - Samples</name>
- <packaging>pom</packaging>
- <modules>
-<!--
-   <module>annotations</module>
-   <module>attributes</module>
-   <module>dms</module>
--->
-   <module>contacts</module>
-   <module>tutorial</module>
-   <module>dms</module>
-   <module>preauth</module>
- </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.springframework.security</groupId>
+    <artifactId>spring-security-samples</artifactId>
+    <name>Spring Security - Samples</name>
+    <packaging>pom</packaging>
+    <modules>
+        <!--
+           <module>annotations</module>
+           <module>attributes</module>
+           <module>dms</module>
+        -->
+        <module>contacts</module>
+        <module>tutorial</module>
+        <module>dms</module>
+        <module>preauth</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.1.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>1.1.2</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 2cb1207cb2..e425f75e99 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -39,18 +39,6 @@
             <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.0.6</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
diff --git a/samples/preauth/src/main/webapp/secure/extreme/index.jsp b/samples/preauth/src/main/webapp/secure/extreme/index.jsp
index 93f7a17cfc..5cc73bb8b6 100644
--- a/samples/preauth/src/main/webapp/secure/extreme/index.jsp
+++ b/samples/preauth/src/main/webapp/secure/extreme/index.jsp
@@ -1,14 +1,9 @@
-<%@ taglib prefix="authz" uri="http://www.springframework.org/security/tags" %>
 
 <html>
 <body>
 <h1>VERY Secure Page</h1>
 This is a protected page. You can only see me if you are a supervisor.
 
-<authz:authorize ifAllGranted="ROLE_SUPERVISOR">
-   You have "ROLE_SUPERVISOR" (this text is surrounded by &lt;authz:authorize&gt; tags).
-</authz:authorize>
-
 <p><a href="../../">Home</a>
 <p><a href="../../j_spring_security_logout">Logout</a>
 </body>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 5bfc4fc500..2cdf889c5b 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -20,6 +20,11 @@
             <artifactId>spring-security-core-tiger</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -39,18 +44,6 @@
             <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.0.6</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-core</artifactId>
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
index 5ac8c1dd7c..44b044df69 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
@@ -15,7 +15,7 @@
 	<annotation-driven/>
 
     <http>
-        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR" requires-channel="https"/>
+        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
         <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
 		<!-- Disable web URI authorization, as we're using <annotation-driven> and have @Secured the services layer instead
         <intercept-url pattern="/listAccounts.html" access="IS_AUTHENTICATED_REMEMBERED" />
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp b/samples/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp
index f06bb205f1..548f43f3ba 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp
+++ b/samples/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp
@@ -1,4 +1,4 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt"%>
 
 <h1>Accounts</h1>
 
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index 877ef764d2..9bd41353a9 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -46,4 +46,18 @@
             <optional>true</optional>
         </dependency>        
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>
+                    ${basedir}/src/main/resources/org/springframework/security/taglibs
+                </directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>*.tld</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>            
+        </resources>
+    </build>
 </project>
\ No newline at end of file