Author: sohil.shah(a)jboss.com Date: 2009-08-08 20:51:11 -0400 (Sat, 08 Aug 2009) New Revision: 13709 Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/services/TargetComposition.java modules/authorization/trunk/common-api/src/main/java/org/jboss/security/authz/component/ImpliedActions.java modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Manage.java modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Write.java modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java Log: loose ends Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/services/TargetComposition.java =================================================================== --- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/services/TargetComposition.java 2009-08-08 23:44:03 UTC (rev 13708) +++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/services/TargetComposition.java 2009-08-09 00:51:11 UTC (rev 13709) @@ -83,22 +83,14 @@ { Set<Target> impliedTargets = new HashSet<Target>(); - String[] impliedActions = this.findImpliedActions(this.targetComponent.getClass()); + Class[] impliedActions = this.findImpliedActions(this.targetComponent.getClass()); if(impliedActions != null) { - for(String impliedAction: impliedActions) + for(Class impliedAction: impliedActions) { - //FIXME: Find the Action Component from the repository - Object impliedActionComponent = null; - if(impliedAction.equals("read")) - { - impliedActionComponent = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.security.authz.components.action.Read").newInstance(); - } - else if(impliedAction.equals("write")) - { - impliedActionComponent = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.security.authz.components.action.Write").newInstance(); - } - + //Instantiate the Implied Component + Object impliedActionComponent = impliedAction.newInstance(); + //Compose this action target TargetComposition comp = new TargetComposition(); comp.setTargetComponent(impliedActionComponent); @@ -139,7 +131,7 @@ return target; } - private String[] findImpliedActions(Class targetClass) + private Class[] findImpliedActions(Class targetClass) { Annotation impliedActions = targetClass.getAnnotation(ImpliedActions.class); if(impliedActions != null) Modified: modules/authorization/trunk/common-api/src/main/java/org/jboss/security/authz/component/ImpliedActions.java =================================================================== --- modules/authorization/trunk/common-api/src/main/java/org/jboss/security/authz/component/ImpliedActions.java 2009-08-08 23:44:03 UTC (rev 13708) +++ modules/authorization/trunk/common-api/src/main/java/org/jboss/security/authz/component/ImpliedActions.java 2009-08-09 00:51:11 UTC (rev 13709) @@ -33,5 +33,5 @@ @Retention(RetentionPolicy.RUNTIME) public @interface ImpliedActions { - String[] value(); + Class[] value(); } Modified: modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Manage.java =================================================================== --- modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Manage.java 2009-08-08 23:44:03 UTC (rev 13708) +++ modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Manage.java 2009-08-09 00:51:11 UTC (rev 13709) @@ -38,7 +38,7 @@ type=ComponentType.TARGET, category=ComponentCategory.ACTION ) -@ImpliedActions({"read", "write"}) +(a)ImpliedActions({Read.class, Write.class}) public class Manage extends Operation { public Manage() Modified: modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Write.java =================================================================== --- modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Write.java 2009-08-08 23:44:03 UTC (rev 13708) +++ modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/action/Write.java 2009-08-09 00:51:11 UTC (rev 13709) @@ -38,7 +38,7 @@ type=ComponentType.TARGET, category=ComponentCategory.ACTION ) -@ImpliedActions({"read"}) +(a)ImpliedActions({Read.class}) public class Write extends Operation { public Write() Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java =================================================================== --- modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java 2009-08-08 23:44:03 UTC (rev 13708) +++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java 2009-08-09 00:51:11 UTC (rev 13709) @@ -167,7 +167,7 @@ } /** - * FIXME: make this preparation more robust injecting arbitrary Facts and then let the RuleEngine do its thing + * TODO: make this preparation more robust injecting arbitrary Facts and then let the RuleEngine do its thing * * @param context */