You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/06/18 05:13:47 UTC
svn commit: r785881 [1/11] - in /incubator/shiro/trunk: ./ all/
core/src/main/java/org/apache/ki/ core/src/main/java/org/apache/shiro/
core/src/main/java/org/apache/shiro/aop/
core/src/main/java/org/apache/shiro/authc/
core/src/main/java/org/apache/shi...
Author: adc
Date: Thu Jun 18 03:13:34 2009
New Revision: 785881
URL: http://svn.apache.org/viewvc?rev=785881&view=rev
Log:
Ki to Shiro rename
Added:
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/core/src/main/java/org/apache/ki/
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java (with props)
incubator/shiro/trunk/core/src/main/resources/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/core/src/main/resources/org/apache/ki/
incubator/shiro/trunk/core/src/main/resources/org/apache/shiro/realm/text/default-shiro-users.properties (with props)
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/core/src/test/java/org/apache/ki/
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/samples/spring/src/main/java/org/apache/ki/
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/shiro.jnlp.jsp
- copied, changed from r785781, incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/ki.jnlp.jsp
incubator/shiro/trunk/samples/spring/src/main/webapp/shiro.css
- copied unchanged from r785781, incubator/shiro/trunk/samples/spring/src/main/webapp/ki.css
incubator/shiro/trunk/samples/standalone/src/main/resources/shiro.ini
- copied, changed from r785781, incubator/shiro/trunk/samples/standalone/src/main/resources/ki.ini
incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/support/ehcache/src/main/resources/org/apache/ki/
incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/support/quartz/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/support/spring/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java
incubator/shiro/trunk/support/spring/src/test/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/support/spring/src/test/java/org/apache/ki/
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/web/src/main/java/org/apache/ki/
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletRequest.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpServletResponse.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroHttpSession.java
incubator/shiro/trunk/web/src/main/resources/META-INF/shiro.tld (contents, props changed)
- copied, changed from r785781, incubator/shiro/trunk/web/src/main/resources/META-INF/ki.tld
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/
- copied from r785781, incubator/shiro/trunk/web/src/test/java/org/apache/ki/
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/ShiroFilterTest.java
Removed:
incubator/shiro/trunk/core/src/main/java/org/apache/ki/
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/KiException.java
incubator/shiro/trunk/core/src/main/resources/org/apache/ki/
incubator/shiro/trunk/core/src/main/resources/org/apache/shiro/realm/text/default-ki-users.properties
incubator/shiro/trunk/core/src/test/java/org/apache/ki/
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/ki/
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/ki.jnlp.jsp
incubator/shiro/trunk/samples/spring/src/main/webapp/ki.css
incubator/shiro/trunk/samples/standalone/src/main/resources/ki.ini
incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/ehcache/src/main/resources/org/apache/ki/
incubator/shiro/trunk/support/quartz/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/spring/src/main/java/org/apache/ki/
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringKiFilter.java
incubator/shiro/trunk/support/spring/src/test/java/org/apache/ki/
incubator/shiro/trunk/web/src/main/java/org/apache/ki/
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/KiFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/KiHttpServletRequest.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/KiHttpServletResponse.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/KiHttpSession.java
incubator/shiro/trunk/web/src/main/resources/META-INF/ki.tld
incubator/shiro/trunk/web/src/test/java/org/apache/ki/
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/KiFilterTest.java
Modified:
incubator/shiro/trunk/NOTICE.txt
incubator/shiro/trunk/README-runtime-requirements.txt
incubator/shiro/trunk/all/pom.xml
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Account.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AccountException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListenerRegistrar.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Authenticator.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ConcurrentAccessException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/CredentialsException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/DisabledAccountException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExcessiveAttemptsException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExpiredCredentialsException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/IncorrectCredentialsException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/InetAuthenticationToken.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/LockedAccountException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/LogoutAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/MergableAuthenticationInfo.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/RememberMeAuthenticationToken.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/SimpleAccount.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/SimpleAuthenticationInfo.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/UnknownAccountException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/UsernamePasswordToken.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/HashedCredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Md2CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Md5CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Sha256CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Sha384CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/Sha512CredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/SimpleCredentialsMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/credential/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/AbstractAuthenticationStrategy.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/AllSuccessfulStrategy.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/AtLeastOneSuccessfulStrategy.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/AuthenticationStrategy.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/FirstSuccessfulStrategy.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/ModularRealmAuthenticator.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/UnsupportedTokenException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/pam/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/AuthorizationException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/AuthorizationInfo.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/Authorizer.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/AuthorizingAccount.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/HostUnauthorizedException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/Permission.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizationInfo.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/SimpleAuthorizingAccount.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/SimpleRole.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/UnauthenticatedException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/UnauthorizedException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/RequiresAuthentication.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/RequiresGuest.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/RequiresPermissions.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/RequiresRoles.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/RequiresUser.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/annotation/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AnnotationsAuthorizingMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AuthenticatedAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AuthenticatedAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/AuthorizingMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/GuestAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/GuestAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/PermissionAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/PermissionAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/RoleAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/RoleAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/UserAnnotationHandler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/UserAnnotationMethodInterceptor.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/aop/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/AllPermission.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/InvalidPermissionStringException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/PermissionResolver.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/PermissionResolverAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermissionResolver.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/Cache.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/CacheException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/CacheManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/CacheManagerAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/DefaultCacheManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/HashtableCache.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/HashtableCacheManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/MapCache.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/SoftHashMapCache.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/cache/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/codec/Base64.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/codec/CodecException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/codec/CodecSupport.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/codec/Hex.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/codec/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/Configuration.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/ConfigurationException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/IniConfiguration.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/ReflectionBuilder.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/ResourceConfiguration.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/TextConfiguration.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/UnresolveableReferenceException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/config/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/BlowfishCipher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/Cipher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/AbstractHash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Md2Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Md5Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Sha1Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Sha256Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Sha384Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/Sha512Hash.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/hash/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/crypto/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/AbstractResource.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/DefaultSerializer.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/IniResource.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/ResourceException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/ResourceUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/SerializationException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/Serializer.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/TextResource.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/XmlSerializer.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/io/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiCallback.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiLocator.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiTemplate.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/AbstractRememberMeManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/AuthenticatingSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/AuthorizingSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/CachingSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/DefaultSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/DefaultSubjectFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/RealmSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/RememberMeManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SecurityManagerAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SecurityManagerFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionsSecurityManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SubjectBinder.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SubjectFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/ThreadContextSubjectBinder.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/AuthenticatingRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/CachingRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/Realm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/RealmFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/SimpleAccountRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/activedirectory/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/jdbc/JdbcRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/jdbc/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/jndi/JndiRealmFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/jndi/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/AbstractLdapRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/DefaultLdapContextFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/LdapContextFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/LdapUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/ldap/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/PropertiesRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/TextConfigurationRealm.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/realm/text/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/ExpiredSessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/InvalidSessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/ProxiedSession.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/ReplacedSessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/Session.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/SessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/SessionListener.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/SessionListenerRegistrar.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/StoppedSessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/UnknownSessionException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/AbstractSessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/AbstractValidatingSessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/DefaultSessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/DelegatingSession.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/ImmutableProxiedSession.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/LocalSessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SessionFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SessionFactoryAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SessionValidationScheduler.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SimpleSession.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/SimpleSessionFactory.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSession.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/ValidatingSessionManager.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/eis/CachingSessionDAO.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/eis/MemorySessionDAO.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/eis/SessionDAO.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/eis/SessionDAOAware.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/eis/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/mgt/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/session/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/DelegatingSubject.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/InvalidSubjectException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/MutablePrincipalCollection.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/PrincipalCollection.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/SimplePrincipalCollection.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/Subject.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/SubjectException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/subject/package-info.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/AntPathMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/ClassUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/CollectionUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/Destroyable.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/Initializable.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/InstantiationException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/JdbcUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/LifecycleUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/Nameable.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/PatternMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/PermissionUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/RegExPatternMatcher.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/SoftHashMap.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/StringUtils.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/ThreadContext.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/UnavailableConstructorException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/UnknownClassException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/util/package-info.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/AtUnitTestBase.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/ExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/ConcurrentAccessExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/ExcessiveAttemptsExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/ExpiredCredentialsExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/IncorrectCredentialsExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/LockedAccountExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/SimpleAuthenticationInfoTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/UnknownAccountExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/AllowAllCredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/HashedCredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Md2CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Md5CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Sha256CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Sha384CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/credential/Sha512CredentialsMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/pam/AllSuccessfulStrategyTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authc/support/AbstractAuthenticatorTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/AuthorizationExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/HostUnauthorizedExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/UnauthenticatedExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/UnauthorizedExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/AllPermissionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/WildcardPermissionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/config/CompositeBean.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/config/ReflectionBuilderTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBean.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/io/ResourceExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/io/SerializationExceptionTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/mgt/DefaultSecurityManagerTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/mgt/VMSingletonDefaultSecurityManagerTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/realm/AuthorizingRealmTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/realm/UserIdPrincipal.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/realm/UsernamePrincipal.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/realm/activedirectory/ActiveDirectoryRealmTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/subject/DelegatingSubjectTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/util/RegExPatternMatcherTest.java
incubator/shiro/trunk/core/src/test/java/org/apache/shiro/util/StringUtilsTest.java
incubator/shiro/trunk/core/src/test/resources/log4j.properties
incubator/shiro/trunk/pom.xml
incubator/shiro/trunk/samples/quickstart/src/main/java/Quickstart.java
incubator/shiro/trunk/samples/quickstart/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/security/SampleRealm.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/service/DefaultUserService.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/EditUserCommand.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/EditUserValidator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/ManageUsersController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/SecurityController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/SignupController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/web/SignupValidator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/editUser.jsp
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/home.jsp
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/login.jsp
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/manageUsers.jsp
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/jsp/signup.jsp
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/unauthorized.jsp
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/BootstrapDataPopulator.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/DefaultSampleManager.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/ui/WebStartDriver.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/ui/WebStartView.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/IndexController.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/JnlpController.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginCommand.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LogoutController.java
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/SessionValueCommand.java
incubator/shiro/trunk/samples/spring/src/main/resources/ehcache.xml
incubator/shiro/trunk/samples/spring/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/spring/src/main/resources/webstart.spring.xml
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/remoting-servlet.xml
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/samples/standalone/src/main/java/MyRealm.java
incubator/shiro/trunk/samples/standalone/src/main/java/Standalone.java
incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/web/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/samples/web/src/main/webapp/home.jsp
incubator/shiro/trunk/samples/web/src/main/webapp/include.jsp
incubator/shiro/trunk/samples/web/src/main/webapp/login.jsp
incubator/shiro/trunk/samples/web/src/main/webapp/logout.jsp
incubator/shiro/trunk/src/docbkx/index.xml
incubator/shiro/trunk/src/docbkx/preface.xml
incubator/shiro/trunk/src/docbkx/resources/xsl/fopdf.xsl
incubator/shiro/trunk/src/docbkx/resources/xsl/html.xsl
incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl
incubator/shiro/trunk/src/docbkx/resources/xsl/tld.to.docbook.xsl
incubator/shiro/trunk/src/docbkx/security-manager.xml
incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCache.java
incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/EhCacheManager.java
incubator/shiro/trunk/support/ehcache/src/main/java/org/apache/shiro/cache/ehcache/package-info.java
incubator/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml
incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationJob.java
incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/QuartzSessionValidationScheduler.java
incubator/shiro/trunk/support/quartz/src/main/java/org/apache/shiro/session/mgt/quartz/package-info.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/LifecycleBeanPostProcessor.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/package-info.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationExecutor.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationFactory.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/remoting/package-info.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/security/interceptor/package-info.java
incubator/shiro/trunk/support/spring/src/test/java/org/apache/shiro/spring/SpringKiFilterTest.java
incubator/shiro/trunk/support/spring/src/test/java/org/apache/shiro/spring/remoting/SecureRemoteInvocationFactoryTest.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/DefaultWebSecurityManager.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/RedirectView.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/SavedRequest.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebRememberMeManager.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebSubjectFactory.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/attr/AbstractWebAttribute.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/attr/CookieAttribute.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/attr/RequestParamAttribute.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/attr/WebAttribute.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/attr/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/IniWebConfiguration.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/AccessControlFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/PathConfigProcessor.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/PathMatchingFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AuthenticatingFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AuthenticationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/BasicHttpAuthenticationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/PassThruAuthenticationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/UserFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/AuthorizationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/HostFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/PermissionsAuthorizationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/PortFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/RolesAuthorizationFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/SslFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authz/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AdviceFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/OncePerRequestFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ProxiedFilterChain.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ServletContextSupport.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/session/DefaultWebSessionManager.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/session/ServletContainerSessionManager.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/session/WebSession.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/session/WebSessionManager.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/session/package-info.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/AuthenticatedTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/GuestTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/HasAnyRolesTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/HasPermissionTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/HasRoleTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/LacksPermissionTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/LacksRoleTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/NotAuthenticatedTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/PermissionTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/PrincipalTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/RoleTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/SecureTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/UserTag.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/tags/package-info.java
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/WebRememberMeManagerTest.java
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/attr/CookieAttributeTest.java
incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/authz/HostFilterTest.java
Modified: incubator/shiro/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/NOTICE.txt?rev=785881&r1=785880&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/NOTICE.txt (original)
+++ incubator/shiro/trunk/NOTICE.txt Thu Jun 18 03:13:34 2009
@@ -1,15 +1,15 @@
-Apache Ki
+Apache Shiro
Copyright 2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes a org.apache.ki.util.SoftHashMap
+This product includes a org.apache.shiro.util.SoftHashMap
implementation based on initial ideas from Dr. Hienz Kabutz's
public posted version found here:
http://www.javaspecialists.eu/archive/Issue015.html)
with continued modifications. Per Heinz Kabutz: "you have my
-express permission to publish it in Apache Ki - please
+express permission to publish it in Apache Shiro - please
leave a link in the source code pointing to my website:
http://www.javaspecialists.eu
Modified: incubator/shiro/trunk/README-runtime-requirements.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/README-runtime-requirements.txt?rev=785881&r1=785880&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/README-runtime-requirements.txt (original)
+++ incubator/shiro/trunk/README-runtime-requirements.txt Thu Jun 18 03:13:34 2009
@@ -1,21 +1,21 @@
-Apache Ki Runtime Requirements
+Apache Shiro Runtime Requirements
------------------------------
All 3rd party dependencies mentioned below are accessible in two ways:
-1) In the ki-<version>-with-dependencies.zip distribution's lib directory
-2) After downloading ki-<version>.zip (no dependencies), run 'ant retrieve-dependencies'. This will download
+1) In the shiro-<version>-with-dependencies.zip distribution's lib directory
+2) After downloading shiro-<version>.zip (no dependencies), run 'ant retrieve-dependencies'. This will download
the dependencies to a lib directory (peer to the build.xml).
Minimal required dependencies
-------------
-Java 1.5 and later: Ensure ki-all.jar, slf4j-api.jar and one of slf4j's
+Java 1.5 and later: Ensure shiro-all.jar, slf4j-api.jar and one of slf4j's
bindings (slf4j-simple.jar, slf4j-log4j12, etc) are in your application's classpath.
-Java 1.3 and 1.4 only: ki.jar, slf4j-api.jar, an slf4j bindng, retroweaver.jar and its associated dependendencies
+Java 1.3 and 1.4 only: shiro.jar, slf4j-api.jar, an slf4j bindng, retroweaver.jar and its associated dependendencies
Feature-based dependencies
--------------------------
-- .ini based configuration, either for a ki.ini file in the classpath or embedded .ini in the KiFilter
+- .ini based configuration, either for a shiro.ini file in the classpath or embedded .ini in the KiFilter
in web.xml:
. include Jakarta commons-beanutils-core.jar
Modified: incubator/shiro/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/all/pom.xml?rev=785881&r1=785880&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/all/pom.xml (original)
+++ incubator/shiro/trunk/all/pom.xml Thu Jun 18 03:13:34 2009
@@ -58,7 +58,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.0.1</version>
<executions>
<execution>
<phase>package</phase>
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java Thu Jun 18 03:13:34 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki;
+package org.apache.shiro;
-import org.apache.ki.mgt.SecurityManager;
-import org.apache.ki.subject.Subject;
-import org.apache.ki.util.ThreadContext;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadContext;
/**
@@ -42,26 +42,26 @@
* runtime environment.
* <p/>
* This method is provided as a way of obtaining a <tt>Subject</tt> without having to resort to
- * implementation-specific methods. It also allows the Ki team to change the underlying implementation of
+ * implementation-specific methods. It also allows the Shiro team to change the underlying implementation of
* this method in the future depending on requirements/updates without affecting your code that uses it.
* <p/>
* <b>Implementation Note:</b> This implementation expects a
- * {@link org.apache.ki.util.ThreadContext#getSecurityManager() thread-bound} or
+ * {@link org.apache.shiro.util.ThreadContext#getSecurityManager() thread-bound} or
* {@link #setSecurityManager static VM singleton} {@code SecurityManager} to be accessible to this method at
* runtime. If not, an {@link IllegalStateException IllegalStateException} is thrown, indicating an incorrect
* application configuration.
*
* @return the currently accessible <tt>Subject</tt> accessible to the calling code.
*
- * @throws IllegalStateException if no {@link org.apache.ki.mgt.SecurityManager SecurityManager} instance is available to this method
+ * @throws IllegalStateException if no {@link org.apache.shiro.mgt.SecurityManager SecurityManager} instance is available to this method
* at runtime, which is considered an invalid application configuration - a Subject should _always_ be available
* to the caller. If you encounter an exception when calling this method, ensure that the application's
- * {@code SecurityManager} is {@link org.apache.ki.util.ThreadContext#getSecurityManager() thread-bound} or a
+ * {@code SecurityManager} is {@link org.apache.shiro.util.ThreadContext#getSecurityManager() thread-bound} or a
* {@link #setSecurityManager static VM singleton} prior to calling this method.
*/
public static Subject getSubject() {
Subject subject;
- org.apache.ki.mgt.SecurityManager securityManager = ThreadContext.getSecurityManager();
+ org.apache.shiro.mgt.SecurityManager securityManager = ThreadContext.getSecurityManager();
if (securityManager != null) {
subject = securityManager.getSubject();
} else {
@@ -88,13 +88,13 @@
* <p><b>This method call exists mainly for framework development support. Application developers should rarely,
* if ever, need to call this method.</b></p>
*
- * <p>The Ki development team prefers that SecurityManager instances are non-static application singletons
+ * <p>The Shiro development team prefers that SecurityManager instances are non-static application singletons
* and <em>not</em> VM static singletons. Application singletons that do not use static memory require some sort
* of application configuration framework to maintain the application-wide SecurityManager instance for you
* (for example, Spring or EJB3 environments) such that the object reference does not need to be static.
*
- * <p>In these environments, Ki acquires Subject data based on the currently executing Thread via its own
- * framework integration code, and this is the preferred way to use Ki.</p>
+ * <p>In these environments, Shiro acquires Subject data based on the currently executing Thread via its own
+ * framework integration code, and this is the preferred way to use Shiro.</p>
*
* <p>However in some environments, such as a standalone desktop application or Applets that do not use Spring or
* EJB or similar config frameworks, a VM-singleton might make more sense (although the former is still preferred).</p>
@@ -103,7 +103,7 @@
*
* <p>For example, in these environments, this will work:</p>
*
- * <code>DefaultSecurityManager securityManager = new {@link org.apache.ki.mgt.DefaultSecurityManager DefaultSecurityManager}();<br/>
+ * <code>DefaultSecurityManager securityManager = new {@link org.apache.shiro.mgt.DefaultSecurityManager DefaultSecurityManager}();<br/>
* securityManager.setRealms( ... ); //one or more Realms<br/>
* <b>SecurityUtils.setSecurityManager( securityManager );</b></code>
*
@@ -111,7 +111,7 @@
*
* <p><code>Subject currentUser = SecurityUtils.getSubject()</code></p>
*
- * <p>by calling the VM static {@link org.apache.ki.mgt.SecurityManager#getSubject() securityManager.getSubject()}
+ * <p>by calling the VM static {@link org.apache.shiro.mgt.SecurityManager#getSubject() securityManager.getSubject()}
* method. Note that the underlying injected SecurityManager still needs to know how to acquire a Subject
* instance for the calling code, which might mean from static memory, or a config file, or other
* environment-specific means.</p>
Added: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java?rev=785881&view=auto
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java (added)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java Thu Jun 18 03:13:34 2009
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro;
+
+import java.io.Serializable;
+
+/**
+ * Root exception for all Shiro runtime exceptions. This class is used as the root instead
+ * of {@link java.lang.SecurityException} to remove the potential for conflicts; many other
+ * frameworks and products (such as J2EE containers) perform special operations when
+ * encountering {@link java.lang.SecurityException}.
+ *
+ * @author Les Hazlewood
+ * @since 0.1
+ */
+public class ShiroException extends RuntimeException implements Serializable {
+
+ /**
+ * Creates a new KiException.
+ */
+ public ShiroException() {
+ super();
+ }
+
+ /**
+ * Constructs a new KiException.
+ *
+ * @param message the reason for the exception
+ */
+ public ShiroException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new KiException.
+ *
+ * @param cause the underlying Throwable that caused this exception to be thrown.
+ */
+ public ShiroException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a new KiException.
+ *
+ * @param message the reason for the exception
+ * @param cause the underlying Throwable that caused this exception to be thrown.
+ */
+ public ShiroException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java Thu Jun 18 03:13:34 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.aop;
+package org.apache.shiro.aop;
import java.lang.annotation.Annotation;
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.subject.Subject;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
/**
@@ -48,11 +48,11 @@
}
/**
- * Returns the {@link org.apache.ki.subject.Subject Subject} associated with the currently-executing code.
+ * Returns the {@link org.apache.shiro.subject.Subject Subject} associated with the currently-executing code.
* <p/>
- * This default implementation merely calls <code>{@link org.apache.ki.SecurityUtils#getSubject SecurityUtils.getSubject()}</code>.
+ * This default implementation merely calls <code>{@link org.apache.shiro.SecurityUtils#getSubject SecurityUtils.getSubject()}</code>.
*
- * @return the {@link org.apache.ki.subject.Subject Subject} associated with the currently-executing code.
+ * @return the {@link org.apache.shiro.subject.Subject Subject} associated with the currently-executing code.
*/
protected Subject getSubject() {
return SecurityUtils.getSubject();
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.aop;
+package org.apache.shiro.aop;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -74,7 +74,7 @@
* The default implementation merely gets the underlying {@link Method Method} from the supplied
* <code>MethodInvocation</code> argument, and returns:
* <p/>
- * <code>mi.{@link Method#getAnnotation(Class) getAnnotation}({@link org.apache.ki.aop.AnnotationHandler#getAnnotationClass() handler.getAnnotationClass()});</code>
+ * <code>mi.{@link Method#getAnnotation(Class) getAnnotation}({@link org.apache.shiro.aop.AnnotationHandler#getAnnotationClass() handler.getAnnotationClass()});</code>
*
* @param mi the MethodInvocation wrapping the Method from which the Annotation will be acquired.
* @return the Annotation that this interceptor will process for the specified method invocation.
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java Thu Jun 18 03:13:34 2009
@@ -35,12 +35,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.aop;
+package org.apache.shiro.aop;
/**
* A <tt>MethodInterceptor</tt> intercepts a <tt>MethodInvocation</tt> to perform before or after logic (aka 'advice').
*
- * <p>Ki's implementations of this interface mostly have to deal with ensuring a current Subject has the
+ * <p>Shiro's implementations of this interface mostly have to deal with ensuring a current Subject has the
* ability to execute the method before allowing it to continue.
*
* @author Les Hazlewood
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java Thu Jun 18 03:13:34 2009
@@ -35,14 +35,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.aop;
+package org.apache.shiro.aop;
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.subject.Subject;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
/**
- * This class is an abstraction of AOP method interceptor behavior specific to Ki that
+ * This class is an abstraction of AOP method interceptor behavior specific to Shiro that
* leaves AOP implementation specifics to be handled by subclass implementations. This implementation primarily
* enables a <tt>Log</tt> and makes available the currently executing {@link Subject Subject}.
*
@@ -61,9 +61,9 @@
/**
* Returns the {@link Subject Subject} associated with the currently-executing code.
* <p/>
- * This default implementation merely calls <code>{@link org.apache.ki.SecurityUtils#getSubject SecurityUtils.getSubject()}</code>.
+ * This default implementation merely calls <code>{@link org.apache.shiro.SecurityUtils#getSubject SecurityUtils.getSubject()}</code>.
*
- * @return the {@link org.apache.ki.subject.Subject Subject} associated with the currently-executing code.
+ * @return the {@link org.apache.shiro.subject.Subject Subject} associated with the currently-executing code.
*/
protected Subject getSubject() {
return SecurityUtils.getSubject();
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java Thu Jun 18 03:13:34 2009
@@ -35,12 +35,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.aop;
+package org.apache.shiro.aop;
import java.lang.reflect.Method;
/**
- * 3rd-party API independent representation of a method invocation. This is needed so Ki can support other
+ * 3rd-party API independent representation of a method invocation. This is needed so Shiro can support other
* MethodInvocation instances from other AOP frameworks/APIs.
*
* @author Jeremy Haile
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java Thu Jun 18 03:13:34 2009
@@ -19,8 +19,8 @@
/**
* Components used to support the framework's AOP/interception support classes.
* <p/>
- * As this package is a root-level package under <tt>org.apache.ki</tt>, it contains AOP support classes
+ * As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
* useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
* authentication, etc) will use these classes as their base in their respective packages.
*/
-package org.apache.ki.aop;
\ No newline at end of file
+package org.apache.shiro.aop;
\ No newline at end of file
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AbstractAuthenticator.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,7 +24,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.ki.subject.PrincipalCollection;
+import org.apache.shiro.subject.PrincipalCollection;
/**
@@ -127,7 +127,7 @@
* Notifies any registered {@link AuthenticationListener AuthenticationListener}s that a
* <code>Subject</code> has logged-out. This implementation merely
* iterates over the internal <code>listeners</code> collection and calls
- * {@link AuthenticationListener#onLogout(org.apache.ki.subject.PrincipalCollection) onLogout}
+ * {@link AuthenticationListener#onLogout(org.apache.shiro.subject.PrincipalCollection) onLogout}
* for each.
*
* @param principals the identifying principals of the <code>Subject</code>/account logging out.
@@ -140,7 +140,7 @@
/**
* This implementation merely calls
- * {@link #notifyLogout(org.apache.ki.subject.PrincipalCollection) notifyLogout} to allow any registered listeners
+ * {@link #notifyLogout(org.apache.shiro.subject.PrincipalCollection) notifyLogout} to allow any registered listeners
* to react to the logout.
*
* @param principals the identifying principals of the <code>Subject</code>/account logging out.
@@ -235,7 +235,7 @@
*
* @param token the authentication token encapsulating the user's login information.
* @return an <tt>AuthenticationInfo</tt> object encapsulating the user's account information
- * important to Ki.
+ * important to Shiro.
* @throws AuthenticationException if there is a problem logging in the user.
*/
protected abstract AuthenticationInfo doAuthenticate(AuthenticationToken token)
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Account.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Account.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Account.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Account.java Thu Jun 18 03:13:34 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
-import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.shiro.authz.AuthorizationInfo;
/**
* An <tt>Account</tt> is a convenience interface that extends both {@link AuthenticationInfo} and
@@ -28,10 +28,10 @@
* This interface can be useful when a Realm implementation finds it more convenient to use a single object to
* encapsulate both the authentication and authorization information used by both authc and authz operations.
* <p/>
- * <b>Please Note</b>: Since Ki sometimes logs account operations, please ensure your Account's <code>toString()</code>
+ * <b>Please Note</b>: Since Shiro sometimes logs account operations, please ensure your Account's <code>toString()</code>
* implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
* someone reading your logs. This is good practice anyway, and account principals should rarely (if ever) be printed
- * out for any reason. If you're using Ki's default implementations of this interface, they only ever print the
+ * out for any reason. If you're using Shiro's default implementations of this interface, they only ever print the
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.
*
* @author Jeremy Haile
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AccountException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AccountException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AccountException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AccountException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Exception thrown due to a problem with the account
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationException.java Thu Jun 18 03:13:34 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
-import org.apache.ki.KiException;
+import org.apache.shiro.ShiroException;
/**
@@ -27,7 +27,8 @@
* @author Les Hazlewood
* @since 0.1
*/
-public class AuthenticationException extends KiException {
+public class AuthenticationException extends ShiroException
+{
/**
* Creates a new AuthenticationException.
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java Thu Jun 18 03:13:34 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
import java.io.Serializable;
-import org.apache.ki.subject.PrincipalCollection;
+import org.apache.shiro.subject.PrincipalCollection;
/**
* <code>AuthenticationInfo</code> represents a Subject's (aka user's) stored account information relevant to the
@@ -34,26 +34,26 @@
* <code>AuthenticationInfo</code>).
* <p/>
* Because the act of authentication (log-in) is orthoganal to authorization (access control), this interface is
- * intended to represent only the account data needed by Ki during an authentication attempt. Ki also
- * has a parallel {@link org.apache.ki.authz.AuthorizationInfo AuthorizationInfo} interface for use during the
+ * intended to represent only the account data needed by Shiro during an authentication attempt. Shiro also
+ * has a parallel {@link org.apache.shiro.authz.AuthorizationInfo AuthorizationInfo} interface for use during the
* authorization process that references access control data such as roles and permissions.
* <p/>
- * But because many if not most {@link org.apache.ki.realm.Realm Realm}s store both sets of data for a Subject, it might be
+ * But because many if not most {@link org.apache.shiro.realm.Realm Realm}s store both sets of data for a Subject, it might be
* convenient for a <code>Realm</code> implementation to utilize an implementation of the {@link Account Account}
* interface instead, which is a convenience interface that combines both <code>AuthenticationInfo</code> and
* <code>AuthorizationInfo</code>. Whether you choose to implement these two interfaces separately or implement the one
* <code>Account</code> interface for a given <code>Realm</code> is entirely based on your application's needs or your
* preferences.
*
- * <p><b>Pleae note:</b> Since Ki sometimes logs authentication operations, please ensure your AuthenticationInfo's
+ * <p><b>Pleae note:</b> Since Shiro sometimes logs authentication operations, please ensure your AuthenticationInfo's
* <code>toString()</code> implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
* someone reading your logs. This is good practice anyway, and account credentials should rarely (if ever) be printed
- * out for any reason. If you're using Ki's default implementations of this interface, they only ever print the
+ * out for any reason. If you're using Shiro's default implementations of this interface, they only ever print the
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.</p>
*
* @author Jeremy Haile
* @author Les Hazlewood
- * @see org.apache.ki.authz.AuthorizationInfo AuthorizationInfo
+ * @see org.apache.shiro.authz.AuthorizationInfo AuthorizationInfo
* @see Account
* @since 0.9
*/
@@ -78,7 +78,7 @@
/**
* Returns the credentials associated with the corresponding Subject. A credential verifies one or more of the
* {@link #getPrincipals() principals} associated with the Subject, such as a password or private key. Credentials
- * are used by Ki particularly during the authentication process to ensure that submitted credentials
+ * are used by Shiro particularly during the authentication process to ensure that submitted credentials
* during a login attempt match exactly the credentials here in the <code>AuthenticationInfo</code> instance.
*
* @return the credentials associated with the corresponding Subject.
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java Thu Jun 18 03:13:34 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
-import org.apache.ki.subject.PrincipalCollection;
+import org.apache.shiro.subject.PrincipalCollection;
/**
* An <code>AuthenticationListener</code> listens for notifications while
- * {@link org.apache.ki.subject.Subject Subject}s authenticate with the system.
+ * {@link org.apache.shiro.subject.Subject Subject}s authenticate with the system.
*
* @author Les Hazlewood
* @since 0.9
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListenerRegistrar.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListenerRegistrar.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListenerRegistrar.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListenerRegistrar.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
import java.util.Collection;
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationToken.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
import java.io.Serializable;
@@ -35,7 +35,7 @@
* <p>Because applications represent user data and credentials in different ways, implementations
* of this interface are application-specific. You are free to acquire a user's principals and
* credentials however you wish (e.g. web form, Swing form, fingerprint identification, etc) and
- * then submit them to the Ki framework in the form of an implementation of this
+ * then submit them to the Shiro framework in the form of an implementation of this
* interface.
*
* <p>If your application's authentication process is username/password based
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Authenticator.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Authenticator.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/Authenticator.java Thu Jun 18 03:13:34 2009
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* An Authenticator is responsible for authenticating accounts in an application. It
- * is one of the primary entry points into the Ki API.
+ * is one of the primary entry points into the Shiro API.
* <p/>
* Although not a requirement, there is usually a single 'master' Authenticator configured for
* an application. Enabling Pluggable Authentication Module (PAM) behavior
* (Two Phase Commit, etc.) is usually achieved by the single {@code Authenticator} coordinating
- * and interacting with an application-configured set of {@link org.apache.ki.realm.Realm Realm}s.
+ * and interacting with an application-configured set of {@link org.apache.shiro.realm.Realm Realm}s.
* <p/>
- * Note that most Ki users will not interact with an {@code Authenticator} instance directly.
- * Ki's default architecture is based on an overall {@code SecurityManager} which typically
+ * Note that most Shiro users will not interact with an {@code Authenticator} instance directly.
+ * Shiro's default architecture is based on an overall {@code SecurityManager} which typically
* wraps an {@code Authenticator} instance.
*
* @author Les Hazlewood
* @author Jeremy Haile
- * @see org.apache.ki.mgt.SecurityManager
+ * @see org.apache.shiro.mgt.SecurityManager
* @see AbstractAuthenticator AbstractAuthenticator
- * @see org.apache.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator
+ * @see org.apache.shiro.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator
* @since 0.1
*/
public interface Authenticator {
@@ -44,7 +44,7 @@
* Authenticates a user based on the submitted {@code AuthenticationToken}.
* <p/>
* If the authentication is successful, an {@link AuthenticationInfo} instance is returned that represents the
- * user's account data relevant to Ki. This returned object is generally used in turn to construct a
+ * user's account data relevant to Shiro. This returned object is generally used in turn to construct a
* {@code Subject} representing a more complete security-specific 'view' of an account that also allows access to
* a {@code Session}.
*
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ConcurrentAccessException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ConcurrentAccessException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ConcurrentAccessException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ConcurrentAccessException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Thrown when an authentication attempt has been received for an account that has already been
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/CredentialsException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/CredentialsException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/CredentialsException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/CredentialsException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Exception thrown due to a problem with the credential(s) submitted for an
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/DisabledAccountException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/DisabledAccountException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/DisabledAccountException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/DisabledAccountException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Thrown when attempting to authenticate and the corresponding account has been disabled for
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExcessiveAttemptsException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExcessiveAttemptsException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExcessiveAttemptsException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExcessiveAttemptsException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Thrown when a system is configured to only allow a certain number of authentication attempts
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExpiredCredentialsException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExpiredCredentialsException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExpiredCredentialsException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/ExpiredCredentialsException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Thrown during the authentication process when the system determines the submitted credential(s)
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/IncorrectCredentialsException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/IncorrectCredentialsException.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/IncorrectCredentialsException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/IncorrectCredentialsException.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
/**
* Thrown when attempting to authenticate with credential(s) that do not match the actual
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/InetAuthenticationToken.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/InetAuthenticationToken.java?rev=785881&r1=785781&r2=785881&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/InetAuthenticationToken.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/InetAuthenticationToken.java Thu Jun 18 03:13:34 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ki.authc;
+package org.apache.shiro.authc;
import java.net.InetAddress;