From 7d842cadf2eb214510f38c8c034d33cc6ecfc2d6 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Wed, 20 Jun 2012 23:45:07 +0200 Subject: [PATCH] WIP: examples - spring --- examples/jsp/src/main/webapp/WEB-INF/c.tld | 572 ------------------ examples/jsp/src/main/webapp/index.html | 1 - examples/servlet/src/main/webapp/index.html | 1 - examples/spring/src/main/resources/log4j.xml | 4 + examples/spring/src/main/webapp/WEB-INF/c.tld | 572 ------------------ .../src/main/webapp/WEB-INF/included.jsp | 2 - .../{simple-page.jsp => spring-page.jsp} | 0 .../spring/src/main/webapp/WEB-INF/web.xml | 30 +- examples/spring/src/main/webapp/default.css | 7 - examples/spring/src/main/webapp/index.html | 32 +- .../src/main/webapp/page-with-forward.jsp | 14 - .../src/main/webapp/page-with-include.jsp | 15 - .../spring/src/main/webapp/simple-page.jsp | 14 - .../cachecontrol/examples/SpringMVCTest.java | 25 +- examples/static/src/main/webapp/index.html | 1 - 15 files changed, 11 insertions(+), 1279 deletions(-) delete mode 100644 examples/jsp/src/main/webapp/WEB-INF/c.tld delete mode 100644 examples/spring/src/main/webapp/WEB-INF/c.tld delete mode 100644 examples/spring/src/main/webapp/WEB-INF/included.jsp rename examples/spring/src/main/webapp/WEB-INF/views/{simple-page.jsp => spring-page.jsp} (100%) delete mode 100644 examples/spring/src/main/webapp/default.css delete mode 100644 examples/spring/src/main/webapp/page-with-forward.jsp delete mode 100644 examples/spring/src/main/webapp/page-with-include.jsp delete mode 100644 examples/spring/src/main/webapp/simple-page.jsp diff --git a/examples/jsp/src/main/webapp/WEB-INF/c.tld b/examples/jsp/src/main/webapp/WEB-INF/c.tld deleted file mode 100644 index 8c447f59..00000000 --- a/examples/jsp/src/main/webapp/WEB-INF/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.1 core library - JSTL core - 1.1 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - org.apache.taglibs.standard.tag.rt.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - org.apache.taglibs.standard.tag.rt.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/examples/jsp/src/main/webapp/index.html b/examples/jsp/src/main/webapp/index.html index 1f4b0eb5..c8c218d1 100644 --- a/examples/jsp/src/main/webapp/index.html +++ b/examples/jsp/src/main/webapp/index.html @@ -4,7 +4,6 @@ JSP Examples -

JSP Examples

diff --git a/examples/servlet/src/main/webapp/index.html b/examples/servlet/src/main/webapp/index.html index d7f24a1a..766627b4 100644 --- a/examples/servlet/src/main/webapp/index.html +++ b/examples/servlet/src/main/webapp/index.html @@ -4,7 +4,6 @@ Servlet Examples -

Servlet Examples

diff --git a/examples/spring/src/main/resources/log4j.xml b/examples/spring/src/main/resources/log4j.xml index d3414bdb..13ec197b 100644 --- a/examples/spring/src/main/resources/log4j.xml +++ b/examples/spring/src/main/resources/log4j.xml @@ -13,6 +13,10 @@ + + + +

diff --git a/examples/spring/src/main/webapp/WEB-INF/c.tld b/examples/spring/src/main/webapp/WEB-INF/c.tld deleted file mode 100644 index 8c447f59..00000000 --- a/examples/spring/src/main/webapp/WEB-INF/c.tld +++ /dev/null @@ -1,572 +0,0 @@ - - - - - JSTL 1.1 core library - JSTL core - 1.1 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - org.apache.taglibs.standard.tag.rt.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - java.lang.Object - - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - java.lang.String - - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - java.lang.Object - - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - org.apache.taglibs.standard.tag.rt.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/examples/spring/src/main/webapp/WEB-INF/included.jsp b/examples/spring/src/main/webapp/WEB-INF/included.jsp deleted file mode 100644 index 1931d893..00000000 --- a/examples/spring/src/main/webapp/WEB-INF/included.jsp +++ /dev/null @@ -1,2 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8" session="false"%> -

Hello World, again...

diff --git a/examples/spring/src/main/webapp/WEB-INF/views/simple-page.jsp b/examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp similarity index 100% rename from examples/spring/src/main/webapp/WEB-INF/views/simple-page.jsp rename to examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp diff --git a/examples/spring/src/main/webapp/WEB-INF/web.xml b/examples/spring/src/main/webapp/WEB-INF/web.xml index 64cdaf70..4f26f015 100644 --- a/examples/spring/src/main/webapp/WEB-INF/web.xml +++ b/examples/spring/src/main/webapp/WEB-INF/web.xml @@ -35,38 +35,17 @@ logger - *.jsp + *.html

accelerator

*.html

- - accelerator - *.jsp - - - accelerator - *.css - - - accelerator - /test-servlet - - - accelerator - /spring/* - - - test-servlet - de.halbekunst.juplo.test.TestServlet - -

dispatcher-servlet

org.springframework.web.servlet.DispatcherServlet @@ -81,14 +60,9 @@ - - test-servlet - /test-servlet - - dispatcher-servlet - /spring/* + *.html diff --git a/examples/spring/src/main/webapp/default.css b/examples/spring/src/main/webapp/default.css deleted file mode 100644 index e04bba27..00000000 --- a/examples/spring/src/main/webapp/default.css +++ /dev/null @@ -1,7 +0,0 @@ -body { - background-color: #ccc; - color: #444; -} -h1,h2,h3,h4 { - color: #000; -} \ No newline at end of file diff --git a/examples/spring/src/main/webapp/index.html b/examples/spring/src/main/webapp/index.html index cd95f2c5..58f00940 100644 --- a/examples/spring/src/main/webapp/index.html +++ b/examples/spring/src/main/webapp/index.html @@ -3,38 +3,12 @@ - Static Page - + Spring Examples -

Static Page

This page is a static HTML-page

At the same time, it gives an overview over all tests...

JSP-Pages

Spring Examples

Static Content

Dynamic Servlet-Answers

diff --git a/examples/spring/src/main/webapp/page-with-forward.jsp b/examples/spring/src/main/webapp/page-with-forward.jsp deleted file mode 100644 index 35e49058..00000000 --- a/examples/spring/src/main/webapp/page-with-forward.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8" session="false" buffer="1kb" %> - - - - - - Page with forward - - -

Hello World!

This should not be seen, because the page is forwardes to /simple-page.jsp

- - - diff --git a/examples/spring/src/main/webapp/page-with-include.jsp b/examples/spring/src/main/webapp/page-with-include.jsp deleted file mode 100644 index ba581a46..00000000 --- a/examples/spring/src/main/webapp/page-with-include.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8" session="false" buffer="1kb" %> -<%@taglib uri="/WEB-INF/c.tld" prefix="c"%> - - - - - - Page with include - - - -

Hello World!

- ${i}: - - diff --git a/examples/spring/src/main/webapp/simple-page.jsp b/examples/spring/src/main/webapp/simple-page.jsp deleted file mode 100644 index 880d7611..00000000 --- a/examples/spring/src/main/webapp/simple-page.jsp +++ /dev/null @@ -1,14 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8" session="false" buffer="1kb" %> - - - - - - Simple Page - - - -

Hello World!

This is a really simple page...

- - diff --git a/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java b/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java index 7250b5fb..f90d16e6 100644 --- a/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java +++ b/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java @@ -21,29 +21,8 @@ public class SpringMVCTest extends HttpTestCase { @Test - public void testSimplePage() throws Exception { - WebResponse response = executeRequest("http://localhost:8080/simple-page.jsp"); - log.info("Title:\t\t{}", response.getTitle()); - log.debug("Text:\t\t{}", response.getText()); - } - - @Test - public void testPageWithInclude() throws Exception { - WebResponse response = executeRequest("http://localhost:8080/page-with-include.jsp"); - log.info("Title:\t\t{}", response.getTitle()); - log.debug("Text:\t\t{}", response.getText()); - } - - @Test - public void testPageWithForward() throws Exception { - WebResponse response = executeRequest("http://localhost:8080/page-with-forward.jsp"); - log.info("Title:\t\t{}", response.getTitle()); - log.debug("Text:\t\t{}", response.getText()); - } - - @Test - public void testStaticContent() throws Exception { - WebResponse response = executeRequest("http://localhost:8080/default.css"); + public void testSpringPage() throws Exception { + WebResponse response = executeRequest("http://localhost:8080/spring-page.html"); log.info("Title:\t\t{}", response.getTitle()); log.debug("Text:\t\t{}", response.getText()); } diff --git a/examples/static/src/main/webapp/index.html b/examples/static/src/main/webapp/index.html index 107f2473..22c61d08 100644 --- a/examples/static/src/main/webapp/index.html +++ b/examples/static/src/main/webapp/index.html @@ -4,7 +4,6 @@ Examples for Static Content -

Examples for Static Content

-- 2.20.1