[sisu-guice] 01/02: Merge tag 'upstream/3.2.2+dfsg'

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch master
in repository sisu-guice.

commit 32c48efe5319f0ccb69062b5b16c68c286e6eefe
Merge: 175d16d 8584b25
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Fri Jun 6 13:10:37 2014 +0000

    Merge tag 'upstream/3.2.2+dfsg'
    
    Upstream version 3.2.2+dfsg

 PATCHES/SISUFY.patch                               |  54 +++++-
 build.xml                                          |   2 +-
 common.xml                                         |   2 +-
 core/pom.xml                                       |   4 +-
 core/src/com/google/inject/CreationException.java  |   2 +-
 core/src/com/google/inject/ProvisionException.java |   2 +-
 .../com/google/inject/internal/ProviderMethod.java | 109 ++++++++++-
 .../inject/internal/ProviderMethodsModule.java     |  16 +-
 .../src/com/google/inject/internal/WeakKeySet.java |  92 +++++----
 core/src/com/google/inject/spi/InjectionPoint.java |  26 ++-
 core/src/com/google/inject/util/Providers.java     | 110 +++++++----
 .../com/google/inject/spi/InjectionPointTest.java  |  76 +++++++-
 .../com/google/inject/spi/ProviderMethodsTest.java | 214 ++++++++++++++++++++-
 .../test/com/google/inject/util/ProvidersTest.java |  69 +++++++
 extensions/assistedinject/pom.xml                  |   2 +-
 .../inject/assistedinject/AssistedConstructor.java |   8 +-
 .../inject/assistedinject/BindingCollector.java    |  10 +
 .../assistedinject/FactoryModuleBuilder.java       |   2 +-
 .../inject/assistedinject/FactoryProvider.java     |  60 ++++--
 .../inject/assistedinject/FactoryProvider2.java    |  64 ++++--
 .../assistedinject/FactoryModuleBuilderTest.java   |  51 ++++-
 .../assistedinject/FactoryProvider2Test.java       |  76 +++++++-
 .../inject/assistedinject/FactoryProviderTest.java |  83 +++++++-
 extensions/grapher/pom.xml                         |   2 +-
 extensions/jmx/pom.xml                             |   2 +-
 extensions/jndi/pom.xml                            |   2 +-
 extensions/multibindings/pom.xml                   |   2 +-
 .../inject/multibindings/MultibinderTest.java      |  11 +-
 extensions/persist/pom.xml                         |   2 +-
 extensions/pom.xml                                 |   4 +-
 extensions/servlet/pom.xml                         |   2 +-
 .../servlet/ContinuingHttpServletRequest.java      |  74 ++++++-
 .../src/com/google/inject/servlet/GuiceFilter.java |  12 +-
 .../com/google/inject/servlet/ServletScopes.java   |  26 +--
 .../com/google/inject/servlet/UriPatternType.java  |  12 +-
 .../test/com/google/inject/servlet/AllTests.java   |   4 +-
 .../servlet/ContinuingHttpServletRequestTest.java  |  59 +++++-
 .../servlet/ContinuingRequestIntegrationTest.java  |   3 +
 .../servlet/ServletDispatchIntegrationTest.java    |  76 ++++++++
 .../servlet/TransferRequestIntegrationTest.java    |  11 +-
 .../google/inject/servlet/UriPatternTypeTest.java  |  59 ++++++
 extensions/spring/pom.xml                          |   2 +-
 extensions/struts2/pom.xml                         |   2 +-
 extensions/testlib/pom.xml                         |   2 +-
 extensions/throwingproviders/pom.xml               |   2 +-
 .../throwingproviders/ThrowingProviderBinder.java  |  25 ++-
 .../throwingproviders/CheckedProviderTest.java     |   2 +-
 pom.xml                                            |   4 +-
 48 files changed, 1306 insertions(+), 230 deletions(-)

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