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/22 02:04:52 UTC
svn commit: r1364195 - in /shiro/trunk: ./ core/src/
core/src/main/java/org/apache/shiro/authz/permission/
core/src/test/java/org/apache/shiro/authz/aop/
core/src/test/java/org/apache/shiro/authz/permission/
core/src/test/java/org/apache/shiro/subject/...
Author: jbunting
Date: Sun Jul 22 00:04:52 2012
New Revision: 1364195
URL: http://svn.apache.org/viewvc?rev=1364195&view=rev
Log:
SHIRO-368: merging DomainPermission fix to trunk
Added:
shiro/trunk/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
- copied unchanged from r1364194, shiro/branches/1.2.x/core/src/test/java/org/apache/shiro/authz/permission/DomainPermissionTest.java
shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
Modified:
shiro/trunk/ (props changed)
shiro/trunk/core/src/ (props changed)
shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java
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/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
Propchange: shiro/trunk/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x:r1364194
Propchange: shiro/trunk/core/src/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/core/src:r1364194
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java?rev=1364195&r1=1364194&r2=1364195&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/authz/permission/DomainPermission.java Sun Jul 22 00:04:52 2012
@@ -55,7 +55,7 @@ public class DomainPermission extends Wi
public DomainPermission(String actions, String targets) {
this.domain = getDomain(getClass());
this.actions = StringUtils.splitToSet(actions, SUBPART_DIVIDER_TOKEN);
- this.targets = StringUtils.splitToSet(actions, SUBPART_DIVIDER_TOKEN);
+ this.targets = StringUtils.splitToSet(targets, SUBPART_DIVIDER_TOKEN);
encodeParts(this.domain, actions, targets);
}
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:r1364194
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:r1364194
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:r1364194
Added: shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java?rev=1364195&view=auto
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java (added)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/subject/SimplePrincipalCollectionTest.java Sun Jul 22 00:04:52 2012
@@ -0,0 +1,21 @@
+package org.apache.shiro.subject;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class SimplePrincipalCollectionTest {
+ @Test
+ public void multiplePrincipalsTest()
+ {
+ SimplePrincipalCollection principalCollection = new SimplePrincipalCollection();
+ principalCollection.add("frank", "realm1");
+ principalCollection.add("johnny", "realm1");
+ principalCollection.add("Alberto", "realm2");
+
+ PrincipalCollection underTest = principalCollection;
+
+// underTest.
+
+ System.out.println(principalCollection);
+ }
+}
Propchange: shiro/trunk/samples/spring-hibernate/
------------------------------------------------------------------------------
Merged /shiro/branches/1.2.x/samples/spring-hibernate:r1364194
Modified: shiro/trunk/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
URL: http://svn.apache.org/viewvc/shiro/trunk/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java?rev=1364195&r1=1364194&r2=1364195&view=diff
==============================================================================
--- shiro/trunk/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java (original)
+++ shiro/trunk/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java Sun Jul 22 00:04:52 2012
@@ -51,6 +51,7 @@ public abstract class ShiroModule extend
private Set<Destroyable> destroyables = Sets.newSetFromMap(new WeakHashMap<Destroyable, Boolean>());
public void configure() {
+ this.binder().requireExplicitBindings();
// setup security manager
bindSecurityManager(bind(SecurityManager.class));
bindSessionManager(bind(SessionManager.class));