[shiro] 04/08: Merge tag 'upstream/1.3.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Nov 16 14:33:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository shiro.
commit 4b5bd6e0e4097b4d4d4ca5e01179e93a3648b833
Merge: e1cf2c5 21ae204
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 16 15:17:46 2016 +0100
Merge tag 'upstream/1.3.2'
Upstream version 1.3.2
all/pom.xml | 16 +-
core/pom.xml | 2 +-
.../shiro/aop/DefaultAnnotationResolver.java | 7 +-
.../authc/credential/SimpleCredentialsMatcher.java | 3 +-
.../shiro/authz/permission/DomainPermission.java | 1 -
.../shiro/authz/permission/WildcardPermission.java | 36 +-
.../shiro/cache/MemoryConstrainedCacheManager.java | 4 +-
.../src/main/java/org/apache/shiro/config/Ini.java | 15 +-
.../shiro/config/IniSecurityManagerFactory.java | 6 +
.../org/apache/shiro/config/ReflectionBuilder.java | 459 ++++++++++++++++++--
.../org/apache/shiro/config/event/BeanEvent.java | 33 +-
.../apache/shiro/config/event/BeanListener.java | 31 +-
.../shiro/config/event/BeanListenerSupport.java | 49 +++
.../shiro/config/event/ConfiguredBeanEvent.java | 31 +-
.../shiro/config/event/DestroyedBeanEvent.java | 30 +-
.../shiro/config/event/InitializedBeanEvent.java | 30 +-
.../shiro/config/event/InstantiatedBeanEvent.java | 30 +-
.../config/event/LoggingBeanEventListener.java | 36 +-
.../org/apache/shiro/crypto/hash/AbstractHash.java | 2 +-
.../org/apache/shiro/crypto/hash/SimpleHash.java | 4 +-
.../crypto/hash/format/ProvidedHashFormat.java | 6 +-
.../main/java/org/apache/shiro/event/Event.java | 35 +-
.../main/java/org/apache/shiro/event/EventBus.java | 85 ++++
.../java/org/apache/shiro/event/EventBusAware.java | 44 ++
.../java/org/apache/shiro/event/Subscribe.java | 45 ++
.../support/AnnotationEventListenerResolver.java | 96 +++++
.../shiro/event/support/DefaultEventBus.java | 219 ++++++++++
.../shiro/event/support/EventClassComparator.java | 74 ++++
.../apache/shiro/event/support/EventListener.java | 56 +++
.../event/support/EventListenerComparator.java | 71 ++++
.../shiro/event/support/EventListenerResolver.java | 50 +++
.../support/SingleArgumentMethodEventListener.java | 84 ++++
.../shiro/event/support/TypedEventListener.java | 24 +-
.../shiro/mgt/AbstractRememberMeManager.java | 13 +-
.../apache/shiro/mgt/CachingSecurityManager.java | 62 ++-
.../org/apache/shiro/mgt/RealmSecurityManager.java | 36 ++
.../apache/shiro/mgt/SessionsSecurityManager.java | 31 ++
.../org/apache/shiro/realm/AuthorizingRealm.java | 4 +-
.../{JndiLdapRealm.java => DefaultLdapRealm.java} | 10 +-
.../shiro/realm/ldap/JndiLdapContextFactory.java | 6 +-
.../org/apache/shiro/realm/ldap/JndiLdapRealm.java | 460 ++-------------------
.../shiro/realm/ldap/LdapContextFactory.java | 2 +-
.../session/mgt/AbstractNativeSessionManager.java | 44 +-
.../mgt/AbstractValidatingSessionManager.java | 6 +-
.../ExecutorServiceSessionValidationScheduler.java | 29 +-
.../main/java/org/apache/shiro/util/Assert.java | 407 ++++++++++++++++++
.../java/org/apache/shiro/util/ClassUtils.java | 27 ++
.../org/apache/shiro/util/CollectionUtils.java | 13 +-
.../org/apache/shiro/util/JavaEnvironment.java | 23 +-
.../credential/DefaultPasswordServiceTest.groovy | 19 +-
.../shiro/config/ReflectionBuilderTest.groovy | 216 +++++-----
.../apache/shiro/config/event/BeanEventTest.groovy | 33 +-
.../event/LoggingBeanEventListenerTest.groovy | 33 +-
.../groovy/org/apache/shiro/event/EventTest.groovy | 35 +-
.../AnnotationEventListenerResolverTest.groovy | 45 ++
.../org/apache/shiro/event/support/BarEvent.groovy | 24 +-
.../org/apache/shiro/event/support/BazEvent.groovy | 24 +-
.../shiro/event/support/DefaultEventBusTest.groovy | 175 ++++++++
.../support/ErroneouslyAnnotatedSubscriber.groovy | 24 +-
.../shiro/event/support/ErrorCausingEvent.groovy | 24 +-
.../event/support/EventClassComparatorTest.groovy | 64 +++
.../support/EventListenerComparatorTest.groovy | 71 ++++
.../support/ExceptionThrowingSubscriber.groovy | 25 +-
.../org/apache/shiro/event/support/FooEvent.groovy | 24 +-
.../support/InvalidMethodModiferSubscriber.groovy | 25 +-
.../event/support/NotAnnotatedSubscriber.groovy | 26 +-
.../apache/shiro/event/support/SimpleEvent.groovy | 24 +-
.../shiro/event/support/SimpleSubscriber.groovy | 25 +-
.../SingleArgumentMethodEventListenerTest.groovy | 104 +++++
.../event/support/SubclassTestSubscriber.groovy | 30 +-
.../shiro/event/support/TestSubscriber.groovy | 31 +-
.../apache/shiro/aop/AnnotationResolverTest.java | 10 +
.../authz/permission/DomainPermissionTest.java | 3 +
.../authz/permission/WildcardPermissionTest.java | 29 ++
.../apache/shiro/config/RecordingBeanListener.java | 91 ++++
...dapRealmTest.java => DefaultLdapRealmTest.java} | 17 +-
.../apache/shiro/realm/ldap/JndiLdapRealmTest.java | 134 +-----
.../session/mgt/DefaultSessionManagerTest.java | 25 ++
.../subject/SimplePrincipalCollectionTest.java | 32 +-
pom.xml | 89 +++-
samples/aspectj/pom.xml | 2 +-
samples/guice/pom.xml | 130 ++++++
.../samples/guice/SampleShiroGuiceBootstrap.java | 44 ++
.../SampleShiroNativeSessionsServletModule.java | 75 ++++
.../samples/guice/SampleShiroServletModule.java | 91 ++++
samples/guice/src/main/resources/log4j.properties | 47 +++
.../src/main/webapp/WEB-INF/shiro.ini | 3 +-
.../guice/src/main/webapp/WEB-INF/web.xml | 35 +-
.../guice/src/main/webapp/account/index.jsp | 34 +-
samples/guice/src/main/webapp/home.jsp | 69 ++++
.../guice/src/main/webapp/include.jsp | 30 +-
.../guice/src/main/webapp/index.jsp | 27 +-
samples/guice/src/main/webapp/login.jsp | 110 +++++
.../guice/src/main/webapp/style.css | 46 ++-
.../shiro/samples/guice/AbstractContainerTest.java | 89 ++++
.../samples/guice/ContainerIntegrationTest.java | 79 ++++
samples/pom.xml | 20 +-
samples/{quickstart => quickstart-guice}/pom.xml | 34 +-
.../src/main/java/QuickstartGuice.java | 118 ++++++
.../src/main/java/QuickstartShiroModule.java | 34 +-
.../src/main/resources/log4j.properties | 36 ++
.../quickstart-guice/src/main/resources/shiro.ini | 58 +++
samples/quickstart/pom.xml | 18 +-
samples/spring-client/pom.xml | 2 +-
samples/spring-hibernate/pom.xml | 2 +-
samples/spring/pom.xml | 2 +-
samples/web/pom.xml | 2 +-
samples/web/src/main/webapp/WEB-INF/shiro.ini | 2 +
src/site/resources/images/apache-shiro-logo.png | Bin 0 -> 20928 bytes
src/site/resources/images/asf_logo.png | Bin 0 -> 18372 bytes
tools/pom.xml => src/site/site.xml | 45 +-
support/aspectj/pom.xml | 2 +-
support/cas/pom.xml | 2 +-
.../shiro/cas/CasAuthenticationException.java | 3 +
.../main/java/org/apache/shiro/cas/CasFilter.java | 3 +
.../main/java/org/apache/shiro/cas/CasRealm.java | 3 +
.../org/apache/shiro/cas/CasSubjectFactory.java | 3 +
.../main/java/org/apache/shiro/cas/CasToken.java | 3 +
.../org/apache/shiro/cas/CasRealmTest.groovy | 3 +
.../org/apache/shiro/cas/CasTokenTest.groovy | 3 +
.../shiro/cas/MockServiceTicketValidator.groovy | 3 +
support/ehcache/pom.xml | 4 +-
.../apache/shiro/cache/ehcache/EhCacheManager.java | 8 +-
support/features/pom.xml | 5 +-
support/features/src/main/resources/features.xml | 19 +
support/guice/pom.xml | 4 +-
.../org/apache/shiro/guice/web/ShiroWebModule.java | 4 +-
.../apache/shiro/guice/web/ShiroWebModuleTest.java | 9 +-
support/{quartz => hazelcast}/pom.xml | 20 +-
.../hazelcast/cache/HazelcastCacheManager.java | 245 +++++++++++
.../cache/HazelcastCacheManagerTest.groovy | 182 ++++++++
.../hazelcast/src/test/resources/log4j.properties | 35 ++
support/pom.xml | 3 +-
support/quartz/pom.xml | 2 +-
support/spring/pom.xml | 2 +-
tools/hasher/pom.xml | 2 +-
tools/pom.xml | 2 +-
web/pom.xml | 2 +-
.../apache/shiro/web/env/EnvironmentLoader.java | 19 +-
.../authc/BasicHttpAuthenticationFilter.java | 37 ++
.../shiro/web/servlet/ShiroHttpServletRequest.java | 1 +
.../web/servlet/ShiroHttpServletResponse.java | 4 +
.../org/apache/shiro/web/servlet/SimpleCookie.java | 28 +-
.../shiro/web/session/HttpServletSession.java | 2 +-
.../web/session/mgt/DefaultWebSessionManager.java | 15 +
.../java/org/apache/shiro/web/util/WebUtils.java | 5 +-
.../shiro/web/env/EnvironmentLoaderTest.groovy | 88 ++++
.../shiro/web/env/IniWebEnvironmentTest.groovy | 4 +-
.../apache/shiro/web/env/MockWebEnvironment.groovy | 66 +++
.../servlet/ShiroHttpServletResponseTest.groovy | 166 ++++++++
.../mgt/DefaultWebSessionManagerTest.groovy | 4 +
.../org/apache/shiro/web/util/WebUtilsTest.groovy | 175 ++++++++
.../authc/BasicHttpFilterAuthenticationTest.java | 98 ++++-
.../apache/shiro/web/servlet/SimpleCookieTest.java | 33 ++
.../shiro/web/session/HttpServletSessionTest.java | 63 +++
155 files changed, 5645 insertions(+), 1441 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/shiro.git
More information about the pkg-java-commits
mailing list