You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by jb...@apache.org on 2012/07/20 14:14:07 UTC
svn commit: r1363746 - in /shiro/trunk: ./ core/src/
core/src/test/java/org/apache/shiro/authz/aop/ samples/spring-hibernate/
support/features/src/main/resources/
Author: jbunting
Date: Fri Jul 20 12:14:06 2012
New Revision: 1363746
URL: http://svn.apache.org/viewvc?rev=1363746&view=rev
Log:
SHIRO-376: merging shiro-cas karaf fix 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)
shiro/trunk/support/features/src/main/resources/features.xml
Propchange: shiro/trunk/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x:r1363744
Propchange: shiro/trunk/core/src/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src:r1363744
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:r1363744
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:r1363744
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:r1363744
Propchange: shiro/trunk/samples/spring-hibernate/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/samples/spring-hibernate:r1363744
Modified: shiro/trunk/support/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/features/src/main/resources/features.xml?rev=1363746&r1=1363745&r2=1363746&view=diff
==============================================================================
--- shiro/trunk/support/features/src/main/resources/features.xml (original)
+++ shiro/trunk/support/features/src/main/resources/features.xml Fri Jul 20 12:14:06 2012
@@ -40,7 +40,7 @@
</feature>
<feature name="shiro-cas" version="${project.version}" resolver="(obr)">
- <feature version="${project.version}">shiro-cas</feature>
+ <feature version="${project.version}">shiro-core</feature>
<!-- Is there a CAS client osgi bundle somewhere?
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${casclient.bundle.version}</bundle>
-->