[stapler] 01/03: Merge tag 'upstream/1.207'

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository stapler.

commit bdd958c32cf7a981613d6d3f966e070b122f76f6
Merge: b551a6a fa5a105
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 09:38:40 2013 +0100

    Merge tag 'upstream/1.207'
    
    Upstream version 1.207

 core/pom.xml                                       |    8 +-
 .../java/org/kohsuke/stapler/AbstractTearOff.java  |   21 +-
 .../java/org/kohsuke/stapler/AttributeKey.java     |  117 +++++++++++
 .../main/java/org/kohsuke/stapler/CrumbIssuer.java |    7 +
 .../main/java/org/kohsuke/stapler/Function.java    |    2 +-
 .../java/org/kohsuke/stapler/HttpRedirect.java     |   16 +-
 .../org/kohsuke/stapler/HttpResponseRenderer.java  |    9 +-
 .../java/org/kohsuke/stapler/HttpResponses.java    |   20 +-
 .../main/java/org/kohsuke/stapler/RequestImpl.java |   14 ++
 .../java/org/kohsuke/stapler/ResponseImpl.java     |   48 ++++-
 .../src/main/java/org/kohsuke/stapler/Stapler.java |  214 +++++++++++++++-----
 .../java/org/kohsuke/stapler/StaplerRequest.java   |   10 +
 .../java/org/kohsuke/stapler/StaplerResponse.java  |    8 +-
 .../java/org/kohsuke/stapler/StaticViewFacet.java  |  116 +++++++++++
 .../main/java/org/kohsuke/stapler/WebMethod.java   |    2 +-
 .../org/kohsuke/stapler/bind/BoundObjectTable.java |   18 +-
 .../stapler/compression/CompressionFilter.java     |    5 +-
 .../org/kohsuke/stapler/config/Configuration.java  |   32 +++
 .../stapler/config/ConfigurationLoader.java        |  160 +++++++++++++++
 .../kohsuke/stapler/export/NamedPathPruner.java    |    1 +
 .../jsr269/ExportedBeanAnnotationProcessor.java    |    4 +-
 .../kohsuke/stapler/jsr269/PoormansMultimap.java   |   34 ++++
 .../jsr269/WebMethodAnnotationProcessor.java       |   58 ++++++
 .../kohsuke/stapler/AbstractStaplerTestBase.java   |   10 +-
 .../kohsuke/stapler/HttpResponseRendererTest.java  |   56 +++++
 .../java/org/kohsuke/stapler/ResponseImplTest.java |   48 +++++
 .../test/java/org/kohsuke/stapler/StaplerTest.java |   64 ++++++
 .../ExportedBeanAnnotationProcessorTest.java       |   12 +-
 .../jsr269/WebMethodAnnotationProcessorTest.java   |   67 ++++++
 groovy/pom.xml                                     |    2 +-
 .../stapler/jelly/groovy/GroovierJellyScript.java  |    3 +
 .../jelly/groovy/GroovyClassLoaderTearOff.java     |   19 +-
 .../stapler/jelly/groovy/GroovyClassTearOff.java   |   28 +--
 .../kohsuke/stapler/jelly/groovy/GroovyFacet.java  |   23 ++-
 .../jelly/groovy/GroovyServerPageScript.java       |   26 +++
 .../jelly/groovy/GroovyServerPageTearOff.java      |   40 ++++
 .../kohsuke/stapler/jelly/groovy/JellyBuilder.java |   16 +-
 .../stapler/jelly/groovy/SimpleTemplateParser.java |  182 +++++++++++++++++
 jelly/pom.xml                                      |   47 ++++-
 .../stapler/framework/adjunct/AdjunctManager.java  |   63 ++++--
 .../stapler/framework/adjunct/AdjunctsInPage.java  |    5 +-
 .../kohsuke/stapler/jelly/JellyClassTearOff.java   |    5 +
 jrebel/pom.xml                                     |    2 +-
 jruby/pom.xml                                      |    2 +-
 jsp/pom.xml                                        |    2 +-
 pom.xml                                            |    2 +-
 46 files changed, 1491 insertions(+), 157 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git