This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a change to branch master
in repository sisu-guice.
from 433f75b Merge branch 'master' of
git://git.debian.org/git/pkg-java/sisu-guice
new fe0ddfe Imported Upstream version 3.2.0+dfsg
new 7e4e259 changes for new upstream release
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 22 +-
.../GUICE_618_followup_pipeline_experiment.patch | 844 +++++++++++++++++++++
PATCHES/GUICE_697_add_missing_headers.patch | 50 +-
.../GUICE_709_externalize_guava_dependency.patch | 843 --------------------
PATCHES/GUICE_759_upgrade_to_asm5.patch | 19 +-
PATCHES/GUICE_799_fix_osgi_metadata.patch | 33 +
PATCHES/SISUFY.patch | 116 ++-
build.xml | 8 +-
common.xml | 8 +-
core/pom.xml | 48 +-
core/src/com/google/inject/Inject.java | 2 +-
.../google/inject/binder/LinkedBindingBuilder.java | 7 +
.../com/google/inject/internal/BindingBuilder.java | 4 +
.../google/inject/internal/BindingProcessor.java | 12 +-
.../InternalFactoryToInitializableAdapter.java | 5 +-
.../com/google/inject/internal/InternalFlags.java | 16 +
.../internal/ProviderInstanceBindingImpl.java | 13 +-
.../com/google/inject/internal/ProviderMethod.java | 23 +-
.../com/google/inject/internal/RehashableKeys.java | 16 +
core/src/com/google/inject/spi/ElementSource.java | 16 +
core/src/com/google/inject/spi/ModuleSource.java | 16 +
.../google/inject/spi/ProviderInstanceBinding.java | 9 +-
...dKeyBinding.java => ProvidesMethodBinding.java} | 34 +-
.../inject/spi/ProvidesMethodTargetVisitor.java | 19 +-
core/test/com/google/inject/spi/ElementsTest.java | 58 ++
.../com/google/inject/spi/ProviderMethodsTest.java | 57 +-
.../com/google/inject/spi/SpiBindingsTest.java | 4 +-
.../com/googlecode/guice/OSGiContainerTest.java | 2 +-
debian/changelog | 8 +
debian/control | 3 +-
debian/maven.rules | 1 +
extensions/assistedinject/.gitignore | 1 +
extensions/assistedinject/build.xml | 2 +-
extensions/assistedinject/pom.xml | 2 +-
extensions/grapher/.gitignore | 1 +
extensions/grapher/build.xml | 2 +-
extensions/grapher/pom.xml | 2 +-
.../google/inject/grapher/DefaultNodeCreator.java | 3 +-
.../inject/grapher/ShortNameFactoryTest.java | 2 +-
extensions/jmx/.gitignore | 1 +
extensions/jmx/build.xml | 2 +-
extensions/jmx/pom.xml | 12 +-
extensions/jndi/.gitignore | 1 +
extensions/jndi/build.xml | 2 +-
extensions/jndi/pom.xml | 2 +-
extensions/mini/.gitignore | 1 +
extensions/multibindings/.gitignore | 1 +
extensions/multibindings/build.xml | 2 +-
extensions/multibindings/pom.xml | 2 +-
.../com/google/inject/multibindings/MapBinder.java | 36 +-
.../google/inject/multibindings/RealElement.java | 4 +
.../google/inject/multibindings/MapBinderTest.java | 53 +-
.../com/google/inject/multibindings/SpiUtils.java | 4 +-
extensions/persist/.gitignore | 1 +
extensions/persist/build.xml | 2 +-
extensions/persist/pom.xml | 27 +-
.../inject/persist/jpa/JpaLocalTxnInterceptor.java | 5 +-
.../test/com/google/inject/persist/EdslTest.java | 6 +-
extensions/pom.xml | 43 +-
extensions/service/.gitignore | 1 +
extensions/servlet/.gitignore | 1 +
extensions/servlet/build.xml | 2 +-
extensions/servlet/pom.xml | 2 +-
...erPipeline.java => AbstractFilterPipeline.java} | 51 +-
...tPipeline.java => AbstractServletPipeline.java} | 46 +-
.../inject/servlet/FilterChainInvocation.java | 4 +-
.../google/inject/servlet/FilterDefinition.java | 19 +-
.../src/com/google/inject/servlet/GuiceFilter.java | 26 +-
.../inject/servlet/InternalServletModule.java | 7 +-
.../inject/servlet/ManagedFilterPipeline.java | 121 +--
.../inject/servlet/ManagedServletPipeline.java | 138 +---
.../google/inject/servlet/ServletDefinition.java | 22 +-
.../com/google/inject/servlet/ServletScopes.java | 21 +-
.../google/inject/servlet/UriPatternMatcher.java | 2 +-
.../com/google/inject/servlet/ServletTest.java | 45 +-
extensions/spring/.gitignore | 1 +
extensions/spring/build.xml | 2 +-
extensions/spring/pom.xml | 2 +-
extensions/struts2/.gitignore | 1 +
extensions/struts2/build.xml | 2 +-
extensions/struts2/pom.xml | 2 +-
extensions/throwingproviders/.gitignore | 1 +
extensions/throwingproviders/build.xml | 2 +-
extensions/throwingproviders/pom.xml | 14 +-
guice.iml | 2 +-
pom.xml | 49 +-
86 files changed, 1683 insertions(+), 1441 deletions(-)
create mode 100644 PATCHES/GUICE_618_followup_pipeline_experiment.patch
delete mode 100644 PATCHES/GUICE_709_externalize_guava_dependency.patch
create mode 100644 PATCHES/GUICE_799_fix_osgi_metadata.patch
copy core/src/com/google/inject/spi/{LinkedKeyBinding.java =>
ProvidesMethodBinding.java} (55%)
copy
extensions/assistedinject/src/com/google/inject/assistedinject/AssistedInjectTargetVisitor.java
=> core/src/com/google/inject/spi/ProvidesMethodTargetVisitor.java (60%)
create mode 100644 extensions/assistedinject/.gitignore
create mode 100644 extensions/grapher/.gitignore
create mode 100644 extensions/jmx/.gitignore
create mode 100644 extensions/jndi/.gitignore
create mode 100644 extensions/mini/.gitignore
create mode 100644 extensions/multibindings/.gitignore
create mode 100644 extensions/persist/.gitignore
create mode 100644 extensions/service/.gitignore
create mode 100644 extensions/servlet/.gitignore
copy
extensions/servlet/src/com/google/inject/servlet/{ManagedFilterPipeline.java =>
AbstractFilterPipeline.java} (73%)
copy
extensions/servlet/src/com/google/inject/servlet/{ManagedServletPipeline.java
=> AbstractServletPipeline.java} (80%)
create mode 100644 extensions/spring/.gitignore
create mode 100644 extensions/struts2/.gitignore
create mode 100644 extensions/throwingproviders/.gitignore
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/sisu-guice.git
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
