You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/07/24 19:57:47 UTC
svn commit: r1365194 - in /shiro/trunk: ./ core/src/
core/src/test/java/org/apache/shiro/authz/aop/ samples/spring-hibernate/
Author: lhazlewood
Date: Tue Jul 24 17:57:46 2012
New Revision: 1365194
URL: http://svn.apache.org/viewvc?rev=1365194&view=rev
Log:
Merged from 1.2.x
Modified:
shiro/trunk/ (props changed)
shiro/trunk/core/src/ (props changed)
shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/ (props changed)
shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/PermissionAnnotationHandlerTest.java (props changed)
shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/RoleAnnotationHandlerTest.java (props changed)
shiro/trunk/samples/spring-hibernate/ (props changed)
Propchange: shiro/trunk/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x:r1298909,1331027,1340194,1364198-1364199,1365167,1365191
Propchange: shiro/trunk/core/src/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src:r1365191
Propchange: shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src/test/java/org/apache/shiro/authz/aop:r1365191
Propchange: shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/PermissionAnnotationHandlerTest.java
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src/test/java/org/apache/shiro/authz/aop/PermissionAnnotationHandlerTest.java:r1365191
Propchange: shiro/trunk/core/src/test/java/org/apache/shiro/authz/aop/RoleAnnotationHandlerTest.java
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src/test/java/org/apache/shiro/authz/aop/RoleAnnotationHandlerTest.java:r1365191
Propchange: shiro/trunk/samples/spring-hibernate/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/samples/spring-hibernate:r1365191