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

[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 e2986012ed2496f8664c015d37cedb865325baf1
Merge: 9ef471f be8f62d
Author: James Page <james.page at ubuntu.com>
Date:   Tue Dec 31 14:19:36 2013 +0000

    Merge tag 'upstream/1.218'
    
    Upstream version 1.218

 core/pom.xml                                       |  37 +-
 .../java/org/kohsuke/stapler/AncestorImpl.java     |   8 +-
 .../java/org/kohsuke/stapler/AncestorInPath.java   |   9 +
 .../org/kohsuke/stapler/AnnotationHandler.java     |  86 ++--
 .../stapler/CancelRequestHandlingException.java    |  18 +
 .../CaptureParameterNameTransformation.java        |  22 +-
 .../main/java/org/kohsuke/stapler/CrumbIssuer.java |   2 +-
 .../main/java/org/kohsuke/stapler/Dispatcher.java  |   2 +-
 .../main/java/org/kohsuke/stapler/Function.java    |  15 +-
 core/src/main/java/org/kohsuke/stapler/Header.java |  20 +
 .../org/kohsuke/stapler/HttpResponseRenderer.java  |  21 +-
 .../java/org/kohsuke/stapler/HttpResponses.java    |  17 +
 .../org/kohsuke/stapler/InjectedParameter.java     |  25 ++
 .../main/java/org/kohsuke/stapler/MetaClass.java   |  12 +-
 .../java/org/kohsuke/stapler/MetaClassLoader.java  |   6 +-
 .../org/kohsuke/stapler/NameBasedDispatcher.java   |   5 +-
 .../java/org/kohsuke/stapler/QueryParameter.java   |  20 +
 .../main/java/org/kohsuke/stapler/RequestImpl.java |  11 +-
 .../java/org/kohsuke/stapler/ResponseImpl.java     |  20 +-
 .../src/main/java/org/kohsuke/stapler/Stapler.java |  43 +-
 .../org/kohsuke/stapler/StaplerOverridable.java    |  10 +-
 .../java/org/kohsuke/stapler/StaplerResponse.java  |  17 +
 .../main/java/org/kohsuke/stapler/TokenList.java   |  20 +-
 core/src/main/java/org/kohsuke/stapler/WebApp.java |  48 +-
 .../org/kohsuke/stapler/bind/BoundObjectTable.java |   6 +-
 .../org/kohsuke/stapler/bind/WithWellKnownURL.java |   3 +
 .../stapler/compression/CompressionFilter.java     |  59 ++-
 .../compression/CompressionServletResponse.java    |   2 +-
 .../compression/UncaughtExceptionHandler.java      |  55 +++
 .../org/kohsuke/stapler/export/ModelBuilder.java   |   6 +-
 .../kohsuke/stapler/framework/io/LargeText.java    |   2 +-
 .../kohsuke/stapler/interceptor/Interceptor.java   |   2 +
 .../stapler/interceptor/JsonOutputFilter.java      | 119 +++++
 .../kohsuke/stapler/interceptor/RequirePOST.java   |  21 +-
 .../stapler/interceptor/RespondSuccess.java        |  36 ++
 .../stapler/jsr269/ConstructorProcessor.java       |   6 +
 .../jsr269/RequirePOSTAnnotationProcessor.java     | 105 +++++
 .../jsr269/WebMethodAnnotationProcessor.java       |  10 +-
 .../src/main/resources/org/kohsuke/stapler/bind.js |  61 ++-
 .../main/resources/org/kohsuke/stapler/json2.js    | 486 +++++++++++++++++++++
 .../org/kohsuke/stapler/ClassDescriptorTest.java   |  35 +-
 .../org/kohsuke/stapler/ServletConfigImpl.java     |   2 +-
 .../kohsuke/stapler/bind/JavaScriptProxyTest.java  |   1 +
 .../stapler/interceptor/JsonOutputFilterTest.java  | 160 +++++++
 .../stapler/jsr269/ConstructorProcessorTest.java   |  19 +
 .../jsr269/RequirePOSTAnnotationProcessorTest.java | 108 +++++
 groovy/pom.xml                                     |   2 +-
 jelly/pom.xml                                      |   8 +-
 .../stapler/framework/adjunct/AdjunctsInPage.java  |   7 +
 .../java/org/kohsuke/stapler/jelly/BindTag.java    |  38 ++
 .../java/org/kohsuke/stapler/jelly/HeaderTag.java  |   1 +
 .../java/org/kohsuke/stapler/jelly/JellyFacet.java |   2 +-
 .../org/kohsuke/stapler/jelly/SetHeaderTag.java    |  39 ++
 .../kohsuke/stapler/jelly/StaplerTagLibrary.java   |   4 +-
 .../{BindTagTest.java => BindTagJQueryTest.java}   |  19 +-
 .../org/kohsuke/stapler/jelly/BindTagTest.java     |   6 +-
 .../stapler/jelly/BindTagJQueryTest/index.jelly    |  10 +
 jrebel/pom.xml                                     |   2 +-
 .../main/java/org/kohsuke/stapler/JRebelFacet.java |   5 +-
 jruby/pom.xml                                      |   6 +-
 .../stapler/jelly/jruby/RackDispatcher.java        |   9 +-
 .../stapler/jelly/jruby/erb/JRubyJellyERbScript.rb |   5 +
 jsp/pom.xml                                        |   2 +-
 pom.xml                                            |  20 +-
 64 files changed, 1755 insertions(+), 228 deletions(-)

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