Repository: jena Updated Branches: refs/heads/master ad8ca0724 -> fa456a2f3
changed Principal to be Object to fix JENA-850 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fa456a2f Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fa456a2f Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fa456a2f Branch: refs/heads/master Commit: fa456a2f3cf630d24d0215020adac37b2133cd65 Parents: ad8ca07 Author: Claude Warren <[email protected]> Authored: Sun Jan 18 21:36:25 2015 +0000 Committer: Claude Warren <[email protected]> Committed: Sun Jan 18 21:36:25 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/jena/security/SecurityEvaluator.java | 3 +-- .../apache/jena/security/graph/SecuredGraphEventManager.java | 2 +- .../apache/jena/security/impl/CachedSecurityEvaluator.java | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/fa456a2f/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java index 75829be..e2ccd96 100644 --- a/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java +++ b/jena-security/src/main/java/org/apache/jena/security/SecurityEvaluator.java @@ -17,7 +17,6 @@ */ package org.apache.jena.security; -import java.security.Principal; import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashSet; @@ -583,5 +582,5 @@ public interface SecurityEvaluator * * @return The current principal */ - public Principal getPrincipal(); + public Object getPrincipal(); } http://git-wip-us.apache.org/repos/asf/jena/blob/fa456a2f/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraphEventManager.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraphEventManager.java b/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraphEventManager.java index 6d03462..70549f4 100644 --- a/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraphEventManager.java +++ b/jena-security/src/main/java/org/apache/jena/security/graph/SecuredGraphEventManager.java @@ -54,7 +54,7 @@ public class SecuredGraphEventManager implements GraphEventManager private class SecuredGraphListener implements GraphListener { private final GraphListener wrapped; - private final Principal runAs; + private final Object runAs; SecuredGraphListener( final GraphListener wrapped ) { http://git-wip-us.apache.org/repos/asf/jena/blob/fa456a2f/jena-security/src/main/java/org/apache/jena/security/impl/CachedSecurityEvaluator.java ---------------------------------------------------------------------- diff --git a/jena-security/src/main/java/org/apache/jena/security/impl/CachedSecurityEvaluator.java b/jena-security/src/main/java/org/apache/jena/security/impl/CachedSecurityEvaluator.java index 4a9f7f2..342f35b 100644 --- a/jena-security/src/main/java/org/apache/jena/security/impl/CachedSecurityEvaluator.java +++ b/jena-security/src/main/java/org/apache/jena/security/impl/CachedSecurityEvaluator.java @@ -20,7 +20,6 @@ package org.apache.jena.security.impl; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.security.Principal; import java.util.LinkedHashSet; import java.util.Set; @@ -33,7 +32,7 @@ import org.apache.jena.security.SecurityEvaluator; public class CachedSecurityEvaluator implements InvocationHandler { private final SecurityEvaluator wrapped; - private final Principal origPrincipal; + private final Object origPrincipal; // The getPrincipal() method. private static Method GET_PRINCIPAL; @@ -62,7 +61,7 @@ public class CachedSecurityEvaluator implements InvocationHandler * @return The proxied SecurityEvaluator. */ public static SecurityEvaluator getInstance( - final SecurityEvaluator evaluator, final Principal runAs ) + final SecurityEvaluator evaluator, final Object runAs ) { final Set<Class<?>> ifac = new LinkedHashSet<Class<?>>(); if (evaluator.getClass().isInterface()) @@ -83,7 +82,7 @@ public class CachedSecurityEvaluator implements InvocationHandler * @param runAs */ private CachedSecurityEvaluator( final SecurityEvaluator wrapped, - final Principal runAs ) + final Object runAs ) { origPrincipal = runAs; this.wrapped = wrapped;
