[jboss-cvs] JBossAS SVN: r71657 - in projects/security/security-xacml/trunk/jboss-xacml/src: main/java/org/jboss/security/xacml/core and 14 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 2 19:35:21 EDT 2008


Author: mmoyses
Date: 2008-04-02 19:35:21 -0400 (Wed, 02 Apr 2008)
New Revision: 71657

Modified:
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/JBossPolicyFinder.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossResponseContext.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossXACMLPolicy.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/PDPConfiguration.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/SecurityActions.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactoryProxy.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttribute.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttributeProxy.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttribute.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttributeProxy.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ActionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeValueType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/DecisionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/EnvironmentType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/MissingAttributeDetailType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ObjectFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/RequestType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceContentType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResponseType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResultType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusCodeType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusDetailType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/SubjectType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/package-info.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionMatchType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ApplyType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeAssignmentType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeDesignatorType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeSelectorType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeValueType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParameterType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParametersType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ConditionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/DefaultsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EffectType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentMatchType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ExpressionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/FunctionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/IdReferenceType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObjectFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyCombinerParametersType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetCombinerParametersType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceMatchType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourcesType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleCombinerParametersType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectAttributeDesignatorType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectMatchType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/TargetType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableDefinitionType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableReferenceType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/package-info.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/PolicyFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/RequestResponseContextFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ContextMapOp.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyDecisionPoint.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/RequestContext.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ResponseContext.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLConstants.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLPolicy.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorsType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/ObjectFactory.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/Option.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PDP.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PoliciesType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicySetType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicyType.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/package-info.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/util/XACMLPolicyUtil.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/HttpRequestUtil.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebPEP.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/factories/PolicyFactoryUnitTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/RSAConferenceTestCase.java
   projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/Util.java
Log:
formatting jboss-xacml

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/JBossPolicyFinder.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/JBossPolicyFinder.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/JBossPolicyFinder.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -23,7 +23,6 @@
 
 import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
 
-
 //$Id$
 
 /**
@@ -38,9 +37,9 @@
  *  @version $Revision$
  */
 public class JBossPolicyFinder extends PolicyFinder
-{ 
+{
    public JBossPolicyFinder()
    {
-      super(); 
-   } 
+      super();
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/PolicySetFinderModule.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/PolicySetFinderModule.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -1,155 +1,146 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2007, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.security.xacml.bridge;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.security.xacml.sunxacml.AbstractPolicy;
-import org.jboss.security.xacml.sunxacml.EvaluationCtx;
-import org.jboss.security.xacml.sunxacml.MatchResult;
-import org.jboss.security.xacml.sunxacml.Policy;
-import org.jboss.security.xacml.sunxacml.PolicyMetaData;
-import org.jboss.security.xacml.sunxacml.PolicySet;
-import org.jboss.security.xacml.sunxacml.VersionConstraints;
-import org.jboss.security.xacml.sunxacml.ctx.Status;
-import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
-import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
-import org.jboss.security.xacml.sunxacml.finder.PolicyFinderResult;
- 
-/**
-*  PolicyFinderModule for PolicySet
-*  @author Anil.Saldhana at redhat.com
-*  @since  Jul 6, 2007 
-*  @version $Revision$
-*/
-public class PolicySetFinderModule extends PolicyFinderModule
-{
-   private PolicySet policySet;
-
-   private List<Policy> policies = new ArrayList<Policy>();
-
-   private List<PolicySet> policySets = new ArrayList<PolicySet>();
-
-   protected PolicyFinder policyFinder = null;
-
-   public PolicySetFinderModule()
-   {
-   }
-
-   public PolicySetFinderModule(PolicySet policySet)
-   {
-      this.policySet = policySet;
-   }
-
-   public PolicySetFinderModule(PolicySet policySet, List<Policy> policies)
-   {
-      this.policySet = policySet;
-      this.policies.addAll(policies);
-   }
-
-   @Override
-   public void init(PolicyFinder finder)
-   {
-      this.policyFinder = finder;
-   }
-
-   /**
-     * Finds the applicable policy (if there is one) for the given context.
-     *
-     * @param context the evaluation context
-     *
-     * @return an applicable policy, if one exists, or an error
-     */
-   @Override
-   public PolicyFinderResult findPolicy(EvaluationCtx context)
-   {
-      AbstractPolicy selectedPolicy = null;
-      MatchResult match = policySet.match(context);
-      int result = match.getResult();
-
-      // if target matching was indeterminate, then return the error
-      if (result == MatchResult.INDETERMINATE)
-         return new PolicyFinderResult(match.getStatus());
-
-      // see if the target matched
-      if (result == MatchResult.MATCH)
-      {
-         // see if we previously found another match
-         if (selectedPolicy != null)
-         {
-            // we found a match before, so this is an error
-            ArrayList<String> code = new ArrayList<String>();
-            code.add(Status.STATUS_PROCESSING_ERROR);
-            Status status = new Status(code, "too many applicable " + "top-level policies");
-            return new PolicyFinderResult(status);
-         }
-
-         // this is the first match we've found, so remember it
-         selectedPolicy = policySet;
-      }
-
-      // return the single applicable policy (if there was one)
-      return new PolicyFinderResult(selectedPolicy);
-   }
-
-   @Override
-   public PolicyFinderResult findPolicy(URI idReference, int type, VersionConstraints constraints,
-         PolicyMetaData parentMetaData)
-   {
-      for (Policy p : policies)
-      {
-         if (p.getId().compareTo(idReference) == 0)
-            return new PolicyFinderResult(p);
-      }
-      for (PolicySet p : policySets)
-      {
-         if (p.getId().compareTo(idReference) == 0)
-            return new PolicyFinderResult(p);
-      }
-      return new PolicyFinderResult();
-   }
-
-   @Override
-   public boolean isRequestSupported()
-   {
-      return true;
-   }
-
-   /**
-     * Always returns true, since reference-based retrieval is supported.
-     *
-     * @return true
-     */
-   public boolean isIdReferenceSupported()
-   {
-      return true;
-   }
-
-   public void set(PolicySet ps, List<Policy> policies, List<PolicySet> policySets)
-   {
-      this.policySet = ps;
-      this.policies = policies;
-      this.policySets = policySets;
-   }
-}
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2007, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.security.xacml.bridge;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.security.xacml.sunxacml.AbstractPolicy;
+import org.jboss.security.xacml.sunxacml.EvaluationCtx;
+import org.jboss.security.xacml.sunxacml.MatchResult;
+import org.jboss.security.xacml.sunxacml.PolicyMetaData;
+import org.jboss.security.xacml.sunxacml.PolicySet;
+import org.jboss.security.xacml.sunxacml.VersionConstraints;
+import org.jboss.security.xacml.sunxacml.ctx.Status;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinderResult;
+
+/**
+*  PolicyFinderModule for PolicySet
+*  @author Anil.Saldhana at redhat.com
+*  @since  Jul 6, 2007 
+*  @version $Revision$
+*/
+public class PolicySetFinderModule extends PolicyFinderModule
+{
+   private PolicySet policySet;
+
+   private List<AbstractPolicy> policies = new ArrayList<AbstractPolicy>();
+
+   protected PolicyFinder policyFinder = null;
+
+   public PolicySetFinderModule()
+   {
+   }
+
+   public PolicySetFinderModule(PolicySet policySet)
+   {
+      this.policySet = policySet;
+   }
+
+   public PolicySetFinderModule(PolicySet policySet, List<AbstractPolicy> policies)
+   {
+      this.policySet = policySet;
+      this.policies.addAll(policies);
+   }
+
+   @Override
+   public void init(PolicyFinder finder)
+   {
+      this.policyFinder = finder;
+   }
+
+   /**
+     * Finds the applicable policy (if there is one) for the given context.
+     *
+     * @param context the evaluation context
+     *
+     * @return an applicable policy, if one exists, or an error
+     */
+   @Override
+   public PolicyFinderResult findPolicy(EvaluationCtx context)
+   {
+      AbstractPolicy selectedPolicy = null;
+      MatchResult match = policySet.match(context);
+      int result = match.getResult();
+
+      // if target matching was indeterminate, then return the error
+      if (result == MatchResult.INDETERMINATE)
+         return new PolicyFinderResult(match.getStatus());
+
+      // see if the target matched
+      if (result == MatchResult.MATCH)
+      {
+         // see if we previously found another match
+         if (selectedPolicy != null)
+         {
+            // we found a match before, so this is an error
+            ArrayList<String> code = new ArrayList<String>();
+            code.add(Status.STATUS_PROCESSING_ERROR);
+            Status status = new Status(code, "too many applicable " + "top-level policies");
+            return new PolicyFinderResult(status);
+         }
+
+         // this is the first match we've found, so remember it
+         selectedPolicy = policySet;
+      }
+
+      // return the single applicable policy (if there was one)
+      return new PolicyFinderResult(selectedPolicy);
+   }
+
+   @Override
+   public PolicyFinderResult findPolicy(URI idReference, int type, VersionConstraints constraints,
+         PolicyMetaData parentMetaData)
+   {
+      for (AbstractPolicy p : policies)
+      {
+         if (p.getId().compareTo(idReference) == 0)
+            return new PolicyFinderResult(p);
+      }
+      return new PolicyFinderResult();
+   }
+
+   @Override
+   public boolean isRequestSupported()
+   {
+      return true;
+   }
+
+   /**
+     * Always returns true, since reference-based retrieval is supported.
+     *
+     * @return true
+     */
+   public boolean isIdReferenceSupported()
+   {
+      return true;
+   }
+
+   public void set(PolicySet ps, List<AbstractPolicy> policies)
+   {
+      this.policySet = ps;
+      this.policies = policies;
+   }
+}

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -30,8 +30,6 @@
 import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
 import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
 import org.jboss.security.xacml.sunxacml.finder.PolicyFinderResult;
- 
- 
 
 /**
  *  PolicyFinderModule that returns the enclosing Policy Object
@@ -40,15 +38,16 @@
  *  @version $Revision$
  */
 public class WrapperPolicyFinderModule extends PolicyFinderModule
-{ 
+{
    protected PolicyFinder policyFinder = null;
+
    private Policy policy = null;;
-   
+
    public WrapperPolicyFinderModule(Policy policy)
    {
-      this.policy  = policy;
+      this.policy = policy;
    }
-   
+
    /**
     * @see PolicyFinderModule#init(com.sun.xacml.finder.PolicyFinder)
     */
@@ -56,7 +55,7 @@
    {
       this.policyFinder = policyFinder;
    }
- 
+
    /**
     * @see PolicyFinderModule#findPolicy(com.sun.xacml.EvaluationCtx)
     */
@@ -64,17 +63,16 @@
    {
       return new PolicyFinderResult(policy);
    }
- 
+
    /**
     * @see PolicyFinderModule#findPolicy(java.net.URI, int, 
     *        com.sun.xacml.VersionConstraints, com.sun.xacml.PolicyMetaData)
     */
-   public PolicyFinderResult findPolicy(URI arg0, int arg1, 
-         VersionConstraints arg2, PolicyMetaData arg3)
+   public PolicyFinderResult findPolicy(URI arg0, int arg1, VersionConstraints arg2, PolicyMetaData arg3)
    {
       return new PolicyFinderResult(policy);
    }
- 
+
    /**
     * @see PolicyFinderModule#isRequestSupported()
     */
@@ -82,5 +80,5 @@
    {
       return true;
    }
-   
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -214,8 +214,8 @@
       attributeModules.add(new SelectorModule());
       attributeFinder.setModules(attributeModules);
 
-      org.jboss.security.xacml.sunxacml.PDP pdp = 
-         new org.jboss.security.xacml.sunxacml.PDP(new PDPConfig(attributeFinder, policyFinder, null));
+      org.jboss.security.xacml.sunxacml.PDP pdp = new org.jboss.security.xacml.sunxacml.PDP(new PDPConfig(
+            attributeFinder, policyFinder, null));
       RequestCtx req = (RequestCtx) request.get(XACMLConstants.REQUEST_CTX);
       if (req == null)
          throw new IllegalStateException("Request Context does not contain a request");
@@ -313,15 +313,15 @@
          is = url.openStream();
       }
       catch (Exception e)
-      { 
+      {
       }
       if (is == null)
       {
          ClassLoader tcl = SecurityActions.getContextClassLoader();
          is = tcl.getResourceAsStream(loc);
       }
-      if(is == null)
-         throw new RuntimeException("Null Inputstream for "+ loc);
+      if (is == null)
+         throw new RuntimeException("Null Inputstream for " + loc);
       return is;
    }
 

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossRequestContext.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -42,16 +42,16 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-  
+
 /**
  *  Implementation of the RequestContext interface
  *  @author Anil.Saldhana at redhat.com
  *  @since  Jul 6, 2007 
  *  @version $Revision$
  */
-public class JBossRequestContext implements RequestContext 
+public class JBossRequestContext implements RequestContext
 {
-   private Map<String,Object> map = new HashMap<String,Object>();
+   private Map<String, Object> map = new HashMap<String, Object>();
 
    /**
     * @see ContextMapOp#get(String)
@@ -59,7 +59,7 @@
    @SuppressWarnings("unchecked")
    public <T> T get(String key)
    {
-     return (T) map.get(key);
+      return (T) map.get(key);
    }
 
    /**
@@ -67,30 +67,30 @@
     */
    public <T> void set(String key, T obj)
    {
-     map.put(key, obj);
+      map.put(key, obj);
    }
-   
+
    /**
     * @see RequestContext#setRequest(RequestType)
     */
    public void setRequest(RequestType requestType) throws IOException
    {
       JAXBElement<RequestType> requestJAXB = new ObjectFactory().createRequest(requestType);
-      ByteArrayOutputStream baos = new ByteArrayOutputStream(); 
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
       JAXB.marshal(requestJAXB, baos);
-      ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); 
-      readRequest(bis);  
+      ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray());
+      readRequest(bis);
    }
 
    /**
     * @see RequestContext#readRequest(InputStream)
     */
    public void readRequest(InputStream is) throws IOException
-   { 
+   {
       try
       {
          Node root = getRequest(is);
-         if(root == null)
+         if (root == null)
             throw new IllegalStateException("Root node read from the input stream is null");
          RequestCtx request = RequestCtx.getInstance(root);
          set(XACMLConstants.REQUEST_CTX, request);
@@ -99,13 +99,13 @@
       {
          throw new RuntimeException(e);
       }
-   } 
-   
+   }
+
    /**
     * @see RequestContext#readRequest(Node)
     */
    public void readRequest(Node node) throws IOException
-   { 
+   {
       try
       {
          RequestCtx request = RequestCtx.getInstance(node);
@@ -115,28 +115,27 @@
       {
          throw new RuntimeException(e);
       }
-   } 
- 
+   }
+
    /**
     * @see RequestContext#marshall(OutputStream)
     */
    public void marshall(OutputStream os) throws IOException
    {
-      RequestCtx storedRequest = get(XACMLConstants.REQUEST_CTX);    
-      if(storedRequest != null)
+      RequestCtx storedRequest = get(XACMLConstants.REQUEST_CTX);
+      if (storedRequest != null)
          storedRequest.encode(os);
    }
 
    private Node getRequest(InputStream is) throws Exception
    {
-      String contextSchema = "urn:oasis:names:tc:xacml:2.0:context:schema:os"; 
-      DocumentBuilderFactory factory =
-         DocumentBuilderFactory.newInstance();
+      String contextSchema = "urn:oasis:names:tc:xacml:2.0:context:schema:os";
+      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
       factory.setNamespaceAware(true);
-      factory.setIgnoringComments(true); 
+      factory.setIgnoringComments(true);
       Document doc = factory.newDocumentBuilder().parse(is);
-      NodeList nodes = doc.getElementsByTagNameNS(contextSchema, "Request");  
-      return nodes.item(0);  
+      NodeList nodes = doc.getElementsByTagNameNS(contextSchema, "Request");
+      return nodes.item(0);
    }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossResponseContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossResponseContext.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossResponseContext.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -34,19 +34,19 @@
 import org.jboss.security.xacml.sunxacml.ctx.ResponseCtx;
 import org.jboss.security.xacml.sunxacml.ctx.Result;
 import org.w3c.dom.Node;
-  
+
 /**
  *  Implementation of the ResponseContext interface
  *  @author Anil.Saldhana at redhat.com
  *  @since  Jul 6, 2007 
  *  @version $Revision$
  */
-public class JBossResponseContext implements ResponseContext 
+public class JBossResponseContext implements ResponseContext
 {
    private int decision = XACMLConstants.DECISION_DENY;
-   
-   private Map<String,Object> map = new HashMap<String,Object>();
 
+   private Map<String, Object> map = new HashMap<String, Object>();
+
    /**
     * @see ContextMapOp#get(String)
     */
@@ -55,7 +55,7 @@
    {
       return (T) map.get(key);
    }
-   
+
    /**
     * @see ContextMapOp#set(String, Object)
     */
@@ -69,25 +69,25 @@
     */
    @SuppressWarnings("unchecked")
    public int getDecision()
-   { 
+   {
       ResponseCtx response = (ResponseCtx) map.get(XACMLConstants.RESPONSE_CTX);
-      if(response != null)
+      if (response != null)
       {
          Set<Result> results = response.getResults();
          Result res = results.iterator().next();
          decision = res.getDecision();
-      } 
+      }
       return decision;
-         
+
    }
 
    /**
     * @see ResponseContext#marshall(OutputStream)
     */
    public void marshall(OutputStream os) throws IOException
-   { 
-      ResponseCtx storedResponse = get(XACMLConstants.RESPONSE_CTX);    
-      if(storedResponse != null)
+   {
+      ResponseCtx storedResponse = get(XACMLConstants.RESPONSE_CTX);
+      if (storedResponse != null)
          storedResponse.encode(os);
    }
 
@@ -99,12 +99,12 @@
       ResponseCtx responseCtx;
       try
       {
-         responseCtx = ResponseCtx.getInstance(node); 
+         responseCtx = ResponseCtx.getInstance(node);
          set(XACMLConstants.RESPONSE_CTX, responseCtx);
       }
       catch (ParsingException e)
       {
          throw new RuntimeException(e);
-      }  
-   }   
+      }
+   }
 }
\ No newline at end of file

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossXACMLPolicy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossXACMLPolicy.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossXACMLPolicy.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -34,7 +34,7 @@
 import org.jboss.security.xacml.interfaces.XACMLPolicy;
 import org.jboss.security.xacml.sunxacml.AbstractPolicy;
 import org.jboss.security.xacml.util.XACMLPolicyUtil;
- 
+
 /**
  *  JBossXACML Policy
  *  @author Anil.Saldhana at redhat.com
@@ -42,15 +42,15 @@
  *  @version $Revision$
  */
 public class JBossXACMLPolicy implements XACMLPolicy, ContextMapOp
-{  
+{
    private JBossPolicyFinder finder = new JBossPolicyFinder();
-   
+
    private List<XACMLPolicy> enclosingPolicies = new ArrayList<XACMLPolicy>();
-   
+
    private int policyType = XACMLPolicy.POLICY;
-   
+
    private Map<String, Object> map = new HashMap<String, Object>();
-   
+
    /**
     * Construct a JBossXACMLPolicy  
     * @param url url to the policy file
@@ -62,7 +62,7 @@
    {
       this(url.openStream(), type);
    }
-   
+
    /**
     * Construct a JBossXACMLPolicy
     * @param is Inputstream to the policy file
@@ -75,22 +75,21 @@
       AbstractPolicy policy = null;
       XACMLPolicyUtil xpu = new XACMLPolicyUtil();
       this.policyType = type;
-      if(type == XACMLPolicy.POLICYSET)
+      if (type == XACMLPolicy.POLICYSET)
       {
-         policy = xpu.createPolicySet(is, finder);  
+         policy = xpu.createPolicySet(is, finder);
          map.put(XACMLConstants.POLICY_FINDER, finder);
       }
+      else if (type == XACMLPolicy.POLICY)
+      {
+         policy = xpu.createPolicy(is);
+      }
       else
-         if(type == XACMLPolicy.POLICY)
-         {
-            policy = xpu.createPolicy(is); 
-         }
-         else
-            throw new RuntimeException("Unknown type");
-      
-      map.put(XACMLConstants.UNDERLYING_POLICY, policy); 
+         throw new RuntimeException("Unknown type");
+
+      map.put(XACMLConstants.UNDERLYING_POLICY, policy);
    }
-   
+
    /**
     * Construct a JBossXACMLPolicy instance
     * @param is Inputstream to the policy/policyset file
@@ -104,24 +103,23 @@
       AbstractPolicy policy = null;
       XACMLPolicyUtil xpu = new XACMLPolicyUtil();
       this.policyType = type;
-      if(type == XACMLPolicy.POLICYSET)
+      if (type == XACMLPolicy.POLICYSET)
       {
-         if(theFinder == null)
+         if (theFinder == null)
             throw new IllegalArgumentException("policy finder is null");
-         policy = xpu.createPolicySet(is, theFinder);  
+         policy = xpu.createPolicySet(is, theFinder);
          map.put(XACMLConstants.POLICY_FINDER, theFinder);
       }
+      else if (type == XACMLPolicy.POLICY)
+      {
+         policy = xpu.createPolicy(is);
+      }
       else
-         if(type == XACMLPolicy.POLICY)
-         {
-            policy = xpu.createPolicy(is); 
-         }
-         else
-            throw new RuntimeException("Unknown type");
-      
-      map.put(XACMLConstants.UNDERLYING_POLICY, policy); 
+         throw new RuntimeException("Unknown type");
+
+      map.put(XACMLConstants.UNDERLYING_POLICY, policy);
    }
-   
+
    /**
     * @see XACMLPolicy#getType()
     * @see XACMLConstants
@@ -135,7 +133,7 @@
     * @see XACMLPolicy#setEnclosingPolicies(List)
     */
    public void setEnclosingPolicies(List<XACMLPolicy> policies)
-   { 
+   {
       enclosingPolicies.addAll(policies);
    }
 
@@ -143,16 +141,16 @@
     * @see XACMLPolicy#getEnclosingPolicies()
     */
    public List<XACMLPolicy> getEnclosingPolicies()
-   { 
+   {
       return enclosingPolicies;
-   } 
+   }
 
    /**
     * @see ContextMapOp#get(String)
     */
    @SuppressWarnings("unchecked")
    public <T> T get(String key)
-   { 
+   {
       return (T) map.get(key);
    }
 
@@ -162,5 +160,5 @@
    public <T> void set(String key, T obj)
    {
       map.put(key, obj);
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/PDPConfiguration.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/PDPConfiguration.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/PDPConfiguration.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -40,20 +40,18 @@
    {
       AttributeFactory.setDefaultFactory(new ExtendedAttributeFactoryProxy());
    }
-   
+
    public static void installSingleValueAttribute(String type)
    {
       AttributeFactory factory = AttributeFactory.getInstance();
-      factory.addDatatype(type, 
-            new SingleValueAttributeProxy(type));
-      
+      factory.addDatatype(type, new SingleValueAttributeProxy(type));
+
    }
-   
+
    public static void installMultiValueAttribute(String type)
    {
       AttributeFactory factory = AttributeFactory.getInstance();
-      factory.addDatatype(type, 
-            new MultiValueAttributeProxy(type));
-      
-   } 
+      factory.addDatatype(type, new MultiValueAttributeProxy(type));
+
+   }
 }
\ No newline at end of file

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/SecurityActions.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/SecurityActions.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/SecurityActions.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -41,12 +41,12 @@
    public static ClassLoader getContextClassLoader()
    {
       return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
-      { 
+      {
          public ClassLoader run()
-         { 
+         {
             return Thread.currentThread().getContextClassLoader();
          }
-      }); 
+      });
    }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -63,7 +63,7 @@
 import org.jboss.security.xacml.sunxacml.attr.proxy.X500NameAttributeProxy;
 import org.jboss.security.xacml.sunxacml.attr.proxy.YearMonthDurationAttributeProxy;
 import org.w3c.dom.Node;
- 
+
 /**
  *  Extendible Attribute factory
  *  @author Anil.Saldhana at redhat.com
@@ -71,62 +71,45 @@
  *  @version $Revision$
  */
 public class ExtendedAttributeFactory extends BaseAttributeFactory
-{ 
-  
+{
+
    private static ExtendedAttributeFactory instance = null;
-   private static  Map supportedDatatypes = new HashMap();
-    
+
+   private static Map supportedDatatypes = new HashMap();
+
    private ExtendedAttributeFactory()
    {
-      super(supportedDatatypes); 
+      super(supportedDatatypes);
 
       // the 1.x datatypes
-      supportedDatatypes.put(BooleanAttribute.identifier,
-                             new BooleanAttributeProxy());
-      supportedDatatypes.put(StringAttribute.identifier,
-                             new StringAttributeProxy());
-      supportedDatatypes.put(DateAttribute.identifier,
-                             new DateAttributeProxy());
-      supportedDatatypes.put(TimeAttribute.identifier,
-                             new TimeAttributeProxy());
-      supportedDatatypes.put(DateTimeAttribute.identifier,
-                             new DateTimeAttributeProxy());
-      supportedDatatypes.put(DayTimeDurationAttribute.identifier,
-                             new DayTimeDurationAttributeProxy());
-      supportedDatatypes.put(YearMonthDurationAttribute.identifier,
-                             new YearMonthDurationAttributeProxy());
-      supportedDatatypes.put(DoubleAttribute.identifier,
-                             new DoubleAttributeProxy());
-      supportedDatatypes.put(IntegerAttribute.identifier,
-                             new IntegerAttributeProxy());
-      supportedDatatypes.put(AnyURIAttribute.identifier,
-                             new AnyURIAttributeProxy());
-      supportedDatatypes.put(HexBinaryAttribute.identifier,
-                             new HexBinaryAttributeProxy());
-      supportedDatatypes.put(Base64BinaryAttribute.identifier,
-                             new Base64BinaryAttributeProxy());
-      supportedDatatypes.put(X500NameAttribute.identifier,
-                             new X500NameAttributeProxy());
-      supportedDatatypes.put(RFC822NameAttribute.identifier,
-                             new RFC822NameAttributeProxy());
- 
-      
+      supportedDatatypes.put(BooleanAttribute.identifier, new BooleanAttributeProxy());
+      supportedDatatypes.put(StringAttribute.identifier, new StringAttributeProxy());
+      supportedDatatypes.put(DateAttribute.identifier, new DateAttributeProxy());
+      supportedDatatypes.put(TimeAttribute.identifier, new TimeAttributeProxy());
+      supportedDatatypes.put(DateTimeAttribute.identifier, new DateTimeAttributeProxy());
+      supportedDatatypes.put(DayTimeDurationAttribute.identifier, new DayTimeDurationAttributeProxy());
+      supportedDatatypes.put(YearMonthDurationAttribute.identifier, new YearMonthDurationAttributeProxy());
+      supportedDatatypes.put(DoubleAttribute.identifier, new DoubleAttributeProxy());
+      supportedDatatypes.put(IntegerAttribute.identifier, new IntegerAttributeProxy());
+      supportedDatatypes.put(AnyURIAttribute.identifier, new AnyURIAttributeProxy());
+      supportedDatatypes.put(HexBinaryAttribute.identifier, new HexBinaryAttributeProxy());
+      supportedDatatypes.put(Base64BinaryAttribute.identifier, new Base64BinaryAttributeProxy());
+      supportedDatatypes.put(X500NameAttribute.identifier, new X500NameAttributeProxy());
+      supportedDatatypes.put(RFC822NameAttribute.identifier, new RFC822NameAttributeProxy());
+
       // the 2.0 datatypes
-      supportedDatatypes.put(DNSNameAttribute.identifier,
-                             new DNSNameAttributeProxy());
-      supportedDatatypes.put(IPAddressAttribute.identifier,
-                             new IPAddressAttributeProxy());
- 
+      supportedDatatypes.put(DNSNameAttribute.identifier, new DNSNameAttributeProxy());
+      supportedDatatypes.put(IPAddressAttribute.identifier, new IPAddressAttributeProxy());
+
    }
 
-   public void addDatatype(String id, AttributeProxy proxy) 
+   public void addDatatype(String id, AttributeProxy proxy)
    {
-      supportedDatatypes.put(id, proxy); 
-  }
+      supportedDatatypes.put(id, proxy);
+   }
 
    @Override
-   public AttributeValue createValue(URI dataType, String value) 
-   throws UnknownIdentifierException, ParsingException
+   public AttributeValue createValue(URI dataType, String value) throws UnknownIdentifierException, ParsingException
    {
       try
       {
@@ -135,9 +118,9 @@
       catch (Exception e)
       {
          throw new RuntimeException(e);
-      } 
-   }  
-   
+      }
+   }
+
    @Override
    public AttributeValue createValue(Node root, String type) throws UnknownIdentifierException, ParsingException
    {
@@ -156,20 +139,19 @@
    {
       return createValue(root, dataType.toString());
    }
- 
 
    public static ExtendedAttributeFactory getFactory()
    {
-      if(instance == null)
+      if (instance == null)
          instance = new ExtendedAttributeFactory();
       return instance;
    }
-   
+
    private AttributeProxy getProxy(String type)
    {
-      AttributeProxy proxy =  (AttributeProxy) supportedDatatypes.get(type.toString()); 
-      if(proxy == null)
-         throw new RuntimeException("proxy null for "+type);
+      AttributeProxy proxy = (AttributeProxy) supportedDatatypes.get(type.toString());
+      if (proxy == null)
+         throw new RuntimeException("proxy null for " + type);
       return proxy;
    }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactoryProxy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactoryProxy.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/ExtendedAttributeFactoryProxy.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -23,7 +23,7 @@
 
 import org.jboss.security.xacml.sunxacml.attr.AttributeFactory;
 import org.jboss.security.xacml.sunxacml.attr.AttributeFactoryProxy;
- 
+
 /**
  *  
  *  @author Anil.Saldhana at redhat.com
@@ -31,9 +31,9 @@
  *  @version $Revision$
  */
 public class ExtendedAttributeFactoryProxy implements AttributeFactoryProxy
-{ 
+{
    public AttributeFactory getFactory()
-   { 
+   {
       return ExtendedAttributeFactory.getFactory();
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttribute.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttribute.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttribute.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -32,7 +32,7 @@
  *  @version $Revision$
  */
 public class MultiValueAttribute extends AttributeValue
-{ 
+{
    private String value;
 
    public MultiValueAttribute(URI type, String value)
@@ -40,14 +40,15 @@
       super(type);
       this.value = value;
    }
+
    protected MultiValueAttribute(URI type)
    {
-      super(type); 
+      super(type);
    }
 
    @Override
    public String encode()
-   { 
+   {
       return value;
-   } 
+   }
 }
\ No newline at end of file

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttributeProxy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttributeProxy.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/MultiValueAttributeProxy.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -27,7 +27,6 @@
 import org.jboss.security.xacml.sunxacml.attr.AttributeProxy;
 import org.jboss.security.xacml.sunxacml.attr.AttributeValue;
 import org.w3c.dom.Node;
- 
 
 /**
  *  Represents a multi value attribute proxy
@@ -36,7 +35,7 @@
  *  @version $Revision$
  */
 public class MultiValueAttributeProxy implements AttributeProxy
-{ 
+{
    private URI type;
 
    public MultiValueAttributeProxy(String type)
@@ -50,19 +49,19 @@
          throw new RuntimeException(e);
       }
    }
-   
+
    public MultiValueAttributeProxy(URI type)
    {
       this.type = type;
    }
-   
+
    public AttributeValue getInstance(Node root) throws Exception
-   { 
+   {
       return null;
    }
 
    public AttributeValue getInstance(String value) throws Exception
-   { 
+   {
       return new SingleValueAttribute(type, value);
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttribute.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttribute.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttribute.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -32,7 +32,7 @@
  *  @version $Revision$
  */
 public class SingleValueAttribute extends AttributeValue
-{ 
+{
    private String value;
 
    public SingleValueAttribute(URI type, String value)
@@ -40,14 +40,15 @@
       super(type);
       this.value = value;
    }
+
    protected SingleValueAttribute(URI type)
    {
-      super(type); 
+      super(type);
    }
 
    @Override
    public String encode()
-   { 
+   {
       return value;
-   } 
+   }
 }
\ No newline at end of file

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttributeProxy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttributeProxy.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/ext/SingleValueAttributeProxy.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -32,7 +32,6 @@
 import org.jboss.security.xacml.sunxacml.attr.StringAttribute;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
- 
 
 /**
  *  Represents a single value attribute proxy
@@ -41,7 +40,7 @@
  *  @version $Revision$
  */
 public class SingleValueAttributeProxy implements AttributeProxy
-{ 
+{
    private URI type;
 
    public SingleValueAttributeProxy(String type)
@@ -55,53 +54,53 @@
          throw new RuntimeException(e);
       }
    }
-   
+
    public SingleValueAttributeProxy(URI type)
    {
       this.type = type;
    }
-   
+
    public AttributeValue getInstance(Node root) throws Exception
-   { 
+   {
       // now we get the attribute value
-      if (getNodeName(root).equals("AttributeValue")) 
-      { 
+      if (getNodeName(root).equals("AttributeValue"))
+      {
          // now get the value
-         try 
+         try
          {
             Node child = root.getFirstChild();
-            if(child == null)
+            if (child == null)
                return new StringAttribute("");
-           //get the type of the node
+            //get the type of the node
             short nodetype = child.getNodeType();
 
             // now see if we have (effectively) a simple string value
-            if ((nodetype == Node.TEXT_NODE) || (nodetype == Node.CDATA_SECTION_NODE) ||
-                (nodetype == Node.COMMENT_NODE)) 
+            if ((nodetype == Node.TEXT_NODE) || (nodetype == Node.CDATA_SECTION_NODE)
+                  || (nodetype == Node.COMMENT_NODE))
             {
-                return new StringAttribute(child.getNodeValue());
+               return new StringAttribute(child.getNodeValue());
             }
-            
+
             return AttributeFactory.getInstance().createValue(child, type);
-         } 
-         catch (UnknownIdentifierException uie) 
+         }
+         catch (UnknownIdentifierException uie)
          {
             throw new ParsingException("Unknown AttributeId", uie);
-         } 
+         }
       }
       return null;
    }
 
    public AttributeValue getInstance(String value) throws Exception
-   { 
+   {
       return new SingleValueAttribute(type, value);
-   } 
-   
+   }
+
    private static String getNodeName(Node node)
    {
       String name = node.getLocalName();
-      if(name == null)
+      if (name == null)
          name = node.getNodeName();
-      return name; 
-   } 
+      return name;
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ActionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ActionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ActionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ActionType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActionType", propOrder = {
-    "attribute"
-})
-public class ActionType {
+ at XmlType(name = "ActionType", propOrder =
+{"attribute"})
+public class ActionType
+{
 
-    @XmlElement(name = "Attribute")
-    protected List<AttributeType> attribute;
+   @XmlElement(name = "Attribute")
+   protected List<AttributeType> attribute;
 
-    /**
-     * Gets the value of the attribute property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttribute().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeType }
-     * 
-     * 
-     */
-    public List<AttributeType> getAttribute() {
-        if (attribute == null) {
-            attribute = new ArrayList<AttributeType>();
-        }
-        return this.attribute;
-    }
+   /**
+    * Gets the value of the attribute property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attribute property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttribute().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeType }
+    * 
+    * 
+    */
+   public List<AttributeType> getAttribute()
+   {
+      if (attribute == null)
+      {
+         attribute = new ArrayList<AttributeType>();
+      }
+      return this.attribute;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for AttributeType complex type.
  * 
@@ -41,121 +39,132 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AttributeType", propOrder = {
-    "attributeValue"
-})
-public class AttributeType {
+ at XmlType(name = "AttributeType", propOrder =
+{"attributeValue"})
+public class AttributeType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected List<AttributeValueType> attributeValue;
-    @XmlAttribute(name = "AttributeId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String attributeId;
-    @XmlAttribute(name = "DataType", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String dataType;
-    @XmlAttribute(name = "Issuer")
-    protected String issuer;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected List<AttributeValueType> attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeValueType }
-     * 
-     * 
-     */
-    public List<AttributeValueType> getAttributeValue() {
-        if (attributeValue == null) {
-            attributeValue = new ArrayList<AttributeValueType>();
-        }
-        return this.attributeValue;
-    }
+   @XmlAttribute(name = "AttributeId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String attributeId;
 
-    /**
-     * Gets the value of the attributeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
+   @XmlAttribute(name = "DataType", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String dataType;
 
-    /**
-     * Sets the value of the attributeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttributeId(String value) {
-        this.attributeId = value;
-    }
+   @XmlAttribute(name = "Issuer")
+   protected String issuer;
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttributeValue().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeValueType }
+    * 
+    * 
+    */
+   public List<AttributeValueType> getAttributeValue()
+   {
+      if (attributeValue == null)
+      {
+         attributeValue = new ArrayList<AttributeValueType>();
+      }
+      return this.attributeValue;
+   }
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+   /**
+    * Gets the value of the attributeId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getAttributeId()
+   {
+      return attributeId;
+   }
 
-    /**
-     * Gets the value of the issuer property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIssuer() {
-        return issuer;
-    }
+   /**
+    * Sets the value of the attributeId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setAttributeId(String value)
+   {
+      this.attributeId = value;
+   }
 
-    /**
-     * Sets the value of the issuer property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIssuer(String value) {
-        this.issuer = value;
-    }
+   /**
+    * Gets the value of the dataType property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDataType()
+   {
+      return dataType;
+   }
 
+   /**
+    * Sets the value of the dataType property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDataType(String value)
+   {
+      this.dataType = value;
+   }
+
+   /**
+    * Gets the value of the issuer property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getIssuer()
+   {
+      return issuer;
+   }
+
+   /**
+    * Sets the value of the issuer property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setIssuer(String value)
+   {
+      this.issuer = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeValueType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeValueType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/AttributeValueType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -21,7 +20,6 @@
 import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for AttributeValueType complex type.
  * 
@@ -42,64 +40,68 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AttributeValueType", propOrder = {
-    "content"
-})
-public class AttributeValueType {
+ at XmlType(name = "AttributeValueType", propOrder =
+{"content"})
+public class AttributeValueType
+{
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+   @XmlMixed
+   @XmlAnyElement(lax = true)
+   protected List<Object> content;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link String }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+   @XmlAnyAttribute
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
+   /**
+    * Gets the value of the content property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the content property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getContent().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link Object }
+    * {@link String }
+    * {@link Element }
+    * 
+    * 
+    */
+   public List<Object> getContent()
+   {
+      if (content == null)
+      {
+         content = new ArrayList<Object>();
+      }
+      return this.content;
+   }
 
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and 
+    * the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute
+    * by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return
+    *     always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/DecisionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/DecisionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/DecisionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,14 +5,12 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for DecisionType.
  * 
@@ -34,31 +32,33 @@
 @XmlEnum
 public enum DecisionType {
 
-    @XmlEnumValue("Permit")
-    PERMIT("Permit"),
-    @XmlEnumValue("Deny")
-    DENY("Deny"),
-    @XmlEnumValue("Indeterminate")
-    INDETERMINATE("Indeterminate"),
-    @XmlEnumValue("NotApplicable")
-    NOT_APPLICABLE("NotApplicable");
-    private final String value;
+   @XmlEnumValue("Permit")
+   PERMIT("Permit"), @XmlEnumValue("Deny")
+   DENY("Deny"), @XmlEnumValue("Indeterminate")
+   INDETERMINATE("Indeterminate"), @XmlEnumValue("NotApplicable")
+   NOT_APPLICABLE("NotApplicable");
+   private final String value;
 
-    DecisionType(String v) {
-        value = v;
-    }
+   DecisionType(String v)
+   {
+      value = v;
+   }
 
-    public String value() {
-        return value;
-    }
+   public String value()
+   {
+      return value;
+   }
 
-    public static DecisionType fromValue(String v) {
-        for (DecisionType c: DecisionType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+   public static DecisionType fromValue(String v)
+   {
+      for (DecisionType c : DecisionType.values())
+      {
+         if (c.value.equals(v))
+         {
+            return c;
+         }
+      }
+      throw new IllegalArgumentException(v);
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/EnvironmentType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/EnvironmentType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/EnvironmentType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for EnvironmentType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EnvironmentType", propOrder = {
-    "attribute"
-})
-public class EnvironmentType {
+ at XmlType(name = "EnvironmentType", propOrder =
+{"attribute"})
+public class EnvironmentType
+{
 
-    @XmlElement(name = "Attribute")
-    protected List<AttributeType> attribute;
+   @XmlElement(name = "Attribute")
+   protected List<AttributeType> attribute;
 
-    /**
-     * Gets the value of the attribute property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttribute().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeType }
-     * 
-     * 
-     */
-    public List<AttributeType> getAttribute() {
-        if (attribute == null) {
-            attribute = new ArrayList<AttributeType>();
-        }
-        return this.attribute;
-    }
+   /**
+    * Gets the value of the attribute property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attribute property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttribute().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeType }
+    * 
+    * 
+    */
+   public List<AttributeType> getAttribute()
+   {
+      if (attribute == null)
+      {
+         attribute = new ArrayList<AttributeType>();
+      }
+      return this.attribute;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/MissingAttributeDetailType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/MissingAttributeDetailType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/MissingAttributeDetailType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for MissingAttributeDetailType complex type.
  * 
@@ -41,121 +39,132 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "MissingAttributeDetailType", propOrder = {
-    "attributeValue"
-})
-public class MissingAttributeDetailType {
+ at XmlType(name = "MissingAttributeDetailType", propOrder =
+{"attributeValue"})
+public class MissingAttributeDetailType
+{
 
-    @XmlElement(name = "AttributeValue")
-    protected List<AttributeValueType> attributeValue;
-    @XmlAttribute(name = "AttributeId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String attributeId;
-    @XmlAttribute(name = "DataType", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String dataType;
-    @XmlAttribute(name = "Issuer")
-    protected String issuer;
+   @XmlElement(name = "AttributeValue")
+   protected List<AttributeValueType> attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeValueType }
-     * 
-     * 
-     */
-    public List<AttributeValueType> getAttributeValue() {
-        if (attributeValue == null) {
-            attributeValue = new ArrayList<AttributeValueType>();
-        }
-        return this.attributeValue;
-    }
+   @XmlAttribute(name = "AttributeId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String attributeId;
 
-    /**
-     * Gets the value of the attributeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
+   @XmlAttribute(name = "DataType", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String dataType;
 
-    /**
-     * Sets the value of the attributeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttributeId(String value) {
-        this.attributeId = value;
-    }
+   @XmlAttribute(name = "Issuer")
+   protected String issuer;
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttributeValue().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeValueType }
+    * 
+    * 
+    */
+   public List<AttributeValueType> getAttributeValue()
+   {
+      if (attributeValue == null)
+      {
+         attributeValue = new ArrayList<AttributeValueType>();
+      }
+      return this.attributeValue;
+   }
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+   /**
+    * Gets the value of the attributeId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getAttributeId()
+   {
+      return attributeId;
+   }
 
-    /**
-     * Gets the value of the issuer property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIssuer() {
-        return issuer;
-    }
+   /**
+    * Sets the value of the attributeId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setAttributeId(String value)
+   {
+      this.attributeId = value;
+   }
 
-    /**
-     * Sets the value of the issuer property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIssuer(String value) {
-        this.issuer = value;
-    }
+   /**
+    * Gets the value of the dataType property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDataType()
+   {
+      return dataType;
+   }
 
+   /**
+    * Sets the value of the dataType property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDataType(String value)
+   {
+      this.dataType = value;
+   }
+
+   /**
+    * Gets the value of the issuer property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getIssuer()
+   {
+      return issuer;
+   }
+
+   /**
+    * Sets the value of the issuer property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setIssuer(String value)
+   {
+      this.issuer = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ObjectFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ObjectFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ObjectFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import javax.xml.bind.JAXBElement;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
@@ -29,286 +27,342 @@
  * 
  */
 @XmlRegistry
-public class ObjectFactory {
+public class ObjectFactory
+{
 
-    private final static QName _Status_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Status");
-    private final static QName _Action_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Action");
-    private final static QName _Decision_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Decision");
-    private final static QName _Environment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Environment");
-    private final static QName _Subject_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Subject");
-    private final static QName _StatusDetail_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "StatusDetail");
-    private final static QName _MissingAttributeDetail_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "MissingAttributeDetail");
-    private final static QName _Response_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Response");
-    private final static QName _ResourceContent_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "ResourceContent");
-    private final static QName _Resource_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Resource");
-    private final static QName _Request_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Request");
-    private final static QName _Attribute_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Attribute");
-    private final static QName _Result_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Result");
-    private final static QName _AttributeValue_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "AttributeValue");
-    private final static QName _StatusCode_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "StatusCode");
-    private final static QName _StatusMessage_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "StatusMessage");
+   private final static QName _Status_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Status");
 
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.xacml._2_0.context.schema.os
-     * 
-     */
-    public ObjectFactory() {
-    }
+   private final static QName _Action_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Action");
 
-    /**
-     * Create an instance of {@link EnvironmentType }
-     * 
-     */
-    public EnvironmentType createEnvironmentType() {
-        return new EnvironmentType();
-    }
+   private final static QName _Decision_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Decision");
 
-    /**
-     * Create an instance of {@link ResourceContentType }
-     * 
-     */
-    public ResourceContentType createResourceContentType() {
-        return new ResourceContentType();
-    }
+   private final static QName _Environment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "Environment");
 
-    /**
-     * Create an instance of {@link ResultType }
-     * 
-     */
-    public ResultType createResultType() {
-        return new ResultType();
-    }
+   private final static QName _Subject_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Subject");
 
-    /**
-     * Create an instance of {@link RequestType }
-     * 
-     */
-    public RequestType createRequestType() {
-        return new RequestType();
-    }
+   private final static QName _StatusDetail_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "StatusDetail");
 
-    /**
-     * Create an instance of {@link ResponseType }
-     * 
-     */
-    public ResponseType createResponseType() {
-        return new ResponseType();
-    }
+   private final static QName _MissingAttributeDetail_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:context:schema:os", "MissingAttributeDetail");
 
-    /**
-     * Create an instance of {@link AttributeValueType }
-     * 
-     */
-    public AttributeValueType createAttributeValueType() {
-        return new AttributeValueType();
-    }
+   private final static QName _Response_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Response");
 
-    /**
-     * Create an instance of {@link StatusType }
-     * 
-     */
-    public StatusType createStatusType() {
-        return new StatusType();
-    }
+   private final static QName _ResourceContent_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "ResourceContent");
 
-    /**
-     * Create an instance of {@link SubjectType }
-     * 
-     */
-    public SubjectType createSubjectType() {
-        return new SubjectType();
-    }
+   private final static QName _Resource_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Resource");
 
-    /**
-     * Create an instance of {@link AttributeType }
-     * 
-     */
-    public AttributeType createAttributeType() {
-        return new AttributeType();
-    }
+   private final static QName _Request_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Request");
 
-    /**
-     * Create an instance of {@link ResourceType }
-     * 
-     */
-    public ResourceType createResourceType() {
-        return new ResourceType();
-    }
+   private final static QName _Attribute_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "Attribute");
 
-    /**
-     * Create an instance of {@link StatusDetailType }
-     * 
-     */
-    public StatusDetailType createStatusDetailType() {
-        return new StatusDetailType();
-    }
+   private final static QName _Result_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os", "Result");
 
-    /**
-     * Create an instance of {@link ActionType }
-     * 
-     */
-    public ActionType createActionType() {
-        return new ActionType();
-    }
+   private final static QName _AttributeValue_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "AttributeValue");
 
-    /**
-     * Create an instance of {@link MissingAttributeDetailType }
-     * 
-     */
-    public MissingAttributeDetailType createMissingAttributeDetailType() {
-        return new MissingAttributeDetailType();
-    }
+   private final static QName _StatusCode_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "StatusCode");
 
-    /**
-     * Create an instance of {@link StatusCodeType }
-     * 
-     */
-    public StatusCodeType createStatusCodeType() {
-        return new StatusCodeType();
-    }
+   private final static QName _StatusMessage_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:context:schema:os",
+         "StatusMessage");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Status")
-    public JAXBElement<StatusType> createStatus(StatusType value) {
-        return new JAXBElement<StatusType>(_Status_QNAME, StatusType.class, null, value);
-    }
+   /**
+    * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.xacml._2_0.context.schema.os
+    * 
+    */
+   public ObjectFactory()
+   {
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Action")
-    public JAXBElement<ActionType> createAction(ActionType value) {
-        return new JAXBElement<ActionType>(_Action_QNAME, ActionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link EnvironmentType }
+    * 
+    */
+   public EnvironmentType createEnvironmentType()
+   {
+      return new EnvironmentType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DecisionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Decision")
-    public JAXBElement<DecisionType> createDecision(DecisionType value) {
-        return new JAXBElement<DecisionType>(_Decision_QNAME, DecisionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResourceContentType }
+    * 
+    */
+   public ResourceContentType createResourceContentType()
+   {
+      return new ResourceContentType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Environment")
-    public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value) {
-        return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResultType }
+    * 
+    */
+   public ResultType createResultType()
+   {
+      return new ResultType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubjectType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Subject")
-    public JAXBElement<SubjectType> createSubject(SubjectType value) {
-        return new JAXBElement<SubjectType>(_Subject_QNAME, SubjectType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link RequestType }
+    * 
+    */
+   public RequestType createRequestType()
+   {
+      return new RequestType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link StatusDetailType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusDetail")
-    public JAXBElement<StatusDetailType> createStatusDetail(StatusDetailType value) {
-        return new JAXBElement<StatusDetailType>(_StatusDetail_QNAME, StatusDetailType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResponseType }
+    * 
+    */
+   public ResponseType createResponseType()
+   {
+      return new ResponseType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MissingAttributeDetailType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "MissingAttributeDetail")
-    public JAXBElement<MissingAttributeDetailType> createMissingAttributeDetail(MissingAttributeDetailType value) {
-        return new JAXBElement<MissingAttributeDetailType>(_MissingAttributeDetail_QNAME, MissingAttributeDetailType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeValueType }
+    * 
+    */
+   public AttributeValueType createAttributeValueType()
+   {
+      return new AttributeValueType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Response")
-    public JAXBElement<ResponseType> createResponse(ResponseType value) {
-        return new JAXBElement<ResponseType>(_Response_QNAME, ResponseType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link StatusType }
+    * 
+    */
+   public StatusType createStatusType()
+   {
+      return new StatusType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceContentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "ResourceContent")
-    public JAXBElement<ResourceContentType> createResourceContent(ResourceContentType value) {
-        return new JAXBElement<ResourceContentType>(_ResourceContent_QNAME, ResourceContentType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link SubjectType }
+    * 
+    */
+   public SubjectType createSubjectType()
+   {
+      return new SubjectType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Resource")
-    public JAXBElement<ResourceType> createResource(ResourceType value) {
-        return new JAXBElement<ResourceType>(_Resource_QNAME, ResourceType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeType }
+    * 
+    */
+   public AttributeType createAttributeType()
+   {
+      return new AttributeType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RequestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Request")
-    public JAXBElement<RequestType> createRequest(RequestType value) {
-        return new JAXBElement<RequestType>(_Request_QNAME, RequestType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResourceType }
+    * 
+    */
+   public ResourceType createResourceType()
+   {
+      return new ResourceType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Attribute")
-    public JAXBElement<AttributeType> createAttribute(AttributeType value) {
-        return new JAXBElement<AttributeType>(_Attribute_QNAME, AttributeType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link StatusDetailType }
+    * 
+    */
+   public StatusDetailType createStatusDetailType()
+   {
+      return new StatusDetailType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResultType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Result")
-    public JAXBElement<ResultType> createResult(ResultType value) {
-        return new JAXBElement<ResultType>(_Result_QNAME, ResultType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ActionType }
+    * 
+    */
+   public ActionType createActionType()
+   {
+      return new ActionType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "AttributeValue")
-    public JAXBElement<AttributeValueType> createAttributeValue(AttributeValueType value) {
-        return new JAXBElement<AttributeValueType>(_AttributeValue_QNAME, AttributeValueType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link MissingAttributeDetailType }
+    * 
+    */
+   public MissingAttributeDetailType createMissingAttributeDetailType()
+   {
+      return new MissingAttributeDetailType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link StatusCodeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusCode")
-    public JAXBElement<StatusCodeType> createStatusCode(StatusCodeType value) {
-        return new JAXBElement<StatusCodeType>(_StatusCode_QNAME, StatusCodeType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link StatusCodeType }
+    * 
+    */
+   public StatusCodeType createStatusCodeType()
+   {
+      return new StatusCodeType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusMessage")
-    public JAXBElement<String> createStatusMessage(String value) {
-        return new JAXBElement<String>(_StatusMessage_QNAME, String.class, null, value);
-    }
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Status")
+   public JAXBElement<StatusType> createStatus(StatusType value)
+   {
+      return new JAXBElement<StatusType>(_Status_QNAME, StatusType.class, null, value);
+   }
 
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Action")
+   public JAXBElement<ActionType> createAction(ActionType value)
+   {
+      return new JAXBElement<ActionType>(_Action_QNAME, ActionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link DecisionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Decision")
+   public JAXBElement<DecisionType> createDecision(DecisionType value)
+   {
+      return new JAXBElement<DecisionType>(_Decision_QNAME, DecisionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Environment")
+   public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value)
+   {
+      return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link SubjectType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Subject")
+   public JAXBElement<SubjectType> createSubject(SubjectType value)
+   {
+      return new JAXBElement<SubjectType>(_Subject_QNAME, SubjectType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link StatusDetailType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusDetail")
+   public JAXBElement<StatusDetailType> createStatusDetail(StatusDetailType value)
+   {
+      return new JAXBElement<StatusDetailType>(_StatusDetail_QNAME, StatusDetailType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link MissingAttributeDetailType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "MissingAttributeDetail")
+   public JAXBElement<MissingAttributeDetailType> createMissingAttributeDetail(MissingAttributeDetailType value)
+   {
+      return new JAXBElement<MissingAttributeDetailType>(_MissingAttributeDetail_QNAME,
+            MissingAttributeDetailType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResponseType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Response")
+   public JAXBElement<ResponseType> createResponse(ResponseType value)
+   {
+      return new JAXBElement<ResponseType>(_Response_QNAME, ResponseType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResourceContentType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "ResourceContent")
+   public JAXBElement<ResourceContentType> createResourceContent(ResourceContentType value)
+   {
+      return new JAXBElement<ResourceContentType>(_ResourceContent_QNAME, ResourceContentType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResourceType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Resource")
+   public JAXBElement<ResourceType> createResource(ResourceType value)
+   {
+      return new JAXBElement<ResourceType>(_Resource_QNAME, ResourceType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link RequestType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Request")
+   public JAXBElement<RequestType> createRequest(RequestType value)
+   {
+      return new JAXBElement<RequestType>(_Request_QNAME, RequestType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Attribute")
+   public JAXBElement<AttributeType> createAttribute(AttributeType value)
+   {
+      return new JAXBElement<AttributeType>(_Attribute_QNAME, AttributeType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResultType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "Result")
+   public JAXBElement<ResultType> createResult(ResultType value)
+   {
+      return new JAXBElement<ResultType>(_Result_QNAME, ResultType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "AttributeValue")
+   public JAXBElement<AttributeValueType> createAttributeValue(AttributeValueType value)
+   {
+      return new JAXBElement<AttributeValueType>(_AttributeValue_QNAME, AttributeValueType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link StatusCodeType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusCode")
+   public JAXBElement<StatusCodeType> createStatusCode(StatusCodeType value)
+   {
+      return new JAXBElement<StatusCodeType>(_StatusCode_QNAME, StatusCodeType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", name = "StatusMessage")
+   public JAXBElement<String> createStatusMessage(String value)
+   {
+      return new JAXBElement<String>(_StatusMessage_QNAME, String.class, null, value);
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/RequestType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/RequestType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/RequestType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for RequestType complex type.
  * 
@@ -39,127 +37,135 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "RequestType", propOrder = {
-    "subject",
-    "resource",
-    "action",
-    "environment"
-})
-public class RequestType {
+ at XmlType(name = "RequestType", propOrder =
+{"subject", "resource", "action", "environment"})
+public class RequestType
+{
 
-    @XmlElement(name = "Subject", required = true)
-    protected List<SubjectType> subject;
-    @XmlElement(name = "Resource", required = true)
-    protected List<ResourceType> resource;
-    @XmlElement(name = "Action", required = true)
-    protected ActionType action;
-    @XmlElement(name = "Environment", required = true)
-    protected EnvironmentType environment;
+   @XmlElement(name = "Subject", required = true)
+   protected List<SubjectType> subject;
 
-    /**
-     * Gets the value of the subject property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the subject property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSubject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SubjectType }
-     * 
-     * 
-     */
-    public List<SubjectType> getSubject() {
-        if (subject == null) {
-            subject = new ArrayList<SubjectType>();
-        }
-        return this.subject;
-    }
+   @XmlElement(name = "Resource", required = true)
+   protected List<ResourceType> resource;
 
-    /**
-     * Gets the value of the resource property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the resource property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getResource().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceType }
-     * 
-     * 
-     */
-    public List<ResourceType> getResource() {
-        if (resource == null) {
-            resource = new ArrayList<ResourceType>();
-        }
-        return this.resource;
-    }
+   @XmlElement(name = "Action", required = true)
+   protected ActionType action;
 
-    /**
-     * Gets the value of the action property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActionType }
-     *     
-     */
-    public ActionType getAction() {
-        return action;
-    }
+   @XmlElement(name = "Environment", required = true)
+   protected EnvironmentType environment;
 
-    /**
-     * Sets the value of the action property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActionType }
-     *     
-     */
-    public void setAction(ActionType value) {
-        this.action = value;
-    }
+   /**
+    * Gets the value of the subject property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the subject property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getSubject().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link SubjectType }
+    * 
+    * 
+    */
+   public List<SubjectType> getSubject()
+   {
+      if (subject == null)
+      {
+         subject = new ArrayList<SubjectType>();
+      }
+      return this.subject;
+   }
 
-    /**
-     * Gets the value of the environment property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnvironmentType }
-     *     
-     */
-    public EnvironmentType getEnvironment() {
-        return environment;
-    }
+   /**
+    * Gets the value of the resource property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the resource property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getResource().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ResourceType }
+    * 
+    * 
+    */
+   public List<ResourceType> getResource()
+   {
+      if (resource == null)
+      {
+         resource = new ArrayList<ResourceType>();
+      }
+      return this.resource;
+   }
 
-    /**
-     * Sets the value of the environment property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnvironmentType }
-     *     
-     */
-    public void setEnvironment(EnvironmentType value) {
-        this.environment = value;
-    }
+   /**
+    * Gets the value of the action property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ActionType }
+    *     
+    */
+   public ActionType getAction()
+   {
+      return action;
+   }
 
+   /**
+    * Sets the value of the action property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ActionType }
+    *     
+    */
+   public void setAction(ActionType value)
+   {
+      this.action = value;
+   }
+
+   /**
+    * Gets the value of the environment property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link EnvironmentType }
+    *     
+    */
+   public EnvironmentType getEnvironment()
+   {
+      return environment;
+   }
+
+   /**
+    * Sets the value of the environment property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link EnvironmentType }
+    *     
+    */
+   public void setEnvironment(EnvironmentType value)
+   {
+      this.environment = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceContentType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceContentType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceContentType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -21,7 +20,6 @@
 import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for ResourceContentType complex type.
  * 
@@ -42,64 +40,68 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResourceContentType", propOrder = {
-    "content"
-})
-public class ResourceContentType {
+ at XmlType(name = "ResourceContentType", propOrder =
+{"content"})
+public class ResourceContentType
+{
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+   @XmlMixed
+   @XmlAnyElement(lax = true)
+   protected List<Object> content;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link String }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+   @XmlAnyAttribute
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
+   /**
+    * Gets the value of the content property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the content property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getContent().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link Object }
+    * {@link String }
+    * {@link Element }
+    * 
+    * 
+    */
+   public List<Object> getContent()
+   {
+      if (content == null)
+      {
+         content = new ArrayList<Object>();
+      }
+      return this.content;
+   }
 
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and 
+    * the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute
+    * by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return
+    *     always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResourceType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ResourceType complex type.
  * 
@@ -37,68 +35,72 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResourceType", propOrder = {
-    "resourceContent",
-    "attribute"
-})
-public class ResourceType {
+ at XmlType(name = "ResourceType", propOrder =
+{"resourceContent", "attribute"})
+public class ResourceType
+{
 
-    @XmlElement(name = "ResourceContent")
-    protected ResourceContentType resourceContent;
-    @XmlElement(name = "Attribute")
-    protected List<AttributeType> attribute;
+   @XmlElement(name = "ResourceContent")
+   protected ResourceContentType resourceContent;
 
-    /**
-     * Gets the value of the resourceContent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ResourceContentType }
-     *     
-     */
-    public ResourceContentType getResourceContent() {
-        return resourceContent;
-    }
+   @XmlElement(name = "Attribute")
+   protected List<AttributeType> attribute;
 
-    /**
-     * Sets the value of the resourceContent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ResourceContentType }
-     *     
-     */
-    public void setResourceContent(ResourceContentType value) {
-        this.resourceContent = value;
-    }
+   /**
+    * Gets the value of the resourceContent property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ResourceContentType }
+    *     
+    */
+   public ResourceContentType getResourceContent()
+   {
+      return resourceContent;
+   }
 
-    /**
-     * Gets the value of the attribute property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttribute().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeType }
-     * 
-     * 
-     */
-    public List<AttributeType> getAttribute() {
-        if (attribute == null) {
-            attribute = new ArrayList<AttributeType>();
-        }
-        return this.attribute;
-    }
+   /**
+    * Sets the value of the resourceContent property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ResourceContentType }
+    *     
+    */
+   public void setResourceContent(ResourceContentType value)
+   {
+      this.resourceContent = value;
+   }
 
+   /**
+    * Gets the value of the attribute property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attribute property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttribute().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeType }
+    * 
+    * 
+    */
+   public List<AttributeType> getAttribute()
+   {
+      if (attribute == null)
+      {
+         attribute = new ArrayList<AttributeType>();
+      }
+      return this.attribute;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResponseType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResponseType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResponseType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ResponseType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResponseType", propOrder = {
-    "result"
-})
-public class ResponseType {
+ at XmlType(name = "ResponseType", propOrder =
+{"result"})
+public class ResponseType
+{
 
-    @XmlElement(name = "Result", required = true)
-    protected List<ResultType> result;
+   @XmlElement(name = "Result", required = true)
+   protected List<ResultType> result;
 
-    /**
-     * Gets the value of the result property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the result property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getResult().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResultType }
-     * 
-     * 
-     */
-    public List<ResultType> getResult() {
-        if (result == null) {
-            result = new ArrayList<ResultType>();
-        }
-        return this.result;
-    }
+   /**
+    * Gets the value of the result property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the result property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getResult().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ResultType }
+    * 
+    * 
+    */
+   public List<ResultType> getResult()
+   {
+      if (result == null)
+      {
+         result = new ArrayList<ResultType>();
+      }
+      return this.result;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResultType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResultType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/ResultType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlType;
 import org.jboss.security.xacml.core.model.policy.ObligationsType;
 
-
 /**
  * <p>Java class for ResultType complex type.
  * 
@@ -39,116 +37,125 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResultType", propOrder = {
-    "decision",
-    "status",
-    "obligations"
-})
-public class ResultType {
+ at XmlType(name = "ResultType", propOrder =
+{"decision", "status", "obligations"})
+public class ResultType
+{
 
-    @XmlElement(name = "Decision", required = true)
-    protected DecisionType decision;
-    @XmlElement(name = "Status")
-    protected StatusType status;
-    @XmlElement(name = "Obligations", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os")
-    protected ObligationsType obligations;
-    @XmlAttribute(name = "ResourceId")
-    protected String resourceId;
+   @XmlElement(name = "Decision", required = true)
+   protected DecisionType decision;
 
-    /**
-     * Gets the value of the decision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DecisionType }
-     *     
-     */
-    public DecisionType getDecision() {
-        return decision;
-    }
+   @XmlElement(name = "Status")
+   protected StatusType status;
 
-    /**
-     * Sets the value of the decision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DecisionType }
-     *     
-     */
-    public void setDecision(DecisionType value) {
-        this.decision = value;
-    }
+   @XmlElement(name = "Obligations", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os")
+   protected ObligationsType obligations;
 
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusType }
-     *     
-     */
-    public StatusType getStatus() {
-        return status;
-    }
+   @XmlAttribute(name = "ResourceId")
+   protected String resourceId;
 
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusType }
-     *     
-     */
-    public void setStatus(StatusType value) {
-        this.status = value;
-    }
+   /**
+    * Gets the value of the decision property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link DecisionType }
+    *     
+    */
+   public DecisionType getDecision()
+   {
+      return decision;
+   }
 
-    /**
-     * Gets the value of the obligations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public ObligationsType getObligations() {
-        return obligations;
-    }
+   /**
+    * Sets the value of the decision property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link DecisionType }
+    *     
+    */
+   public void setDecision(DecisionType value)
+   {
+      this.decision = value;
+   }
 
-    /**
-     * Sets the value of the obligations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public void setObligations(ObligationsType value) {
-        this.obligations = value;
-    }
+   /**
+    * Gets the value of the status property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link StatusType }
+    *     
+    */
+   public StatusType getStatus()
+   {
+      return status;
+   }
 
-    /**
-     * Gets the value of the resourceId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getResourceId() {
-        return resourceId;
-    }
+   /**
+    * Sets the value of the status property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link StatusType }
+    *     
+    */
+   public void setStatus(StatusType value)
+   {
+      this.status = value;
+   }
 
-    /**
-     * Sets the value of the resourceId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setResourceId(String value) {
-        this.resourceId = value;
-    }
+   /**
+    * Gets the value of the obligations property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public ObligationsType getObligations()
+   {
+      return obligations;
+   }
 
+   /**
+    * Sets the value of the obligations property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public void setObligations(ObligationsType value)
+   {
+      this.obligations = value;
+   }
+
+   /**
+    * Gets the value of the resourceId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getResourceId()
+   {
+      return resourceId;
+   }
+
+   /**
+    * Sets the value of the resourceId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setResourceId(String value)
+   {
+      this.resourceId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusCodeType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusCodeType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusCodeType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for StatusCodeType complex type.
  * 
@@ -37,63 +35,68 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "StatusCodeType", propOrder = {
-    "statusCode"
-})
-public class StatusCodeType {
+ at XmlType(name = "StatusCodeType", propOrder =
+{"statusCode"})
+public class StatusCodeType
+{
 
-    @XmlElement(name = "StatusCode")
-    protected StatusCodeType statusCode;
-    @XmlAttribute(name = "Value", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String value;
+   @XmlElement(name = "StatusCode")
+   protected StatusCodeType statusCode;
 
-    /**
-     * Gets the value of the statusCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public StatusCodeType getStatusCode() {
-        return statusCode;
-    }
+   @XmlAttribute(name = "Value", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String value;
 
-    /**
-     * Sets the value of the statusCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public void setStatusCode(StatusCodeType value) {
-        this.statusCode = value;
-    }
+   /**
+    * Gets the value of the statusCode property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public StatusCodeType getStatusCode()
+   {
+      return statusCode;
+   }
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+   /**
+    * Sets the value of the statusCode property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public void setStatusCode(StatusCodeType value)
+   {
+      this.statusCode = value;
+   }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+   /**
+    * Gets the value of the value property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getValue()
+   {
+      return value;
+   }
 
+   /**
+    * Sets the value of the value property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusDetailType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusDetailType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusDetailType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -16,7 +15,6 @@
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for StatusDetailType complex type.
  * 
@@ -37,42 +35,44 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "StatusDetailType", propOrder = {
-    "any"
-})
-public class StatusDetailType {
+ at XmlType(name = "StatusDetailType", propOrder =
+{"any"})
+public class StatusDetailType
+{
 
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
+   @XmlAnyElement(lax = true)
+   protected List<Object> any;
 
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
+   /**
+    * Gets the value of the any property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the any property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAny().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link Object }
+    * {@link Element }
+    * 
+    * 
+    */
+   public List<Object> getAny()
+   {
+      if (any == null)
+      {
+         any = new ArrayList<Object>();
+      }
+      return this.any;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/StatusType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for StatusType complex type.
  * 
@@ -36,90 +34,96 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "StatusType", propOrder = {
-    "statusCode",
-    "statusMessage",
-    "statusDetail"
-})
-public class StatusType {
+ at XmlType(name = "StatusType", propOrder =
+{"statusCode", "statusMessage", "statusDetail"})
+public class StatusType
+{
 
-    @XmlElement(name = "StatusCode", required = true)
-    protected StatusCodeType statusCode;
-    @XmlElement(name = "StatusMessage")
-    protected String statusMessage;
-    @XmlElement(name = "StatusDetail")
-    protected StatusDetailType statusDetail;
+   @XmlElement(name = "StatusCode", required = true)
+   protected StatusCodeType statusCode;
 
-    /**
-     * Gets the value of the statusCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public StatusCodeType getStatusCode() {
-        return statusCode;
-    }
+   @XmlElement(name = "StatusMessage")
+   protected String statusMessage;
 
-    /**
-     * Sets the value of the statusCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public void setStatusCode(StatusCodeType value) {
-        this.statusCode = value;
-    }
+   @XmlElement(name = "StatusDetail")
+   protected StatusDetailType statusDetail;
 
-    /**
-     * Gets the value of the statusMessage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatusMessage() {
-        return statusMessage;
-    }
+   /**
+    * Gets the value of the statusCode property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public StatusCodeType getStatusCode()
+   {
+      return statusCode;
+   }
 
-    /**
-     * Sets the value of the statusMessage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatusMessage(String value) {
-        this.statusMessage = value;
-    }
+   /**
+    * Sets the value of the statusCode property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public void setStatusCode(StatusCodeType value)
+   {
+      this.statusCode = value;
+   }
 
-    /**
-     * Gets the value of the statusDetail property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusDetailType }
-     *     
-     */
-    public StatusDetailType getStatusDetail() {
-        return statusDetail;
-    }
+   /**
+    * Gets the value of the statusMessage property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getStatusMessage()
+   {
+      return statusMessage;
+   }
 
-    /**
-     * Sets the value of the statusDetail property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusDetailType }
-     *     
-     */
-    public void setStatusDetail(StatusDetailType value) {
-        this.statusDetail = value;
-    }
+   /**
+    * Sets the value of the statusMessage property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setStatusMessage(String value)
+   {
+      this.statusMessage = value;
+   }
 
+   /**
+    * Gets the value of the statusDetail property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link StatusDetailType }
+    *     
+    */
+   public StatusDetailType getStatusDetail()
+   {
+      return statusDetail;
+   }
+
+   /**
+    * Sets the value of the statusDetail property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link StatusDetailType }
+    *     
+    */
+   public void setStatusDetail(StatusDetailType value)
+   {
+      this.statusDetail = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/SubjectType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/SubjectType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/SubjectType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.context;
 
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for SubjectType complex type.
  * 
@@ -39,72 +37,80 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SubjectType", propOrder = {
-    "attribute"
-})
-public class SubjectType {
+ at XmlType(name = "SubjectType", propOrder =
+{"attribute"})
+public class SubjectType
+{
 
-    @XmlElement(name = "Attribute")
-    protected List<AttributeType> attribute;
-    @XmlAttribute(name = "SubjectCategory")
-    @XmlSchemaType(name = "anyURI")
-    protected String subjectCategory;
+   @XmlElement(name = "Attribute")
+   protected List<AttributeType> attribute;
 
-    /**
-     * Gets the value of the attribute property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttribute().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeType }
-     * 
-     * 
-     */
-    public List<AttributeType> getAttribute() {
-        if (attribute == null) {
-            attribute = new ArrayList<AttributeType>();
-        }
-        return this.attribute;
-    }
+   @XmlAttribute(name = "SubjectCategory")
+   @XmlSchemaType(name = "anyURI")
+   protected String subjectCategory;
 
-    /**
-     * Gets the value of the subjectCategory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSubjectCategory() {
-        if (subjectCategory == null) {
-            return "urn:oasis:names:tc:xacml:1.0:subject-category:access-subject";
-        } else {
-            return subjectCategory;
-        }
-    }
+   /**
+    * Gets the value of the attribute property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attribute property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttribute().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeType }
+    * 
+    * 
+    */
+   public List<AttributeType> getAttribute()
+   {
+      if (attribute == null)
+      {
+         attribute = new ArrayList<AttributeType>();
+      }
+      return this.attribute;
+   }
 
-    /**
-     * Sets the value of the subjectCategory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSubjectCategory(String value) {
-        this.subjectCategory = value;
-    }
+   /**
+    * Gets the value of the subjectCategory property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getSubjectCategory()
+   {
+      if (subjectCategory == null)
+      {
+         return "urn:oasis:names:tc:xacml:1.0:subject-category:access-subject";
+      }
+      else
+      {
+         return subjectCategory;
+      }
+   }
 
+   /**
+    * Sets the value of the subjectCategory property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setSubjectCategory(String value)
+   {
+      this.subjectCategory = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/package-info.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/package-info.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/context/package-info.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:xacml:2.0:context:schema:os", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jboss.security.xacml.core.model.context;
+

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionMatchType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionMatchType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionMatchType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ActionMatchType complex type.
  * 
@@ -41,117 +39,126 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActionMatchType", propOrder = {
-    "attributeValue",
-    "actionAttributeDesignator",
-    "attributeSelector"
-})
-public class ActionMatchType {
+ at XmlType(name = "ActionMatchType", propOrder =
+{"attributeValue", "actionAttributeDesignator", "attributeSelector"})
+public class ActionMatchType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected AttributeValueType attributeValue;
-    @XmlElement(name = "ActionAttributeDesignator")
-    protected AttributeDesignatorType actionAttributeDesignator;
-    @XmlElement(name = "AttributeSelector")
-    protected AttributeSelectorType attributeSelector;
-    @XmlAttribute(name = "MatchId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String matchId;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected AttributeValueType attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public AttributeValueType getAttributeValue() {
-        return attributeValue;
-    }
+   @XmlElement(name = "ActionAttributeDesignator")
+   protected AttributeDesignatorType actionAttributeDesignator;
 
-    /**
-     * Sets the value of the attributeValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public void setAttributeValue(AttributeValueType value) {
-        this.attributeValue = value;
-    }
+   @XmlElement(name = "AttributeSelector")
+   protected AttributeSelectorType attributeSelector;
 
-    /**
-     * Gets the value of the actionAttributeDesignator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public AttributeDesignatorType getActionAttributeDesignator() {
-        return actionAttributeDesignator;
-    }
+   @XmlAttribute(name = "MatchId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String matchId;
 
-    /**
-     * Sets the value of the actionAttributeDesignator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public void setActionAttributeDesignator(AttributeDesignatorType value) {
-        this.actionAttributeDesignator = value;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public AttributeValueType getAttributeValue()
+   {
+      return attributeValue;
+   }
 
-    /**
-     * Gets the value of the attributeSelector property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public AttributeSelectorType getAttributeSelector() {
-        return attributeSelector;
-    }
+   /**
+    * Sets the value of the attributeValue property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public void setAttributeValue(AttributeValueType value)
+   {
+      this.attributeValue = value;
+   }
 
-    /**
-     * Sets the value of the attributeSelector property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public void setAttributeSelector(AttributeSelectorType value) {
-        this.attributeSelector = value;
-    }
+   /**
+    * Gets the value of the actionAttributeDesignator property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public AttributeDesignatorType getActionAttributeDesignator()
+   {
+      return actionAttributeDesignator;
+   }
 
-    /**
-     * Gets the value of the matchId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMatchId() {
-        return matchId;
-    }
+   /**
+    * Sets the value of the actionAttributeDesignator property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public void setActionAttributeDesignator(AttributeDesignatorType value)
+   {
+      this.actionAttributeDesignator = value;
+   }
 
-    /**
-     * Sets the value of the matchId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMatchId(String value) {
-        this.matchId = value;
-    }
+   /**
+    * Gets the value of the attributeSelector property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public AttributeSelectorType getAttributeSelector()
+   {
+      return attributeSelector;
+   }
 
+   /**
+    * Sets the value of the attributeSelector property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public void setAttributeSelector(AttributeSelectorType value)
+   {
+      this.attributeSelector = value;
+   }
+
+   /**
+    * Gets the value of the matchId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getMatchId()
+   {
+      return matchId;
+   }
+
+   /**
+    * Sets the value of the matchId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setMatchId(String value)
+   {
+      this.matchId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ActionType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActionType", propOrder = {
-    "actionMatch"
-})
-public class ActionType {
+ at XmlType(name = "ActionType", propOrder =
+{"actionMatch"})
+public class ActionType
+{
 
-    @XmlElement(name = "ActionMatch", required = true)
-    protected List<ActionMatchType> actionMatch;
+   @XmlElement(name = "ActionMatch", required = true)
+   protected List<ActionMatchType> actionMatch;
 
-    /**
-     * Gets the value of the actionMatch property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the actionMatch property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getActionMatch().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ActionMatchType }
-     * 
-     * 
-     */
-    public List<ActionMatchType> getActionMatch() {
-        if (actionMatch == null) {
-            actionMatch = new ArrayList<ActionMatchType>();
-        }
-        return this.actionMatch;
-    }
+   /**
+    * Gets the value of the actionMatch property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the actionMatch property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getActionMatch().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ActionMatchType }
+    * 
+    * 
+    */
+   public List<ActionMatchType> getActionMatch()
+   {
+      if (actionMatch == null)
+      {
+         actionMatch = new ArrayList<ActionMatchType>();
+      }
+      return this.actionMatch;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ActionsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ActionsType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActionsType", propOrder = {
-    "action"
-})
-public class ActionsType {
+ at XmlType(name = "ActionsType", propOrder =
+{"action"})
+public class ActionsType
+{
 
-    @XmlElement(name = "Action", required = true)
-    protected List<ActionType> action;
+   @XmlElement(name = "Action", required = true)
+   protected List<ActionType> action;
 
-    /**
-     * Gets the value of the action property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the action property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAction().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ActionType }
-     * 
-     * 
-     */
-    public List<ActionType> getAction() {
-        if (action == null) {
-            action = new ArrayList<ActionType>();
-        }
-        return this.action;
-    }
+   /**
+    * Gets the value of the action property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the action property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAction().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ActionType }
+    * 
+    * 
+    */
+   public List<ActionType> getAction()
+   {
+      if (action == null)
+      {
+         action = new ArrayList<ActionType>();
+      }
+      return this.action;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ApplyType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ApplyType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ApplyType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -18,7 +17,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ApplyType complex type.
  * 
@@ -40,79 +38,82 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ApplyType", propOrder = {
-    "expression"
-})
-public class ApplyType
-    extends ExpressionType
+ at XmlType(name = "ApplyType", propOrder =
+{"expression"})
+public class ApplyType extends ExpressionType
 {
 
-    @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
-    protected List<JAXBElement<?>> expression;
-    @XmlAttribute(name = "FunctionId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String functionId;
+   @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
+   protected List<JAXBElement<?>> expression;
 
-    /**
-     * Gets the value of the expression property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the expression property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExpression().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getExpression() {
-        if (expression == null) {
-            expression = new ArrayList<JAXBElement<?>>();
-        }
-        return this.expression;
-    }
+   @XmlAttribute(name = "FunctionId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String functionId;
 
-    /**
-     * Gets the value of the functionId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFunctionId() {
-        return functionId;
-    }
+   /**
+    * Gets the value of the expression property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the expression property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getExpression().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    * {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
+    * {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
+    * {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
+    * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    * {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
+    * {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
+    * {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    * {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
+    * {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
+    * 
+    * 
+    */
+   public List<JAXBElement<?>> getExpression()
+   {
+      if (expression == null)
+      {
+         expression = new ArrayList<JAXBElement<?>>();
+      }
+      return this.expression;
+   }
 
-    /**
-     * Sets the value of the functionId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFunctionId(String value) {
-        this.functionId = value;
-    }
+   /**
+    * Gets the value of the functionId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getFunctionId()
+   {
+      return functionId;
+   }
 
+   /**
+    * Sets the value of the functionId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setFunctionId(String value)
+   {
+      this.functionId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeAssignmentType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeAssignmentType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeAssignmentType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for AttributeAssignmentType complex type.
  * 
@@ -34,36 +32,37 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AttributeAssignmentType")
-public class AttributeAssignmentType
-    extends AttributeValueType
+public class AttributeAssignmentType extends AttributeValueType
 {
 
-    @XmlAttribute(name = "AttributeId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String attributeId;
+   @XmlAttribute(name = "AttributeId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String attributeId;
 
-    /**
-     * Gets the value of the attributeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
+   /**
+    * Gets the value of the attributeId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getAttributeId()
+   {
+      return attributeId;
+   }
 
-    /**
-     * Sets the value of the attributeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttributeId(String value) {
-        this.attributeId = value;
-    }
+   /**
+    * Sets the value of the attributeId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setAttributeId(String value)
+   {
+      this.attributeId = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeDesignatorType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeDesignatorType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeDesignatorType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for AttributeDesignatorType complex type.
  * 
@@ -37,119 +35,132 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AttributeDesignatorType")
-public class AttributeDesignatorType
-    extends ExpressionType
+public class AttributeDesignatorType extends ExpressionType
 {
 
-    @XmlAttribute(name = "AttributeId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String attributeId;
-    @XmlAttribute(name = "DataType", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String dataType;
-    @XmlAttribute(name = "Issuer")
-    protected String issuer;
-    @XmlAttribute(name = "MustBePresent")
-    protected Boolean mustBePresent;
+   @XmlAttribute(name = "AttributeId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String attributeId;
 
-    /**
-     * Gets the value of the attributeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
+   @XmlAttribute(name = "DataType", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String dataType;
 
-    /**
-     * Sets the value of the attributeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttributeId(String value) {
-        this.attributeId = value;
-    }
+   @XmlAttribute(name = "Issuer")
+   protected String issuer;
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+   @XmlAttribute(name = "MustBePresent")
+   protected Boolean mustBePresent;
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+   /**
+    * Gets the value of the attributeId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getAttributeId()
+   {
+      return attributeId;
+   }
 
-    /**
-     * Gets the value of the issuer property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIssuer() {
-        return issuer;
-    }
+   /**
+    * Sets the value of the attributeId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setAttributeId(String value)
+   {
+      this.attributeId = value;
+   }
 
-    /**
-     * Sets the value of the issuer property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIssuer(String value) {
-        this.issuer = value;
-    }
+   /**
+    * Gets the value of the dataType property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDataType()
+   {
+      return dataType;
+   }
 
-    /**
-     * Gets the value of the mustBePresent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isMustBePresent() {
-        if (mustBePresent == null) {
-            return false;
-        } else {
-            return mustBePresent;
-        }
-    }
+   /**
+    * Sets the value of the dataType property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDataType(String value)
+   {
+      this.dataType = value;
+   }
 
-    /**
-     * Sets the value of the mustBePresent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setMustBePresent(Boolean value) {
-        this.mustBePresent = value;
-    }
+   /**
+    * Gets the value of the issuer property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getIssuer()
+   {
+      return issuer;
+   }
 
+   /**
+    * Sets the value of the issuer property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setIssuer(String value)
+   {
+      this.issuer = value;
+   }
+
+   /**
+    * Gets the value of the mustBePresent property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link Boolean }
+    *     
+    */
+   public boolean isMustBePresent()
+   {
+      if (mustBePresent == null)
+      {
+         return false;
+      }
+      else
+      {
+         return mustBePresent;
+      }
+   }
+
+   /**
+    * Sets the value of the mustBePresent property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link Boolean }
+    *     
+    */
+   public void setMustBePresent(Boolean value)
+   {
+      this.mustBePresent = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeSelectorType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeSelectorType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeSelectorType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for AttributeSelectorType complex type.
  * 
@@ -36,92 +34,102 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AttributeSelectorType")
-public class AttributeSelectorType
-    extends ExpressionType
+public class AttributeSelectorType extends ExpressionType
 {
 
-    @XmlAttribute(name = "RequestContextPath", required = true)
-    protected String requestContextPath;
-    @XmlAttribute(name = "DataType", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String dataType;
-    @XmlAttribute(name = "MustBePresent")
-    protected Boolean mustBePresent;
+   @XmlAttribute(name = "RequestContextPath", required = true)
+   protected String requestContextPath;
 
-    /**
-     * Gets the value of the requestContextPath property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequestContextPath() {
-        return requestContextPath;
-    }
+   @XmlAttribute(name = "DataType", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String dataType;
 
-    /**
-     * Sets the value of the requestContextPath property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequestContextPath(String value) {
-        this.requestContextPath = value;
-    }
+   @XmlAttribute(name = "MustBePresent")
+   protected Boolean mustBePresent;
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+   /**
+    * Gets the value of the requestContextPath property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getRequestContextPath()
+   {
+      return requestContextPath;
+   }
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+   /**
+    * Sets the value of the requestContextPath property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setRequestContextPath(String value)
+   {
+      this.requestContextPath = value;
+   }
 
-    /**
-     * Gets the value of the mustBePresent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isMustBePresent() {
-        if (mustBePresent == null) {
-            return false;
-        } else {
-            return mustBePresent;
-        }
-    }
+   /**
+    * Gets the value of the dataType property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDataType()
+   {
+      return dataType;
+   }
 
-    /**
-     * Sets the value of the mustBePresent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setMustBePresent(Boolean value) {
-        this.mustBePresent = value;
-    }
+   /**
+    * Sets the value of the dataType property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDataType(String value)
+   {
+      this.dataType = value;
+   }
 
+   /**
+    * Gets the value of the mustBePresent property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link Boolean }
+    *     
+    */
+   public boolean isMustBePresent()
+   {
+      if (mustBePresent == null)
+      {
+         return false;
+      }
+      else
+      {
+         return mustBePresent;
+      }
+   }
+
+   /**
+    * Sets the value of the mustBePresent property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link Boolean }
+    *     
+    */
+   public void setMustBePresent(Boolean value)
+   {
+      this.mustBePresent = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeValueType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeValueType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/AttributeValueType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -23,7 +22,6 @@
 import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for AttributeValueType complex type.
  * 
@@ -45,91 +43,98 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AttributeValueType", propOrder = {
-    "content"
-})
-public class AttributeValueType {
+ at XmlType(name = "AttributeValueType", propOrder =
+{"content"})
+public class AttributeValueType
+{
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "DataType", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String dataType;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+   @XmlMixed
+   @XmlAnyElement(lax = true)
+   protected List<Object> content;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link String }
-     * {@link Element }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+   @XmlAttribute(name = "DataType", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String dataType;
 
-    /**
-     * Gets the value of the dataType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDataType() {
-        return dataType;
-    }
+   @XmlAnyAttribute
+   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
-    /**
-     * Sets the value of the dataType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDataType(String value) {
-        this.dataType = value;
-    }
+   /**
+    * Gets the value of the content property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the content property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getContent().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link Object }
+    * {@link String }
+    * {@link Element }
+    * 
+    * 
+    */
+   public List<Object> getContent()
+   {
+      if (content == null)
+      {
+         content = new ArrayList<Object>();
+      }
+      return this.content;
+   }
 
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
+   /**
+    * Gets the value of the dataType property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDataType()
+   {
+      return dataType;
+   }
 
+   /**
+    * Sets the value of the dataType property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDataType(String value)
+   {
+      this.dataType = value;
+   }
+
+   /**
+    * Gets a map that contains attributes that aren't bound to any typed property on this class.
+    * 
+    * <p>
+    * the map is keyed by the name of the attribute and 
+    * the value is the string value of the attribute.
+    * 
+    * the map returned by this method is live, and you can add new attribute
+    * by updating the map directly. Because of this design, there's no setter.
+    * 
+    * 
+    * @return
+    *     always non-null
+    */
+   public Map<QName, String> getOtherAttributes()
+   {
+      return otherAttributes;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParameterType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParameterType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParameterType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for CombinerParameterType complex type.
  * 
@@ -36,62 +34,67 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "CombinerParameterType", propOrder = {
-    "attributeValue"
-})
-public class CombinerParameterType {
+ at XmlType(name = "CombinerParameterType", propOrder =
+{"attributeValue"})
+public class CombinerParameterType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected AttributeValueType attributeValue;
-    @XmlAttribute(name = "ParameterName", required = true)
-    protected String parameterName;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected AttributeValueType attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public AttributeValueType getAttributeValue() {
-        return attributeValue;
-    }
+   @XmlAttribute(name = "ParameterName", required = true)
+   protected String parameterName;
 
-    /**
-     * Sets the value of the attributeValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public void setAttributeValue(AttributeValueType value) {
-        this.attributeValue = value;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public AttributeValueType getAttributeValue()
+   {
+      return attributeValue;
+   }
 
-    /**
-     * Gets the value of the parameterName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getParameterName() {
-        return parameterName;
-    }
+   /**
+    * Sets the value of the attributeValue property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public void setAttributeValue(AttributeValueType value)
+   {
+      this.attributeValue = value;
+   }
 
-    /**
-     * Sets the value of the parameterName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setParameterName(String value) {
-        this.parameterName = value;
-    }
+   /**
+    * Gets the value of the parameterName property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getParameterName()
+   {
+      return parameterName;
+   }
 
+   /**
+    * Sets the value of the parameterName property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setParameterName(String value)
+   {
+      this.parameterName = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParametersType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParametersType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/CombinerParametersType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for CombinerParametersType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "CombinerParametersType", propOrder = {
-    "combinerParameter"
-})
-public class CombinerParametersType {
+ at XmlType(name = "CombinerParametersType", propOrder =
+{"combinerParameter"})
+public class CombinerParametersType
+{
 
-    @XmlElement(name = "CombinerParameter")
-    protected List<CombinerParameterType> combinerParameter;
+   @XmlElement(name = "CombinerParameter")
+   protected List<CombinerParameterType> combinerParameter;
 
-    /**
-     * Gets the value of the combinerParameter property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the combinerParameter property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCombinerParameter().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CombinerParameterType }
-     * 
-     * 
-     */
-    public List<CombinerParameterType> getCombinerParameter() {
-        if (combinerParameter == null) {
-            combinerParameter = new ArrayList<CombinerParameterType>();
-        }
-        return this.combinerParameter;
-    }
+   /**
+    * Gets the value of the combinerParameter property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the combinerParameter property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getCombinerParameter().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link CombinerParameterType }
+    * 
+    * 
+    */
+   public List<CombinerParameterType> getCombinerParameter()
+   {
+      if (combinerParameter == null)
+      {
+         combinerParameter = new ArrayList<CombinerParameterType>();
+      }
+      return this.combinerParameter;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ConditionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ConditionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ConditionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.JAXBElement;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ConditionType complex type.
  * 
@@ -35,54 +33,56 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ConditionType", propOrder = {
-    "expression"
-})
-public class ConditionType {
+ at XmlType(name = "ConditionType", propOrder =
+{"expression"})
+public class ConditionType
+{
 
-    @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
-    protected JAXBElement<?> expression;
+   @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
+   protected JAXBElement<?> expression;
 
-    /**
-     * Gets the value of the expression property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
-     *     
-     */
-    public JAXBElement<?> getExpression() {
-        return expression;
-    }
+   /**
+    * Gets the value of the expression property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
+    *     
+    */
+   public JAXBElement<?> getExpression()
+   {
+      return expression;
+   }
 
-    /**
-     * Sets the value of the expression property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
-     *     
-     */
-    public void setExpression(JAXBElement<?> value) {
-        this.expression = ((JAXBElement<?> ) value);
-    }
+   /**
+    * Sets the value of the expression property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
+    *     
+    */
+   public void setExpression(JAXBElement<?> value)
+   {
+      this.expression = ((JAXBElement<?>) value);
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/DefaultsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/DefaultsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/DefaultsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for DefaultsType complex type.
  * 
@@ -37,37 +35,39 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "DefaultsType", propOrder = {
-    "xPathVersion"
-})
-public class DefaultsType {
+ at XmlType(name = "DefaultsType", propOrder =
+{"xPathVersion"})
+public class DefaultsType
+{
 
-    @XmlElement(name = "XPathVersion")
-    @XmlSchemaType(name = "anyURI")
-    protected String xPathVersion;
+   @XmlElement(name = "XPathVersion")
+   @XmlSchemaType(name = "anyURI")
+   protected String xPathVersion;
 
-    /**
-     * Gets the value of the xPathVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getXPathVersion() {
-        return xPathVersion;
-    }
+   /**
+    * Gets the value of the xPathVersion property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getXPathVersion()
+   {
+      return xPathVersion;
+   }
 
-    /**
-     * Sets the value of the xPathVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setXPathVersion(String value) {
-        this.xPathVersion = value;
-    }
+   /**
+    * Sets the value of the xPathVersion property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setXPathVersion(String value)
+   {
+      this.xPathVersion = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EffectType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EffectType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EffectType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,14 +5,12 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for EffectType.
  * 
@@ -32,27 +30,31 @@
 @XmlEnum
 public enum EffectType {
 
-    @XmlEnumValue("Permit")
-    PERMIT("Permit"),
-    @XmlEnumValue("Deny")
-    DENY("Deny");
-    private final String value;
+   @XmlEnumValue("Permit")
+   PERMIT("Permit"), @XmlEnumValue("Deny")
+   DENY("Deny");
+   private final String value;
 
-    EffectType(String v) {
-        value = v;
-    }
+   EffectType(String v)
+   {
+      value = v;
+   }
 
-    public String value() {
-        return value;
-    }
+   public String value()
+   {
+      return value;
+   }
 
-    public static EffectType fromValue(String v) {
-        for (EffectType c: EffectType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+   public static EffectType fromValue(String v)
+   {
+      for (EffectType c : EffectType.values())
+      {
+         if (c.value.equals(v))
+         {
+            return c;
+         }
+      }
+      throw new IllegalArgumentException(v);
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentMatchType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentMatchType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentMatchType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for EnvironmentMatchType complex type.
  * 
@@ -41,117 +39,126 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EnvironmentMatchType", propOrder = {
-    "attributeValue",
-    "environmentAttributeDesignator",
-    "attributeSelector"
-})
-public class EnvironmentMatchType {
+ at XmlType(name = "EnvironmentMatchType", propOrder =
+{"attributeValue", "environmentAttributeDesignator", "attributeSelector"})
+public class EnvironmentMatchType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected AttributeValueType attributeValue;
-    @XmlElement(name = "EnvironmentAttributeDesignator")
-    protected AttributeDesignatorType environmentAttributeDesignator;
-    @XmlElement(name = "AttributeSelector")
-    protected AttributeSelectorType attributeSelector;
-    @XmlAttribute(name = "MatchId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String matchId;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected AttributeValueType attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public AttributeValueType getAttributeValue() {
-        return attributeValue;
-    }
+   @XmlElement(name = "EnvironmentAttributeDesignator")
+   protected AttributeDesignatorType environmentAttributeDesignator;
 
-    /**
-     * Sets the value of the attributeValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public void setAttributeValue(AttributeValueType value) {
-        this.attributeValue = value;
-    }
+   @XmlElement(name = "AttributeSelector")
+   protected AttributeSelectorType attributeSelector;
 
-    /**
-     * Gets the value of the environmentAttributeDesignator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public AttributeDesignatorType getEnvironmentAttributeDesignator() {
-        return environmentAttributeDesignator;
-    }
+   @XmlAttribute(name = "MatchId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String matchId;
 
-    /**
-     * Sets the value of the environmentAttributeDesignator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public void setEnvironmentAttributeDesignator(AttributeDesignatorType value) {
-        this.environmentAttributeDesignator = value;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public AttributeValueType getAttributeValue()
+   {
+      return attributeValue;
+   }
 
-    /**
-     * Gets the value of the attributeSelector property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public AttributeSelectorType getAttributeSelector() {
-        return attributeSelector;
-    }
+   /**
+    * Sets the value of the attributeValue property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public void setAttributeValue(AttributeValueType value)
+   {
+      this.attributeValue = value;
+   }
 
-    /**
-     * Sets the value of the attributeSelector property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public void setAttributeSelector(AttributeSelectorType value) {
-        this.attributeSelector = value;
-    }
+   /**
+    * Gets the value of the environmentAttributeDesignator property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public AttributeDesignatorType getEnvironmentAttributeDesignator()
+   {
+      return environmentAttributeDesignator;
+   }
 
-    /**
-     * Gets the value of the matchId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMatchId() {
-        return matchId;
-    }
+   /**
+    * Sets the value of the environmentAttributeDesignator property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public void setEnvironmentAttributeDesignator(AttributeDesignatorType value)
+   {
+      this.environmentAttributeDesignator = value;
+   }
 
-    /**
-     * Sets the value of the matchId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMatchId(String value) {
-        this.matchId = value;
-    }
+   /**
+    * Gets the value of the attributeSelector property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public AttributeSelectorType getAttributeSelector()
+   {
+      return attributeSelector;
+   }
 
+   /**
+    * Sets the value of the attributeSelector property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public void setAttributeSelector(AttributeSelectorType value)
+   {
+      this.attributeSelector = value;
+   }
+
+   /**
+    * Gets the value of the matchId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getMatchId()
+   {
+      return matchId;
+   }
+
+   /**
+    * Sets the value of the matchId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setMatchId(String value)
+   {
+      this.matchId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for EnvironmentType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EnvironmentType", propOrder = {
-    "environmentMatch"
-})
-public class EnvironmentType {
+ at XmlType(name = "EnvironmentType", propOrder =
+{"environmentMatch"})
+public class EnvironmentType
+{
 
-    @XmlElement(name = "EnvironmentMatch", required = true)
-    protected List<EnvironmentMatchType> environmentMatch;
+   @XmlElement(name = "EnvironmentMatch", required = true)
+   protected List<EnvironmentMatchType> environmentMatch;
 
-    /**
-     * Gets the value of the environmentMatch property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the environmentMatch property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEnvironmentMatch().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnvironmentMatchType }
-     * 
-     * 
-     */
-    public List<EnvironmentMatchType> getEnvironmentMatch() {
-        if (environmentMatch == null) {
-            environmentMatch = new ArrayList<EnvironmentMatchType>();
-        }
-        return this.environmentMatch;
-    }
+   /**
+    * Gets the value of the environmentMatch property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the environmentMatch property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getEnvironmentMatch().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link EnvironmentMatchType }
+    * 
+    * 
+    */
+   public List<EnvironmentMatchType> getEnvironmentMatch()
+   {
+      if (environmentMatch == null)
+      {
+         environmentMatch = new ArrayList<EnvironmentMatchType>();
+      }
+      return this.environmentMatch;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/EnvironmentsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for EnvironmentsType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EnvironmentsType", propOrder = {
-    "environment"
-})
-public class EnvironmentsType {
+ at XmlType(name = "EnvironmentsType", propOrder =
+{"environment"})
+public class EnvironmentsType
+{
 
-    @XmlElement(name = "Environment", required = true)
-    protected List<EnvironmentType> environment;
+   @XmlElement(name = "Environment", required = true)
+   protected List<EnvironmentType> environment;
 
-    /**
-     * Gets the value of the environment property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the environment property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEnvironment().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnvironmentType }
-     * 
-     * 
-     */
-    public List<EnvironmentType> getEnvironment() {
-        if (environment == null) {
-            environment = new ArrayList<EnvironmentType>();
-        }
-        return this.environment;
-    }
+   /**
+    * Gets the value of the environment property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the environment property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getEnvironment().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link EnvironmentType }
+    * 
+    * 
+    */
+   public List<EnvironmentType> getEnvironment()
+   {
+      if (environment == null)
+      {
+         environment = new ArrayList<EnvironmentType>();
+      }
+      return this.environment;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ExpressionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ExpressionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ExpressionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,14 +5,12 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ExpressionType complex type.
  * 
@@ -31,7 +29,7 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ExpressionType")
-public abstract class ExpressionType {
+public abstract class ExpressionType
+{
 
-
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/FunctionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/FunctionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/FunctionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for FunctionType complex type.
  * 
@@ -34,36 +32,37 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "FunctionType")
-public class FunctionType
-    extends ExpressionType
+public class FunctionType extends ExpressionType
 {
 
-    @XmlAttribute(name = "FunctionId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String functionId;
+   @XmlAttribute(name = "FunctionId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String functionId;
 
-    /**
-     * Gets the value of the functionId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFunctionId() {
-        return functionId;
-    }
+   /**
+    * Gets the value of the functionId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getFunctionId()
+   {
+      return functionId;
+   }
 
-    /**
-     * Sets the value of the functionId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFunctionId(String value) {
-        this.functionId = value;
-    }
+   /**
+    * Sets the value of the functionId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setFunctionId(String value)
+   {
+      this.functionId = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/IdReferenceType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/IdReferenceType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/IdReferenceType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * <p>Java class for IdReferenceType complex type.
  * 
@@ -36,115 +34,126 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "IdReferenceType", propOrder = {
-    "value"
-})
-public class IdReferenceType {
+ at XmlType(name = "IdReferenceType", propOrder =
+{"value"})
+public class IdReferenceType
+{
 
-    @XmlValue
-    @XmlSchemaType(name = "anyURI")
-    protected String value;
-    @XmlAttribute(name = "Version")
-    protected String version;
-    @XmlAttribute(name = "EarliestVersion")
-    protected String earliestVersion;
-    @XmlAttribute(name = "LatestVersion")
-    protected String latestVersion;
+   @XmlValue
+   @XmlSchemaType(name = "anyURI")
+   protected String value;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+   @XmlAttribute(name = "Version")
+   protected String version;
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+   @XmlAttribute(name = "EarliestVersion")
+   protected String earliestVersion;
 
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        return version;
-    }
+   @XmlAttribute(name = "LatestVersion")
+   protected String latestVersion;
 
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
+   /**
+    * Gets the value of the value property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getValue()
+   {
+      return value;
+   }
 
-    /**
-     * Gets the value of the earliestVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEarliestVersion() {
-        return earliestVersion;
-    }
+   /**
+    * Sets the value of the value property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
 
-    /**
-     * Sets the value of the earliestVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEarliestVersion(String value) {
-        this.earliestVersion = value;
-    }
+   /**
+    * Gets the value of the version property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getVersion()
+   {
+      return version;
+   }
 
-    /**
-     * Gets the value of the latestVersion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLatestVersion() {
-        return latestVersion;
-    }
+   /**
+    * Sets the value of the version property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setVersion(String value)
+   {
+      this.version = value;
+   }
 
-    /**
-     * Sets the value of the latestVersion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLatestVersion(String value) {
-        this.latestVersion = value;
-    }
+   /**
+    * Gets the value of the earliestVersion property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getEarliestVersion()
+   {
+      return earliestVersion;
+   }
 
+   /**
+    * Sets the value of the earliestVersion property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setEarliestVersion(String value)
+   {
+      this.earliestVersion = value;
+   }
+
+   /**
+    * Gets the value of the latestVersion property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getLatestVersion()
+   {
+      return latestVersion;
+   }
+
+   /**
+    * Sets the value of the latestVersion property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setLatestVersion(String value)
+   {
+      this.latestVersion = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObjectFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObjectFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObjectFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.JAXBElement;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
@@ -29,714 +27,875 @@
  * 
  */
 @XmlRegistry
-public class ObjectFactory {
+public class ObjectFactory
+{
 
-    private final static QName _PolicySetCombinerParameters_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySetCombinerParameters");
-    private final static QName _Obligations_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Obligations");
-    private final static QName _RuleCombinerParameters_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "RuleCombinerParameters");
-    private final static QName _AttributeValue_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "AttributeValue");
-    private final static QName _VariableDefinition_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "VariableDefinition");
-    private final static QName _Apply_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Apply");
-    private final static QName _Environments_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Environments");
-    private final static QName _SubjectMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "SubjectMatch");
-    private final static QName _ResourceMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ResourceMatch");
-    private final static QName _ActionAttributeDesignator_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ActionAttributeDesignator");
-    private final static QName _PolicyCombinerParameters_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicyCombinerParameters");
-    private final static QName _Obligation_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Obligation");
-    private final static QName _ResourceAttributeDesignator_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ResourceAttributeDesignator");
-    private final static QName _Function_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Function");
-    private final static QName _EnvironmentAttributeDesignator_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "EnvironmentAttributeDesignator");
-    private final static QName _VariableReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "VariableReference");
-    private final static QName _AttributeAssignment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "AttributeAssignment");
-    private final static QName _Resource_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Resource");
-    private final static QName _Condition_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Condition");
-    private final static QName _PolicyDefaults_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicyDefaults");
-    private final static QName _Rule_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Rule");
-    private final static QName _Resources_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Resources");
-    private final static QName _Policy_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Policy");
-    private final static QName _Target_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Target");
-    private final static QName _Subject_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Subject");
-    private final static QName _Subjects_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Subjects");
-    private final static QName _PolicySetIdReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySetIdReference");
-    private final static QName _PolicySetDefaults_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySetDefaults");
-    private final static QName _XPathVersion_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "XPathVersion");
-    private final static QName _PolicyIdReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicyIdReference");
-    private final static QName _CombinerParameters_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "CombinerParameters");
-    private final static QName _EnvironmentMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "EnvironmentMatch");
-    private final static QName _Environment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Environment");
-    private final static QName _Actions_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Actions");
-    private final static QName _Action_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Action");
-    private final static QName _ActionMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ActionMatch");
-    private final static QName _AttributeSelector_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "AttributeSelector");
-    private final static QName _Description_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Description");
-    private final static QName _PolicySet_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySet");
-    private final static QName _SubjectAttributeDesignator_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "SubjectAttributeDesignator");
-    private final static QName _Expression_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Expression");
-    private final static QName _CombinerParameter_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "CombinerParameter");
+   private final static QName _PolicySetCombinerParameters_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySetCombinerParameters");
 
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.xacml._2_0.policy.schema.os
-     * 
-     */
-    public ObjectFactory() {
-    }
+   private final static QName _Obligations_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Obligations");
 
-    /**
-     * Create an instance of {@link EnvironmentMatchType }
-     * 
-     */
-    public EnvironmentMatchType createEnvironmentMatchType() {
-        return new EnvironmentMatchType();
-    }
+   private final static QName _RuleCombinerParameters_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "RuleCombinerParameters");
 
-    /**
-     * Create an instance of {@link AttributeDesignatorType }
-     * 
-     */
-    public AttributeDesignatorType createAttributeDesignatorType() {
-        return new AttributeDesignatorType();
-    }
+   private final static QName _AttributeValue_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "AttributeValue");
 
-    /**
-     * Create an instance of {@link AttributeAssignmentType }
-     * 
-     */
-    public AttributeAssignmentType createAttributeAssignmentType() {
-        return new AttributeAssignmentType();
-    }
+   private final static QName _VariableDefinition_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "VariableDefinition");
 
-    /**
-     * Create an instance of {@link PolicyCombinerParametersType }
-     * 
-     */
-    public PolicyCombinerParametersType createPolicyCombinerParametersType() {
-        return new PolicyCombinerParametersType();
-    }
+   private final static QName _Apply_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Apply");
 
-    /**
-     * Create an instance of {@link PolicySetType }
-     * 
-     */
-    public PolicySetType createPolicySetType() {
-        return new PolicySetType();
-    }
+   private final static QName _Environments_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Environments");
 
-    /**
-     * Create an instance of {@link EnvironmentType }
-     * 
-     */
-    public EnvironmentType createEnvironmentType() {
-        return new EnvironmentType();
-    }
+   private final static QName _SubjectMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "SubjectMatch");
 
-    /**
-     * Create an instance of {@link ActionsType }
-     * 
-     */
-    public ActionsType createActionsType() {
-        return new ActionsType();
-    }
+   private final static QName _ResourceMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "ResourceMatch");
 
-    /**
-     * Create an instance of {@link ActionMatchType }
-     * 
-     */
-    public ActionMatchType createActionMatchType() {
-        return new ActionMatchType();
-    }
+   private final static QName _ActionAttributeDesignator_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ActionAttributeDesignator");
 
-    /**
-     * Create an instance of {@link ActionType }
-     * 
-     */
-    public ActionType createActionType() {
-        return new ActionType();
-    }
+   private final static QName _PolicyCombinerParameters_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicyCombinerParameters");
 
-    /**
-     * Create an instance of {@link CombinerParametersType }
-     * 
-     */
-    public CombinerParametersType createCombinerParametersType() {
-        return new CombinerParametersType();
-    }
+   private final static QName _Obligation_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Obligation");
 
-    /**
-     * Create an instance of {@link ConditionType }
-     * 
-     */
-    public ConditionType createConditionType() {
-        return new ConditionType();
-    }
+   private final static QName _ResourceAttributeDesignator_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "ResourceAttributeDesignator");
 
-    /**
-     * Create an instance of {@link EnvironmentsType }
-     * 
-     */
-    public EnvironmentsType createEnvironmentsType() {
-        return new EnvironmentsType();
-    }
+   private final static QName _Function_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Function");
 
-    /**
-     * Create an instance of {@link SubjectsType }
-     * 
-     */
-    public SubjectsType createSubjectsType() {
-        return new SubjectsType();
-    }
+   private final static QName _EnvironmentAttributeDesignator_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "EnvironmentAttributeDesignator");
 
-    /**
-     * Create an instance of {@link FunctionType }
-     * 
-     */
-    public FunctionType createFunctionType() {
-        return new FunctionType();
-    }
+   private final static QName _VariableReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "VariableReference");
 
-    /**
-     * Create an instance of {@link RuleType }
-     * 
-     */
-    public RuleType createRuleType() {
-        return new RuleType();
-    }
+   private final static QName _AttributeAssignment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "AttributeAssignment");
 
-    /**
-     * Create an instance of {@link AttributeSelectorType }
-     * 
-     */
-    public AttributeSelectorType createAttributeSelectorType() {
-        return new AttributeSelectorType();
-    }
+   private final static QName _Resource_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Resource");
 
-    /**
-     * Create an instance of {@link AttributeValueType }
-     * 
-     */
-    public AttributeValueType createAttributeValueType() {
-        return new AttributeValueType();
-    }
+   private final static QName _Condition_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Condition");
 
-    /**
-     * Create an instance of {@link ObligationType }
-     * 
-     */
-    public ObligationType createObligationType() {
-        return new ObligationType();
-    }
+   private final static QName _PolicyDefaults_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "PolicyDefaults");
 
-    /**
-     * Create an instance of {@link VariableReferenceType }
-     * 
-     */
-    public VariableReferenceType createVariableReferenceType() {
-        return new VariableReferenceType();
-    }
+   private final static QName _Rule_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Rule");
 
-    /**
-     * Create an instance of {@link PolicyType }
-     * 
-     */
-    public PolicyType createPolicyType() {
-        return new PolicyType();
-    }
+   private final static QName _Resources_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Resources");
 
-    /**
-     * Create an instance of {@link SubjectType }
-     * 
-     */
-    public SubjectType createSubjectType() {
-        return new SubjectType();
-    }
+   private final static QName _Policy_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Policy");
 
-    /**
-     * Create an instance of {@link PolicySetCombinerParametersType }
-     * 
-     */
-    public PolicySetCombinerParametersType createPolicySetCombinerParametersType() {
-        return new PolicySetCombinerParametersType();
-    }
+   private final static QName _Target_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Target");
 
-    /**
-     * Create an instance of {@link RuleCombinerParametersType }
-     * 
-     */
-    public RuleCombinerParametersType createRuleCombinerParametersType() {
-        return new RuleCombinerParametersType();
-    }
+   private final static QName _Subject_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Subject");
 
-    /**
-     * Create an instance of {@link ResourceType }
-     * 
-     */
-    public ResourceType createResourceType() {
-        return new ResourceType();
-    }
+   private final static QName _Subjects_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Subjects");
 
-    /**
-     * Create an instance of {@link VariableDefinitionType }
-     * 
-     */
-    public VariableDefinitionType createVariableDefinitionType() {
-        return new VariableDefinitionType();
-    }
+   private final static QName _PolicySetIdReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "PolicySetIdReference");
 
-    /**
-     * Create an instance of {@link DefaultsType }
-     * 
-     */
-    public DefaultsType createDefaultsType() {
-        return new DefaultsType();
-    }
+   private final static QName _PolicySetDefaults_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "PolicySetDefaults");
 
-    /**
-     * Create an instance of {@link ObligationsType }
-     * 
-     */
-    public ObligationsType createObligationsType() {
-        return new ObligationsType();
-    }
+   private final static QName _XPathVersion_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "XPathVersion");
 
-    /**
-     * Create an instance of {@link SubjectMatchType }
-     * 
-     */
-    public SubjectMatchType createSubjectMatchType() {
-        return new SubjectMatchType();
-    }
+   private final static QName _PolicyIdReference_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "PolicyIdReference");
 
-    /**
-     * Create an instance of {@link TargetType }
-     * 
-     */
-    public TargetType createTargetType() {
-        return new TargetType();
-    }
+   private final static QName _CombinerParameters_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "CombinerParameters");
 
-    /**
-     * Create an instance of {@link CombinerParameterType }
-     * 
-     */
-    public CombinerParameterType createCombinerParameterType() {
-        return new CombinerParameterType();
-    }
+   private final static QName _EnvironmentMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "EnvironmentMatch");
 
-    /**
-     * Create an instance of {@link ApplyType }
-     * 
-     */
-    public ApplyType createApplyType() {
-        return new ApplyType();
-    }
+   private final static QName _Environment_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Environment");
 
-    /**
-     * Create an instance of {@link IdReferenceType }
-     * 
-     */
-    public IdReferenceType createIdReferenceType() {
-        return new IdReferenceType();
-    }
+   private final static QName _Actions_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Actions");
 
-    /**
-     * Create an instance of {@link ResourcesType }
-     * 
-     */
-    public ResourcesType createResourcesType() {
-        return new ResourcesType();
-    }
+   private final static QName _Action_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "Action");
 
-    /**
-     * Create an instance of {@link SubjectAttributeDesignatorType }
-     * 
-     */
-    public SubjectAttributeDesignatorType createSubjectAttributeDesignatorType() {
-        return new SubjectAttributeDesignatorType();
-    }
+   private final static QName _ActionMatch_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "ActionMatch");
 
-    /**
-     * Create an instance of {@link ResourceMatchType }
-     * 
-     */
-    public ResourceMatchType createResourceMatchType() {
-        return new ResourceMatchType();
-    }
+   private final static QName _AttributeSelector_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "AttributeSelector");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PolicySetCombinerParametersType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetCombinerParameters")
-    public JAXBElement<PolicySetCombinerParametersType> createPolicySetCombinerParameters(PolicySetCombinerParametersType value) {
-        return new JAXBElement<PolicySetCombinerParametersType>(_PolicySetCombinerParameters_QNAME, PolicySetCombinerParametersType.class, null, value);
-    }
+   private final static QName _Description_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Description");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObligationsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Obligations")
-    public JAXBElement<ObligationsType> createObligations(ObligationsType value) {
-        return new JAXBElement<ObligationsType>(_Obligations_QNAME, ObligationsType.class, null, value);
-    }
+   private final static QName _PolicySet_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os", "PolicySet");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RuleCombinerParametersType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "RuleCombinerParameters")
-    public JAXBElement<RuleCombinerParametersType> createRuleCombinerParameters(RuleCombinerParametersType value) {
-        return new JAXBElement<RuleCombinerParametersType>(_RuleCombinerParameters_QNAME, RuleCombinerParametersType.class, null, value);
-    }
+   private final static QName _SubjectAttributeDesignator_QNAME = new QName(
+         "urn:oasis:names:tc:xacml:2.0:policy:schema:os", "SubjectAttributeDesignator");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeValue", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<AttributeValueType> createAttributeValue(AttributeValueType value) {
-        return new JAXBElement<AttributeValueType>(_AttributeValue_QNAME, AttributeValueType.class, null, value);
-    }
+   private final static QName _Expression_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "Expression");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VariableDefinitionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "VariableDefinition")
-    public JAXBElement<VariableDefinitionType> createVariableDefinition(VariableDefinitionType value) {
-        return new JAXBElement<VariableDefinitionType>(_VariableDefinition_QNAME, VariableDefinitionType.class, null, value);
-    }
+   private final static QName _CombinerParameter_QNAME = new QName("urn:oasis:names:tc:xacml:2.0:policy:schema:os",
+         "CombinerParameter");
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ApplyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Apply", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<ApplyType> createApply(ApplyType value) {
-        return new JAXBElement<ApplyType>(_Apply_QNAME, ApplyType.class, null, value);
-    }
+   /**
+    * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.xacml._2_0.policy.schema.os
+    * 
+    */
+   public ObjectFactory()
+   {
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Environments")
-    public JAXBElement<EnvironmentsType> createEnvironments(EnvironmentsType value) {
-        return new JAXBElement<EnvironmentsType>(_Environments_QNAME, EnvironmentsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link EnvironmentMatchType }
+    * 
+    */
+   public EnvironmentMatchType createEnvironmentMatchType()
+   {
+      return new EnvironmentMatchType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubjectMatchType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "SubjectMatch")
-    public JAXBElement<SubjectMatchType> createSubjectMatch(SubjectMatchType value) {
-        return new JAXBElement<SubjectMatchType>(_SubjectMatch_QNAME, SubjectMatchType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeDesignatorType }
+    * 
+    */
+   public AttributeDesignatorType createAttributeDesignatorType()
+   {
+      return new AttributeDesignatorType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceMatchType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ResourceMatch")
-    public JAXBElement<ResourceMatchType> createResourceMatch(ResourceMatchType value) {
-        return new JAXBElement<ResourceMatchType>(_ResourceMatch_QNAME, ResourceMatchType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeAssignmentType }
+    * 
+    */
+   public AttributeAssignmentType createAttributeAssignmentType()
+   {
+      return new AttributeAssignmentType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ActionAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<AttributeDesignatorType> createActionAttributeDesignator(AttributeDesignatorType value) {
-        return new JAXBElement<AttributeDesignatorType>(_ActionAttributeDesignator_QNAME, AttributeDesignatorType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link PolicyCombinerParametersType }
+    * 
+    */
+   public PolicyCombinerParametersType createPolicyCombinerParametersType()
+   {
+      return new PolicyCombinerParametersType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PolicyCombinerParametersType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyCombinerParameters")
-    public JAXBElement<PolicyCombinerParametersType> createPolicyCombinerParameters(PolicyCombinerParametersType value) {
-        return new JAXBElement<PolicyCombinerParametersType>(_PolicyCombinerParameters_QNAME, PolicyCombinerParametersType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link PolicySetType }
+    * 
+    */
+   public PolicySetType createPolicySetType()
+   {
+      return new PolicySetType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObligationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Obligation")
-    public JAXBElement<ObligationType> createObligation(ObligationType value) {
-        return new JAXBElement<ObligationType>(_Obligation_QNAME, ObligationType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link EnvironmentType }
+    * 
+    */
+   public EnvironmentType createEnvironmentType()
+   {
+      return new EnvironmentType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ResourceAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<AttributeDesignatorType> createResourceAttributeDesignator(AttributeDesignatorType value) {
-        return new JAXBElement<AttributeDesignatorType>(_ResourceAttributeDesignator_QNAME, AttributeDesignatorType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ActionsType }
+    * 
+    */
+   public ActionsType createActionsType()
+   {
+      return new ActionsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link FunctionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Function", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<FunctionType> createFunction(FunctionType value) {
-        return new JAXBElement<FunctionType>(_Function_QNAME, FunctionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ActionMatchType }
+    * 
+    */
+   public ActionMatchType createActionMatchType()
+   {
+      return new ActionMatchType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "EnvironmentAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<AttributeDesignatorType> createEnvironmentAttributeDesignator(AttributeDesignatorType value) {
-        return new JAXBElement<AttributeDesignatorType>(_EnvironmentAttributeDesignator_QNAME, AttributeDesignatorType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ActionType }
+    * 
+    */
+   public ActionType createActionType()
+   {
+      return new ActionType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "VariableReference", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<VariableReferenceType> createVariableReference(VariableReferenceType value) {
-        return new JAXBElement<VariableReferenceType>(_VariableReference_QNAME, VariableReferenceType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link CombinerParametersType }
+    * 
+    */
+   public CombinerParametersType createCombinerParametersType()
+   {
+      return new CombinerParametersType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeAssignmentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeAssignment")
-    public JAXBElement<AttributeAssignmentType> createAttributeAssignment(AttributeAssignmentType value) {
-        return new JAXBElement<AttributeAssignmentType>(_AttributeAssignment_QNAME, AttributeAssignmentType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ConditionType }
+    * 
+    */
+   public ConditionType createConditionType()
+   {
+      return new ConditionType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Resource")
-    public JAXBElement<ResourceType> createResource(ResourceType value) {
-        return new JAXBElement<ResourceType>(_Resource_QNAME, ResourceType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link EnvironmentsType }
+    * 
+    */
+   public EnvironmentsType createEnvironmentsType()
+   {
+      return new EnvironmentsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ConditionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Condition")
-    public JAXBElement<ConditionType> createCondition(ConditionType value) {
-        return new JAXBElement<ConditionType>(_Condition_QNAME, ConditionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link SubjectsType }
+    * 
+    */
+   public SubjectsType createSubjectsType()
+   {
+      return new SubjectsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DefaultsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyDefaults")
-    public JAXBElement<DefaultsType> createPolicyDefaults(DefaultsType value) {
-        return new JAXBElement<DefaultsType>(_PolicyDefaults_QNAME, DefaultsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link FunctionType }
+    * 
+    */
+   public FunctionType createFunctionType()
+   {
+      return new FunctionType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RuleType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Rule")
-    public JAXBElement<RuleType> createRule(RuleType value) {
-        return new JAXBElement<RuleType>(_Rule_QNAME, RuleType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link RuleType }
+    * 
+    */
+   public RuleType createRuleType()
+   {
+      return new RuleType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ResourcesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Resources")
-    public JAXBElement<ResourcesType> createResources(ResourcesType value) {
-        return new JAXBElement<ResourcesType>(_Resources_QNAME, ResourcesType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeSelectorType }
+    * 
+    */
+   public AttributeSelectorType createAttributeSelectorType()
+   {
+      return new AttributeSelectorType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PolicyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Policy")
-    public JAXBElement<PolicyType> createPolicy(PolicyType value) {
-        return new JAXBElement<PolicyType>(_Policy_QNAME, PolicyType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link AttributeValueType }
+    * 
+    */
+   public AttributeValueType createAttributeValueType()
+   {
+      return new AttributeValueType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TargetType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Target")
-    public JAXBElement<TargetType> createTarget(TargetType value) {
-        return new JAXBElement<TargetType>(_Target_QNAME, TargetType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ObligationType }
+    * 
+    */
+   public ObligationType createObligationType()
+   {
+      return new ObligationType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubjectType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Subject")
-    public JAXBElement<SubjectType> createSubject(SubjectType value) {
-        return new JAXBElement<SubjectType>(_Subject_QNAME, SubjectType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link VariableReferenceType }
+    * 
+    */
+   public VariableReferenceType createVariableReferenceType()
+   {
+      return new VariableReferenceType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubjectsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Subjects")
-    public JAXBElement<SubjectsType> createSubjects(SubjectsType value) {
-        return new JAXBElement<SubjectsType>(_Subjects_QNAME, SubjectsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link PolicyType }
+    * 
+    */
+   public PolicyType createPolicyType()
+   {
+      return new PolicyType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetIdReference")
-    public JAXBElement<IdReferenceType> createPolicySetIdReference(IdReferenceType value) {
-        return new JAXBElement<IdReferenceType>(_PolicySetIdReference_QNAME, IdReferenceType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link SubjectType }
+    * 
+    */
+   public SubjectType createSubjectType()
+   {
+      return new SubjectType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DefaultsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetDefaults")
-    public JAXBElement<DefaultsType> createPolicySetDefaults(DefaultsType value) {
-        return new JAXBElement<DefaultsType>(_PolicySetDefaults_QNAME, DefaultsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link PolicySetCombinerParametersType }
+    * 
+    */
+   public PolicySetCombinerParametersType createPolicySetCombinerParametersType()
+   {
+      return new PolicySetCombinerParametersType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "XPathVersion")
-    public JAXBElement<String> createXPathVersion(String value) {
-        return new JAXBElement<String>(_XPathVersion_QNAME, String.class, null, value);
-    }
+   /**
+    * Create an instance of {@link RuleCombinerParametersType }
+    * 
+    */
+   public RuleCombinerParametersType createRuleCombinerParametersType()
+   {
+      return new RuleCombinerParametersType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyIdReference")
-    public JAXBElement<IdReferenceType> createPolicyIdReference(IdReferenceType value) {
-        return new JAXBElement<IdReferenceType>(_PolicyIdReference_QNAME, IdReferenceType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResourceType }
+    * 
+    */
+   public ResourceType createResourceType()
+   {
+      return new ResourceType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CombinerParametersType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "CombinerParameters")
-    public JAXBElement<CombinerParametersType> createCombinerParameters(CombinerParametersType value) {
-        return new JAXBElement<CombinerParametersType>(_CombinerParameters_QNAME, CombinerParametersType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link VariableDefinitionType }
+    * 
+    */
+   public VariableDefinitionType createVariableDefinitionType()
+   {
+      return new VariableDefinitionType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentMatchType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "EnvironmentMatch")
-    public JAXBElement<EnvironmentMatchType> createEnvironmentMatch(EnvironmentMatchType value) {
-        return new JAXBElement<EnvironmentMatchType>(_EnvironmentMatch_QNAME, EnvironmentMatchType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link DefaultsType }
+    * 
+    */
+   public DefaultsType createDefaultsType()
+   {
+      return new DefaultsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Environment")
-    public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value) {
-        return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ObligationsType }
+    * 
+    */
+   public ObligationsType createObligationsType()
+   {
+      return new ObligationsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActionsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Actions")
-    public JAXBElement<ActionsType> createActions(ActionsType value) {
-        return new JAXBElement<ActionsType>(_Actions_QNAME, ActionsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link SubjectMatchType }
+    * 
+    */
+   public SubjectMatchType createSubjectMatchType()
+   {
+      return new SubjectMatchType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Action")
-    public JAXBElement<ActionType> createAction(ActionType value) {
-        return new JAXBElement<ActionType>(_Action_QNAME, ActionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link TargetType }
+    * 
+    */
+   public TargetType createTargetType()
+   {
+      return new TargetType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActionMatchType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ActionMatch")
-    public JAXBElement<ActionMatchType> createActionMatch(ActionMatchType value) {
-        return new JAXBElement<ActionMatchType>(_ActionMatch_QNAME, ActionMatchType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link CombinerParameterType }
+    * 
+    */
+   public CombinerParameterType createCombinerParameterType()
+   {
+      return new CombinerParameterType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeSelector", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<AttributeSelectorType> createAttributeSelector(AttributeSelectorType value) {
-        return new JAXBElement<AttributeSelectorType>(_AttributeSelector_QNAME, AttributeSelectorType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ApplyType }
+    * 
+    */
+   public ApplyType createApplyType()
+   {
+      return new ApplyType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Description")
-    public JAXBElement<String> createDescription(String value) {
-        return new JAXBElement<String>(_Description_QNAME, String.class, null, value);
-    }
+   /**
+    * Create an instance of {@link IdReferenceType }
+    * 
+    */
+   public IdReferenceType createIdReferenceType()
+   {
+      return new IdReferenceType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PolicySetType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySet")
-    public JAXBElement<PolicySetType> createPolicySet(PolicySetType value) {
-        return new JAXBElement<PolicySetType>(_PolicySet_QNAME, PolicySetType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResourcesType }
+    * 
+    */
+   public ResourcesType createResourcesType()
+   {
+      return new ResourcesType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "SubjectAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
-    public JAXBElement<SubjectAttributeDesignatorType> createSubjectAttributeDesignator(SubjectAttributeDesignatorType value) {
-        return new JAXBElement<SubjectAttributeDesignatorType>(_SubjectAttributeDesignator_QNAME, SubjectAttributeDesignatorType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link SubjectAttributeDesignatorType }
+    * 
+    */
+   public SubjectAttributeDesignatorType createSubjectAttributeDesignatorType()
+   {
+      return new SubjectAttributeDesignatorType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Expression")
-    public JAXBElement<ExpressionType> createExpression(ExpressionType value) {
-        return new JAXBElement<ExpressionType>(_Expression_QNAME, ExpressionType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link ResourceMatchType }
+    * 
+    */
+   public ResourceMatchType createResourceMatchType()
+   {
+      return new ResourceMatchType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CombinerParameterType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "CombinerParameter")
-    public JAXBElement<CombinerParameterType> createCombinerParameter(CombinerParameterType value) {
-        return new JAXBElement<CombinerParameterType>(_CombinerParameter_QNAME, CombinerParameterType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PolicySetCombinerParametersType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetCombinerParameters")
+   public JAXBElement<PolicySetCombinerParametersType> createPolicySetCombinerParameters(
+         PolicySetCombinerParametersType value)
+   {
+      return new JAXBElement<PolicySetCombinerParametersType>(_PolicySetCombinerParameters_QNAME,
+            PolicySetCombinerParametersType.class, null, value);
+   }
 
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ObligationsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Obligations")
+   public JAXBElement<ObligationsType> createObligations(ObligationsType value)
+   {
+      return new JAXBElement<ObligationsType>(_Obligations_QNAME, ObligationsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link RuleCombinerParametersType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "RuleCombinerParameters")
+   public JAXBElement<RuleCombinerParametersType> createRuleCombinerParameters(RuleCombinerParametersType value)
+   {
+      return new JAXBElement<RuleCombinerParametersType>(_RuleCombinerParameters_QNAME,
+            RuleCombinerParametersType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeValue", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<AttributeValueType> createAttributeValue(AttributeValueType value)
+   {
+      return new JAXBElement<AttributeValueType>(_AttributeValue_QNAME, AttributeValueType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link VariableDefinitionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "VariableDefinition")
+   public JAXBElement<VariableDefinitionType> createVariableDefinition(VariableDefinitionType value)
+   {
+      return new JAXBElement<VariableDefinitionType>(_VariableDefinition_QNAME, VariableDefinitionType.class, null,
+            value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ApplyType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Apply", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<ApplyType> createApply(ApplyType value)
+   {
+      return new JAXBElement<ApplyType>(_Apply_QNAME, ApplyType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Environments")
+   public JAXBElement<EnvironmentsType> createEnvironments(EnvironmentsType value)
+   {
+      return new JAXBElement<EnvironmentsType>(_Environments_QNAME, EnvironmentsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link SubjectMatchType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "SubjectMatch")
+   public JAXBElement<SubjectMatchType> createSubjectMatch(SubjectMatchType value)
+   {
+      return new JAXBElement<SubjectMatchType>(_SubjectMatch_QNAME, SubjectMatchType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResourceMatchType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ResourceMatch")
+   public JAXBElement<ResourceMatchType> createResourceMatch(ResourceMatchType value)
+   {
+      return new JAXBElement<ResourceMatchType>(_ResourceMatch_QNAME, ResourceMatchType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ActionAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<AttributeDesignatorType> createActionAttributeDesignator(AttributeDesignatorType value)
+   {
+      return new JAXBElement<AttributeDesignatorType>(_ActionAttributeDesignator_QNAME, AttributeDesignatorType.class,
+            null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PolicyCombinerParametersType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyCombinerParameters")
+   public JAXBElement<PolicyCombinerParametersType> createPolicyCombinerParameters(PolicyCombinerParametersType value)
+   {
+      return new JAXBElement<PolicyCombinerParametersType>(_PolicyCombinerParameters_QNAME,
+            PolicyCombinerParametersType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ObligationType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Obligation")
+   public JAXBElement<ObligationType> createObligation(ObligationType value)
+   {
+      return new JAXBElement<ObligationType>(_Obligation_QNAME, ObligationType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ResourceAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<AttributeDesignatorType> createResourceAttributeDesignator(AttributeDesignatorType value)
+   {
+      return new JAXBElement<AttributeDesignatorType>(_ResourceAttributeDesignator_QNAME,
+            AttributeDesignatorType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link FunctionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Function", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<FunctionType> createFunction(FunctionType value)
+   {
+      return new JAXBElement<FunctionType>(_Function_QNAME, FunctionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "EnvironmentAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<AttributeDesignatorType> createEnvironmentAttributeDesignator(AttributeDesignatorType value)
+   {
+      return new JAXBElement<AttributeDesignatorType>(_EnvironmentAttributeDesignator_QNAME,
+            AttributeDesignatorType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "VariableReference", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<VariableReferenceType> createVariableReference(VariableReferenceType value)
+   {
+      return new JAXBElement<VariableReferenceType>(_VariableReference_QNAME, VariableReferenceType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeAssignmentType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeAssignment")
+   public JAXBElement<AttributeAssignmentType> createAttributeAssignment(AttributeAssignmentType value)
+   {
+      return new JAXBElement<AttributeAssignmentType>(_AttributeAssignment_QNAME, AttributeAssignmentType.class, null,
+            value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResourceType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Resource")
+   public JAXBElement<ResourceType> createResource(ResourceType value)
+   {
+      return new JAXBElement<ResourceType>(_Resource_QNAME, ResourceType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ConditionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Condition")
+   public JAXBElement<ConditionType> createCondition(ConditionType value)
+   {
+      return new JAXBElement<ConditionType>(_Condition_QNAME, ConditionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link DefaultsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyDefaults")
+   public JAXBElement<DefaultsType> createPolicyDefaults(DefaultsType value)
+   {
+      return new JAXBElement<DefaultsType>(_PolicyDefaults_QNAME, DefaultsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link RuleType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Rule")
+   public JAXBElement<RuleType> createRule(RuleType value)
+   {
+      return new JAXBElement<RuleType>(_Rule_QNAME, RuleType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ResourcesType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Resources")
+   public JAXBElement<ResourcesType> createResources(ResourcesType value)
+   {
+      return new JAXBElement<ResourcesType>(_Resources_QNAME, ResourcesType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PolicyType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Policy")
+   public JAXBElement<PolicyType> createPolicy(PolicyType value)
+   {
+      return new JAXBElement<PolicyType>(_Policy_QNAME, PolicyType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link TargetType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Target")
+   public JAXBElement<TargetType> createTarget(TargetType value)
+   {
+      return new JAXBElement<TargetType>(_Target_QNAME, TargetType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link SubjectType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Subject")
+   public JAXBElement<SubjectType> createSubject(SubjectType value)
+   {
+      return new JAXBElement<SubjectType>(_Subject_QNAME, SubjectType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link SubjectsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Subjects")
+   public JAXBElement<SubjectsType> createSubjects(SubjectsType value)
+   {
+      return new JAXBElement<SubjectsType>(_Subjects_QNAME, SubjectsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetIdReference")
+   public JAXBElement<IdReferenceType> createPolicySetIdReference(IdReferenceType value)
+   {
+      return new JAXBElement<IdReferenceType>(_PolicySetIdReference_QNAME, IdReferenceType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link DefaultsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySetDefaults")
+   public JAXBElement<DefaultsType> createPolicySetDefaults(DefaultsType value)
+   {
+      return new JAXBElement<DefaultsType>(_PolicySetDefaults_QNAME, DefaultsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "XPathVersion")
+   public JAXBElement<String> createXPathVersion(String value)
+   {
+      return new JAXBElement<String>(_XPathVersion_QNAME, String.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicyIdReference")
+   public JAXBElement<IdReferenceType> createPolicyIdReference(IdReferenceType value)
+   {
+      return new JAXBElement<IdReferenceType>(_PolicyIdReference_QNAME, IdReferenceType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link CombinerParametersType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "CombinerParameters")
+   public JAXBElement<CombinerParametersType> createCombinerParameters(CombinerParametersType value)
+   {
+      return new JAXBElement<CombinerParametersType>(_CombinerParameters_QNAME, CombinerParametersType.class, null,
+            value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentMatchType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "EnvironmentMatch")
+   public JAXBElement<EnvironmentMatchType> createEnvironmentMatch(EnvironmentMatchType value)
+   {
+      return new JAXBElement<EnvironmentMatchType>(_EnvironmentMatch_QNAME, EnvironmentMatchType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Environment")
+   public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value)
+   {
+      return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ActionsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Actions")
+   public JAXBElement<ActionsType> createActions(ActionsType value)
+   {
+      return new JAXBElement<ActionsType>(_Actions_QNAME, ActionsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Action")
+   public JAXBElement<ActionType> createAction(ActionType value)
+   {
+      return new JAXBElement<ActionType>(_Action_QNAME, ActionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ActionMatchType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "ActionMatch")
+   public JAXBElement<ActionMatchType> createActionMatch(ActionMatchType value)
+   {
+      return new JAXBElement<ActionMatchType>(_ActionMatch_QNAME, ActionMatchType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "AttributeSelector", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<AttributeSelectorType> createAttributeSelector(AttributeSelectorType value)
+   {
+      return new JAXBElement<AttributeSelectorType>(_AttributeSelector_QNAME, AttributeSelectorType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Description")
+   public JAXBElement<String> createDescription(String value)
+   {
+      return new JAXBElement<String>(_Description_QNAME, String.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PolicySetType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "PolicySet")
+   public JAXBElement<PolicySetType> createPolicySet(PolicySetType value)
+   {
+      return new JAXBElement<PolicySetType>(_PolicySet_QNAME, PolicySetType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "SubjectAttributeDesignator", substitutionHeadNamespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", substitutionHeadName = "Expression")
+   public JAXBElement<SubjectAttributeDesignatorType> createSubjectAttributeDesignator(
+         SubjectAttributeDesignatorType value)
+   {
+      return new JAXBElement<SubjectAttributeDesignatorType>(_SubjectAttributeDesignator_QNAME,
+            SubjectAttributeDesignatorType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "Expression")
+   public JAXBElement<ExpressionType> createExpression(ExpressionType value)
+   {
+      return new JAXBElement<ExpressionType>(_Expression_QNAME, ExpressionType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link CombinerParameterType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", name = "CombinerParameter")
+   public JAXBElement<CombinerParameterType> createCombinerParameter(CombinerParameterType value)
+   {
+      return new JAXBElement<CombinerParameterType>(_CombinerParameter_QNAME, CombinerParameterType.class, null, value);
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ObligationType complex type.
  * 
@@ -40,94 +38,102 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ObligationType", propOrder = {
-    "attributeAssignment"
-})
-public class ObligationType {
+ at XmlType(name = "ObligationType", propOrder =
+{"attributeAssignment"})
+public class ObligationType
+{
 
-    @XmlElement(name = "AttributeAssignment")
-    protected List<AttributeAssignmentType> attributeAssignment;
-    @XmlAttribute(name = "ObligationId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String obligationId;
-    @XmlAttribute(name = "FulfillOn", required = true)
-    protected EffectType fulfillOn;
+   @XmlElement(name = "AttributeAssignment")
+   protected List<AttributeAssignmentType> attributeAssignment;
 
-    /**
-     * Gets the value of the attributeAssignment property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attributeAssignment property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeAssignment().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttributeAssignmentType }
-     * 
-     * 
-     */
-    public List<AttributeAssignmentType> getAttributeAssignment() {
-        if (attributeAssignment == null) {
-            attributeAssignment = new ArrayList<AttributeAssignmentType>();
-        }
-        return this.attributeAssignment;
-    }
+   @XmlAttribute(name = "ObligationId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String obligationId;
 
-    /**
-     * Gets the value of the obligationId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getObligationId() {
-        return obligationId;
-    }
+   @XmlAttribute(name = "FulfillOn", required = true)
+   protected EffectType fulfillOn;
 
-    /**
-     * Sets the value of the obligationId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setObligationId(String value) {
-        this.obligationId = value;
-    }
+   /**
+    * Gets the value of the attributeAssignment property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the attributeAssignment property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getAttributeAssignment().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link AttributeAssignmentType }
+    * 
+    * 
+    */
+   public List<AttributeAssignmentType> getAttributeAssignment()
+   {
+      if (attributeAssignment == null)
+      {
+         attributeAssignment = new ArrayList<AttributeAssignmentType>();
+      }
+      return this.attributeAssignment;
+   }
 
-    /**
-     * Gets the value of the fulfillOn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EffectType }
-     *     
-     */
-    public EffectType getFulfillOn() {
-        return fulfillOn;
-    }
+   /**
+    * Gets the value of the obligationId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getObligationId()
+   {
+      return obligationId;
+   }
 
-    /**
-     * Sets the value of the fulfillOn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EffectType }
-     *     
-     */
-    public void setFulfillOn(EffectType value) {
-        this.fulfillOn = value;
-    }
+   /**
+    * Sets the value of the obligationId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setObligationId(String value)
+   {
+      this.obligationId = value;
+   }
 
+   /**
+    * Gets the value of the fulfillOn property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link EffectType }
+    *     
+    */
+   public EffectType getFulfillOn()
+   {
+      return fulfillOn;
+   }
+
+   /**
+    * Sets the value of the fulfillOn property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link EffectType }
+    *     
+    */
+   public void setFulfillOn(EffectType value)
+   {
+      this.fulfillOn = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ObligationsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ObligationsType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ObligationsType", propOrder = {
-    "obligation"
-})
-public class ObligationsType {
+ at XmlType(name = "ObligationsType", propOrder =
+{"obligation"})
+public class ObligationsType
+{
 
-    @XmlElement(name = "Obligation", required = true)
-    protected List<ObligationType> obligation;
+   @XmlElement(name = "Obligation", required = true)
+   protected List<ObligationType> obligation;
 
-    /**
-     * Gets the value of the obligation property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the obligation property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getObligation().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ObligationType }
-     * 
-     * 
-     */
-    public List<ObligationType> getObligation() {
-        if (obligation == null) {
-            obligation = new ArrayList<ObligationType>();
-        }
-        return this.obligation;
-    }
+   /**
+    * Gets the value of the obligation property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the obligation property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getObligation().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ObligationType }
+    * 
+    * 
+    */
+   public List<ObligationType> getObligation()
+   {
+      if (obligation == null)
+      {
+         obligation = new ArrayList<ObligationType>();
+      }
+      return this.obligation;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyCombinerParametersType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyCombinerParametersType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyCombinerParametersType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicyCombinerParametersType complex type.
  * 
@@ -34,36 +32,37 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "PolicyCombinerParametersType")
-public class PolicyCombinerParametersType
-    extends CombinerParametersType
+public class PolicyCombinerParametersType extends CombinerParametersType
 {
 
-    @XmlAttribute(name = "PolicyIdRef", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String policyIdRef;
+   @XmlAttribute(name = "PolicyIdRef", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String policyIdRef;
 
-    /**
-     * Gets the value of the policyIdRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyIdRef() {
-        return policyIdRef;
-    }
+   /**
+    * Gets the value of the policyIdRef property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getPolicyIdRef()
+   {
+      return policyIdRef;
+   }
 
-    /**
-     * Sets the value of the policyIdRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyIdRef(String value) {
-        this.policyIdRef = value;
-    }
+   /**
+    * Sets the value of the policyIdRef property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setPolicyIdRef(String value)
+   {
+      this.policyIdRef = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetCombinerParametersType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetCombinerParametersType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetCombinerParametersType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicySetCombinerParametersType complex type.
  * 
@@ -34,36 +32,37 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "PolicySetCombinerParametersType")
-public class PolicySetCombinerParametersType
-    extends CombinerParametersType
+public class PolicySetCombinerParametersType extends CombinerParametersType
 {
 
-    @XmlAttribute(name = "PolicySetIdRef", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String policySetIdRef;
+   @XmlAttribute(name = "PolicySetIdRef", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String policySetIdRef;
 
-    /**
-     * Gets the value of the policySetIdRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicySetIdRef() {
-        return policySetIdRef;
-    }
+   /**
+    * Gets the value of the policySetIdRef property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getPolicySetIdRef()
+   {
+      return policySetIdRef;
+   }
 
-    /**
-     * Sets the value of the policySetIdRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicySetIdRef(String value) {
-        this.policySetIdRef = value;
-    }
+   /**
+    * Sets the value of the policySetIdRef property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setPolicySetIdRef(String value)
+   {
+      this.policySetIdRef = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicySetType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -20,7 +19,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicySetType complex type.
  * 
@@ -56,247 +54,269 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PolicySetType", propOrder = {
-    "description",
-    "policySetDefaults",
-    "target",
-    "policySetOrPolicyOrPolicySetIdReference",
-    "obligations"
-})
-public class PolicySetType {
+ at XmlType(name = "PolicySetType", propOrder =
+{"description", "policySetDefaults", "target", "policySetOrPolicyOrPolicySetIdReference", "obligations"})
+public class PolicySetType
+{
 
-    @XmlElement(name = "Description")
-    protected String description;
-    @XmlElement(name = "PolicySetDefaults")
-    protected DefaultsType policySetDefaults;
-    @XmlElement(name = "Target", required = true)
-    protected TargetType target;
-    @XmlElementRefs({
-        @XmlElementRef(name = "Policy", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "PolicySetIdReference", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "PolicyCombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "CombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "PolicySet", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "PolicyIdReference", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
-        @XmlElementRef(name = "PolicySetCombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> policySetOrPolicyOrPolicySetIdReference;
-    @XmlElement(name = "Obligations")
-    protected ObligationsType obligations;
-    @XmlAttribute(name = "PolicySetId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String policySetId;
-    @XmlAttribute(name = "Version")
-    protected String version;
-    @XmlAttribute(name = "PolicyCombiningAlgId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String policyCombiningAlgId;
+   @XmlElement(name = "Description")
+   protected String description;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+   @XmlElement(name = "PolicySetDefaults")
+   protected DefaultsType policySetDefaults;
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+   @XmlElement(name = "Target", required = true)
+   protected TargetType target;
 
-    /**
-     * Gets the value of the policySetDefaults property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DefaultsType }
-     *     
-     */
-    public DefaultsType getPolicySetDefaults() {
-        return policySetDefaults;
-    }
+   @XmlElementRefs(
+   {
+         @XmlElementRef(name = "Policy", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "PolicySetIdReference", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "PolicyCombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "CombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "PolicySet", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "PolicyIdReference", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class),
+         @XmlElementRef(name = "PolicySetCombinerParameters", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)})
+   protected List<JAXBElement<?>> policySetOrPolicyOrPolicySetIdReference;
 
-    /**
-     * Sets the value of the policySetDefaults property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DefaultsType }
-     *     
-     */
-    public void setPolicySetDefaults(DefaultsType value) {
-        this.policySetDefaults = value;
-    }
+   @XmlElement(name = "Obligations")
+   protected ObligationsType obligations;
 
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TargetType }
-     *     
-     */
-    public TargetType getTarget() {
-        return target;
-    }
+   @XmlAttribute(name = "PolicySetId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String policySetId;
 
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TargetType }
-     *     
-     */
-    public void setTarget(TargetType value) {
-        this.target = value;
-    }
+   @XmlAttribute(name = "Version")
+   protected String version;
 
-    /**
-     * Gets the value of the policySetOrPolicyOrPolicySetIdReference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the policySetOrPolicyOrPolicySetIdReference property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPolicySetOrPolicyOrPolicySetIdReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link PolicyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PolicyCombinerParametersType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CombinerParametersType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PolicySetType }{@code >}
-     * {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PolicySetCombinerParametersType }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getPolicySetOrPolicyOrPolicySetIdReference() {
-        if (policySetOrPolicyOrPolicySetIdReference == null) {
-            policySetOrPolicyOrPolicySetIdReference = new ArrayList<JAXBElement<?>>();
-        }
-        return this.policySetOrPolicyOrPolicySetIdReference;
-    }
+   @XmlAttribute(name = "PolicyCombiningAlgId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String policyCombiningAlgId;
 
-    /**
-     * Gets the value of the obligations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public ObligationsType getObligations() {
-        return obligations;
-    }
+   /**
+    * Gets the value of the description property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDescription()
+   {
+      return description;
+   }
 
-    /**
-     * Sets the value of the obligations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public void setObligations(ObligationsType value) {
-        this.obligations = value;
-    }
+   /**
+    * Sets the value of the description property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
 
-    /**
-     * Gets the value of the policySetId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicySetId() {
-        return policySetId;
-    }
+   /**
+    * Gets the value of the policySetDefaults property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link DefaultsType }
+    *     
+    */
+   public DefaultsType getPolicySetDefaults()
+   {
+      return policySetDefaults;
+   }
 
-    /**
-     * Sets the value of the policySetId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicySetId(String value) {
-        this.policySetId = value;
-    }
+   /**
+    * Sets the value of the policySetDefaults property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link DefaultsType }
+    *     
+    */
+   public void setPolicySetDefaults(DefaultsType value)
+   {
+      this.policySetDefaults = value;
+   }
 
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "1.0";
-        } else {
-            return version;
-        }
-    }
+   /**
+    * Gets the value of the target property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link TargetType }
+    *     
+    */
+   public TargetType getTarget()
+   {
+      return target;
+   }
 
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
+   /**
+    * Sets the value of the target property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link TargetType }
+    *     
+    */
+   public void setTarget(TargetType value)
+   {
+      this.target = value;
+   }
 
-    /**
-     * Gets the value of the policyCombiningAlgId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyCombiningAlgId() {
-        return policyCombiningAlgId;
-    }
+   /**
+    * Gets the value of the policySetOrPolicyOrPolicySetIdReference property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the policySetOrPolicyOrPolicySetIdReference property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getPolicySetOrPolicyOrPolicySetIdReference().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link JAXBElement }{@code <}{@link PolicyType }{@code >}
+    * {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}
+    * {@link JAXBElement }{@code <}{@link PolicyCombinerParametersType }{@code >}
+    * {@link JAXBElement }{@code <}{@link CombinerParametersType }{@code >}
+    * {@link JAXBElement }{@code <}{@link PolicySetType }{@code >}
+    * {@link JAXBElement }{@code <}{@link IdReferenceType }{@code >}
+    * {@link JAXBElement }{@code <}{@link PolicySetCombinerParametersType }{@code >}
+    * 
+    * 
+    */
+   public List<JAXBElement<?>> getPolicySetOrPolicyOrPolicySetIdReference()
+   {
+      if (policySetOrPolicyOrPolicySetIdReference == null)
+      {
+         policySetOrPolicyOrPolicySetIdReference = new ArrayList<JAXBElement<?>>();
+      }
+      return this.policySetOrPolicyOrPolicySetIdReference;
+   }
 
-    /**
-     * Sets the value of the policyCombiningAlgId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyCombiningAlgId(String value) {
-        this.policyCombiningAlgId = value;
-    }
+   /**
+    * Gets the value of the obligations property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public ObligationsType getObligations()
+   {
+      return obligations;
+   }
 
+   /**
+    * Sets the value of the obligations property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public void setObligations(ObligationsType value)
+   {
+      this.obligations = value;
+   }
+
+   /**
+    * Gets the value of the policySetId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getPolicySetId()
+   {
+      return policySetId;
+   }
+
+   /**
+    * Sets the value of the policySetId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setPolicySetId(String value)
+   {
+      this.policySetId = value;
+   }
+
+   /**
+    * Gets the value of the version property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getVersion()
+   {
+      if (version == null)
+      {
+         return "1.0";
+      }
+      else
+      {
+         return version;
+      }
+   }
+
+   /**
+    * Sets the value of the version property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setVersion(String value)
+   {
+      this.version = value;
+   }
+
+   /**
+    * Gets the value of the policyCombiningAlgId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getPolicyCombiningAlgId()
+   {
+      return policyCombiningAlgId;
+   }
+
+   /**
+    * Sets the value of the policyCombiningAlgId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setPolicyCombiningAlgId(String value)
+   {
+      this.policyCombiningAlgId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/PolicyType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -18,7 +17,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicyType complex type.
  * 
@@ -51,241 +49,263 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PolicyType", propOrder = {
-    "description",
-    "policyDefaults",
-    "target",
-    "combinerParametersOrRuleCombinerParametersOrVariableDefinition",
-    "obligations"
-})
-public class PolicyType {
+ at XmlType(name = "PolicyType", propOrder =
+{"description", "policyDefaults", "target", "combinerParametersOrRuleCombinerParametersOrVariableDefinition",
+      "obligations"})
+public class PolicyType
+{
 
-    @XmlElement(name = "Description")
-    protected String description;
-    @XmlElement(name = "PolicyDefaults")
-    protected DefaultsType policyDefaults;
-    @XmlElement(name = "Target", required = true)
-    protected TargetType target;
-    @XmlElements({
-        @XmlElement(name = "CombinerParameters", type = CombinerParametersType.class),
-        @XmlElement(name = "Rule", type = RuleType.class),
-        @XmlElement(name = "VariableDefinition", type = VariableDefinitionType.class),
-        @XmlElement(name = "RuleCombinerParameters", type = RuleCombinerParametersType.class)
-    })
-    protected List<Object> combinerParametersOrRuleCombinerParametersOrVariableDefinition;
-    @XmlElement(name = "Obligations")
-    protected ObligationsType obligations;
-    @XmlAttribute(name = "PolicyId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String policyId;
-    @XmlAttribute(name = "Version")
-    protected String version;
-    @XmlAttribute(name = "RuleCombiningAlgId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String ruleCombiningAlgId;
+   @XmlElement(name = "Description")
+   protected String description;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+   @XmlElement(name = "PolicyDefaults")
+   protected DefaultsType policyDefaults;
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+   @XmlElement(name = "Target", required = true)
+   protected TargetType target;
 
-    /**
-     * Gets the value of the policyDefaults property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DefaultsType }
-     *     
-     */
-    public DefaultsType getPolicyDefaults() {
-        return policyDefaults;
-    }
+   @XmlElements(
+   {@XmlElement(name = "CombinerParameters", type = CombinerParametersType.class),
+         @XmlElement(name = "Rule", type = RuleType.class),
+         @XmlElement(name = "VariableDefinition", type = VariableDefinitionType.class),
+         @XmlElement(name = "RuleCombinerParameters", type = RuleCombinerParametersType.class)})
+   protected List<Object> combinerParametersOrRuleCombinerParametersOrVariableDefinition;
 
-    /**
-     * Sets the value of the policyDefaults property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DefaultsType }
-     *     
-     */
-    public void setPolicyDefaults(DefaultsType value) {
-        this.policyDefaults = value;
-    }
+   @XmlElement(name = "Obligations")
+   protected ObligationsType obligations;
 
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TargetType }
-     *     
-     */
-    public TargetType getTarget() {
-        return target;
-    }
+   @XmlAttribute(name = "PolicyId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String policyId;
 
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TargetType }
-     *     
-     */
-    public void setTarget(TargetType value) {
-        this.target = value;
-    }
+   @XmlAttribute(name = "Version")
+   protected String version;
 
-    /**
-     * Gets the value of the combinerParametersOrRuleCombinerParametersOrVariableDefinition property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the combinerParametersOrRuleCombinerParametersOrVariableDefinition property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CombinerParametersType }
-     * {@link RuleType }
-     * {@link VariableDefinitionType }
-     * {@link RuleCombinerParametersType }
-     * 
-     * 
-     */
-    public List<Object> getCombinerParametersOrRuleCombinerParametersOrVariableDefinition() {
-        if (combinerParametersOrRuleCombinerParametersOrVariableDefinition == null) {
-            combinerParametersOrRuleCombinerParametersOrVariableDefinition = new ArrayList<Object>();
-        }
-        return this.combinerParametersOrRuleCombinerParametersOrVariableDefinition;
-    }
+   @XmlAttribute(name = "RuleCombiningAlgId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String ruleCombiningAlgId;
 
-    /**
-     * Gets the value of the obligations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public ObligationsType getObligations() {
-        return obligations;
-    }
+   /**
+    * Gets the value of the description property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDescription()
+   {
+      return description;
+   }
 
-    /**
-     * Sets the value of the obligations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ObligationsType }
-     *     
-     */
-    public void setObligations(ObligationsType value) {
-        this.obligations = value;
-    }
+   /**
+    * Sets the value of the description property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
 
-    /**
-     * Gets the value of the policyId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPolicyId() {
-        return policyId;
-    }
+   /**
+    * Gets the value of the policyDefaults property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link DefaultsType }
+    *     
+    */
+   public DefaultsType getPolicyDefaults()
+   {
+      return policyDefaults;
+   }
 
-    /**
-     * Sets the value of the policyId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPolicyId(String value) {
-        this.policyId = value;
-    }
+   /**
+    * Sets the value of the policyDefaults property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link DefaultsType }
+    *     
+    */
+   public void setPolicyDefaults(DefaultsType value)
+   {
+      this.policyDefaults = value;
+   }
 
-    /**
-     * Gets the value of the version property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVersion() {
-        if (version == null) {
-            return "1.0";
-        } else {
-            return version;
-        }
-    }
+   /**
+    * Gets the value of the target property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link TargetType }
+    *     
+    */
+   public TargetType getTarget()
+   {
+      return target;
+   }
 
-    /**
-     * Sets the value of the version property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVersion(String value) {
-        this.version = value;
-    }
+   /**
+    * Sets the value of the target property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link TargetType }
+    *     
+    */
+   public void setTarget(TargetType value)
+   {
+      this.target = value;
+   }
 
-    /**
-     * Gets the value of the ruleCombiningAlgId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRuleCombiningAlgId() {
-        return ruleCombiningAlgId;
-    }
+   /**
+    * Gets the value of the combinerParametersOrRuleCombinerParametersOrVariableDefinition property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the combinerParametersOrRuleCombinerParametersOrVariableDefinition property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getCombinerParametersOrRuleCombinerParametersOrVariableDefinition().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link CombinerParametersType }
+    * {@link RuleType }
+    * {@link VariableDefinitionType }
+    * {@link RuleCombinerParametersType }
+    * 
+    * 
+    */
+   public List<Object> getCombinerParametersOrRuleCombinerParametersOrVariableDefinition()
+   {
+      if (combinerParametersOrRuleCombinerParametersOrVariableDefinition == null)
+      {
+         combinerParametersOrRuleCombinerParametersOrVariableDefinition = new ArrayList<Object>();
+      }
+      return this.combinerParametersOrRuleCombinerParametersOrVariableDefinition;
+   }
 
-    /**
-     * Sets the value of the ruleCombiningAlgId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRuleCombiningAlgId(String value) {
-        this.ruleCombiningAlgId = value;
-    }
+   /**
+    * Gets the value of the obligations property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public ObligationsType getObligations()
+   {
+      return obligations;
+   }
 
+   /**
+    * Sets the value of the obligations property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ObligationsType }
+    *     
+    */
+   public void setObligations(ObligationsType value)
+   {
+      this.obligations = value;
+   }
+
+   /**
+    * Gets the value of the policyId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getPolicyId()
+   {
+      return policyId;
+   }
+
+   /**
+    * Sets the value of the policyId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setPolicyId(String value)
+   {
+      this.policyId = value;
+   }
+
+   /**
+    * Gets the value of the version property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getVersion()
+   {
+      if (version == null)
+      {
+         return "1.0";
+      }
+      else
+      {
+         return version;
+      }
+   }
+
+   /**
+    * Sets the value of the version property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setVersion(String value)
+   {
+      this.version = value;
+   }
+
+   /**
+    * Gets the value of the ruleCombiningAlgId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getRuleCombiningAlgId()
+   {
+      return ruleCombiningAlgId;
+   }
+
+   /**
+    * Sets the value of the ruleCombiningAlgId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setRuleCombiningAlgId(String value)
+   {
+      this.ruleCombiningAlgId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceMatchType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceMatchType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceMatchType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ResourceMatchType complex type.
  * 
@@ -41,117 +39,126 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResourceMatchType", propOrder = {
-    "attributeValue",
-    "resourceAttributeDesignator",
-    "attributeSelector"
-})
-public class ResourceMatchType {
+ at XmlType(name = "ResourceMatchType", propOrder =
+{"attributeValue", "resourceAttributeDesignator", "attributeSelector"})
+public class ResourceMatchType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected AttributeValueType attributeValue;
-    @XmlElement(name = "ResourceAttributeDesignator")
-    protected AttributeDesignatorType resourceAttributeDesignator;
-    @XmlElement(name = "AttributeSelector")
-    protected AttributeSelectorType attributeSelector;
-    @XmlAttribute(name = "MatchId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String matchId;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected AttributeValueType attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public AttributeValueType getAttributeValue() {
-        return attributeValue;
-    }
+   @XmlElement(name = "ResourceAttributeDesignator")
+   protected AttributeDesignatorType resourceAttributeDesignator;
 
-    /**
-     * Sets the value of the attributeValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public void setAttributeValue(AttributeValueType value) {
-        this.attributeValue = value;
-    }
+   @XmlElement(name = "AttributeSelector")
+   protected AttributeSelectorType attributeSelector;
 
-    /**
-     * Gets the value of the resourceAttributeDesignator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public AttributeDesignatorType getResourceAttributeDesignator() {
-        return resourceAttributeDesignator;
-    }
+   @XmlAttribute(name = "MatchId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String matchId;
 
-    /**
-     * Sets the value of the resourceAttributeDesignator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeDesignatorType }
-     *     
-     */
-    public void setResourceAttributeDesignator(AttributeDesignatorType value) {
-        this.resourceAttributeDesignator = value;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public AttributeValueType getAttributeValue()
+   {
+      return attributeValue;
+   }
 
-    /**
-     * Gets the value of the attributeSelector property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public AttributeSelectorType getAttributeSelector() {
-        return attributeSelector;
-    }
+   /**
+    * Sets the value of the attributeValue property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public void setAttributeValue(AttributeValueType value)
+   {
+      this.attributeValue = value;
+   }
 
-    /**
-     * Sets the value of the attributeSelector property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public void setAttributeSelector(AttributeSelectorType value) {
-        this.attributeSelector = value;
-    }
+   /**
+    * Gets the value of the resourceAttributeDesignator property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public AttributeDesignatorType getResourceAttributeDesignator()
+   {
+      return resourceAttributeDesignator;
+   }
 
-    /**
-     * Gets the value of the matchId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMatchId() {
-        return matchId;
-    }
+   /**
+    * Sets the value of the resourceAttributeDesignator property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeDesignatorType }
+    *     
+    */
+   public void setResourceAttributeDesignator(AttributeDesignatorType value)
+   {
+      this.resourceAttributeDesignator = value;
+   }
 
-    /**
-     * Sets the value of the matchId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMatchId(String value) {
-        this.matchId = value;
-    }
+   /**
+    * Gets the value of the attributeSelector property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public AttributeSelectorType getAttributeSelector()
+   {
+      return attributeSelector;
+   }
 
+   /**
+    * Sets the value of the attributeSelector property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public void setAttributeSelector(AttributeSelectorType value)
+   {
+      this.attributeSelector = value;
+   }
+
+   /**
+    * Gets the value of the matchId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getMatchId()
+   {
+      return matchId;
+   }
+
+   /**
+    * Sets the value of the matchId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setMatchId(String value)
+   {
+      this.matchId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourceType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ResourceType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResourceType", propOrder = {
-    "resourceMatch"
-})
-public class ResourceType {
+ at XmlType(name = "ResourceType", propOrder =
+{"resourceMatch"})
+public class ResourceType
+{
 
-    @XmlElement(name = "ResourceMatch", required = true)
-    protected List<ResourceMatchType> resourceMatch;
+   @XmlElement(name = "ResourceMatch", required = true)
+   protected List<ResourceMatchType> resourceMatch;
 
-    /**
-     * Gets the value of the resourceMatch property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the resourceMatch property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getResourceMatch().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceMatchType }
-     * 
-     * 
-     */
-    public List<ResourceMatchType> getResourceMatch() {
-        if (resourceMatch == null) {
-            resourceMatch = new ArrayList<ResourceMatchType>();
-        }
-        return this.resourceMatch;
-    }
+   /**
+    * Gets the value of the resourceMatch property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the resourceMatch property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getResourceMatch().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ResourceMatchType }
+    * 
+    * 
+    */
+   public List<ResourceMatchType> getResourceMatch()
+   {
+      if (resourceMatch == null)
+      {
+         resourceMatch = new ArrayList<ResourceMatchType>();
+      }
+      return this.resourceMatch;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourcesType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourcesType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/ResourcesType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for ResourcesType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ResourcesType", propOrder = {
-    "resource"
-})
-public class ResourcesType {
+ at XmlType(name = "ResourcesType", propOrder =
+{"resource"})
+public class ResourcesType
+{
 
-    @XmlElement(name = "Resource", required = true)
-    protected List<ResourceType> resource;
+   @XmlElement(name = "Resource", required = true)
+   protected List<ResourceType> resource;
 
-    /**
-     * Gets the value of the resource property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the resource property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getResource().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ResourceType }
-     * 
-     * 
-     */
-    public List<ResourceType> getResource() {
-        if (resource == null) {
-            resource = new ArrayList<ResourceType>();
-        }
-        return this.resource;
-    }
+   /**
+    * Gets the value of the resource property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the resource property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getResource().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link ResourceType }
+    * 
+    * 
+    */
+   public List<ResourceType> getResource()
+   {
+      if (resource == null)
+      {
+         resource = new ArrayList<ResourceType>();
+      }
+      return this.resource;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleCombinerParametersType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleCombinerParametersType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleCombinerParametersType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for RuleCombinerParametersType complex type.
  * 
@@ -33,35 +31,36 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "RuleCombinerParametersType")
-public class RuleCombinerParametersType
-    extends CombinerParametersType
+public class RuleCombinerParametersType extends CombinerParametersType
 {
 
-    @XmlAttribute(name = "RuleIdRef", required = true)
-    protected String ruleIdRef;
+   @XmlAttribute(name = "RuleIdRef", required = true)
+   protected String ruleIdRef;
 
-    /**
-     * Gets the value of the ruleIdRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRuleIdRef() {
-        return ruleIdRef;
-    }
+   /**
+    * Gets the value of the ruleIdRef property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getRuleIdRef()
+   {
+      return ruleIdRef;
+   }
 
-    /**
-     * Sets the value of the ruleIdRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRuleIdRef(String value) {
-        this.ruleIdRef = value;
-    }
+   /**
+    * Sets the value of the ruleIdRef property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setRuleIdRef(String value)
+   {
+      this.ruleIdRef = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/RuleType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for RuleType complex type.
  * 
@@ -39,142 +37,154 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "RuleType", propOrder = {
-    "description",
-    "target",
-    "condition"
-})
-public class RuleType {
+ at XmlType(name = "RuleType", propOrder =
+{"description", "target", "condition"})
+public class RuleType
+{
 
-    @XmlElement(name = "Description")
-    protected String description;
-    @XmlElement(name = "Target")
-    protected TargetType target;
-    @XmlElement(name = "Condition")
-    protected ConditionType condition;
-    @XmlAttribute(name = "RuleId", required = true)
-    protected String ruleId;
-    @XmlAttribute(name = "Effect", required = true)
-    protected EffectType effect;
+   @XmlElement(name = "Description")
+   protected String description;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+   @XmlElement(name = "Target")
+   protected TargetType target;
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+   @XmlElement(name = "Condition")
+   protected ConditionType condition;
 
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TargetType }
-     *     
-     */
-    public TargetType getTarget() {
-        return target;
-    }
+   @XmlAttribute(name = "RuleId", required = true)
+   protected String ruleId;
 
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TargetType }
-     *     
-     */
-    public void setTarget(TargetType value) {
-        this.target = value;
-    }
+   @XmlAttribute(name = "Effect", required = true)
+   protected EffectType effect;
 
-    /**
-     * Gets the value of the condition property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ConditionType }
-     *     
-     */
-    public ConditionType getCondition() {
-        return condition;
-    }
+   /**
+    * Gets the value of the description property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getDescription()
+   {
+      return description;
+   }
 
-    /**
-     * Sets the value of the condition property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ConditionType }
-     *     
-     */
-    public void setCondition(ConditionType value) {
-        this.condition = value;
-    }
+   /**
+    * Sets the value of the description property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setDescription(String value)
+   {
+      this.description = value;
+   }
 
-    /**
-     * Gets the value of the ruleId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRuleId() {
-        return ruleId;
-    }
+   /**
+    * Gets the value of the target property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link TargetType }
+    *     
+    */
+   public TargetType getTarget()
+   {
+      return target;
+   }
 
-    /**
-     * Sets the value of the ruleId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRuleId(String value) {
-        this.ruleId = value;
-    }
+   /**
+    * Sets the value of the target property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link TargetType }
+    *     
+    */
+   public void setTarget(TargetType value)
+   {
+      this.target = value;
+   }
 
-    /**
-     * Gets the value of the effect property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EffectType }
-     *     
-     */
-    public EffectType getEffect() {
-        return effect;
-    }
+   /**
+    * Gets the value of the condition property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ConditionType }
+    *     
+    */
+   public ConditionType getCondition()
+   {
+      return condition;
+   }
 
-    /**
-     * Sets the value of the effect property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EffectType }
-     *     
-     */
-    public void setEffect(EffectType value) {
-        this.effect = value;
-    }
+   /**
+    * Sets the value of the condition property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ConditionType }
+    *     
+    */
+   public void setCondition(ConditionType value)
+   {
+      this.condition = value;
+   }
 
+   /**
+    * Gets the value of the ruleId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getRuleId()
+   {
+      return ruleId;
+   }
+
+   /**
+    * Sets the value of the ruleId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setRuleId(String value)
+   {
+      this.ruleId = value;
+   }
+
+   /**
+    * Gets the value of the effect property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link EffectType }
+    *     
+    */
+   public EffectType getEffect()
+   {
+      return effect;
+   }
+
+   /**
+    * Sets the value of the effect property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link EffectType }
+    *     
+    */
+   public void setEffect(EffectType value)
+   {
+      this.effect = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectAttributeDesignatorType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectAttributeDesignatorType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectAttributeDesignatorType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for SubjectAttributeDesignatorType complex type.
  * 
@@ -34,40 +32,44 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SubjectAttributeDesignatorType")
-public class SubjectAttributeDesignatorType
-    extends AttributeDesignatorType
+public class SubjectAttributeDesignatorType extends AttributeDesignatorType
 {
 
-    @XmlAttribute(name = "SubjectCategory")
-    @XmlSchemaType(name = "anyURI")
-    protected String subjectCategory;
+   @XmlAttribute(name = "SubjectCategory")
+   @XmlSchemaType(name = "anyURI")
+   protected String subjectCategory;
 
-    /**
-     * Gets the value of the subjectCategory property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSubjectCategory() {
-        if (subjectCategory == null) {
-            return "urn:oasis:names:tc:xacml:1.0:subject-category:access-subject";
-        } else {
-            return subjectCategory;
-        }
-    }
+   /**
+    * Gets the value of the subjectCategory property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getSubjectCategory()
+   {
+      if (subjectCategory == null)
+      {
+         return "urn:oasis:names:tc:xacml:1.0:subject-category:access-subject";
+      }
+      else
+      {
+         return subjectCategory;
+      }
+   }
 
-    /**
-     * Sets the value of the subjectCategory property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSubjectCategory(String value) {
-        this.subjectCategory = value;
-    }
+   /**
+    * Sets the value of the subjectCategory property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setSubjectCategory(String value)
+   {
+      this.subjectCategory = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectMatchType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectMatchType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectMatchType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for SubjectMatchType complex type.
  * 
@@ -41,117 +39,126 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SubjectMatchType", propOrder = {
-    "attributeValue",
-    "subjectAttributeDesignator",
-    "attributeSelector"
-})
-public class SubjectMatchType {
+ at XmlType(name = "SubjectMatchType", propOrder =
+{"attributeValue", "subjectAttributeDesignator", "attributeSelector"})
+public class SubjectMatchType
+{
 
-    @XmlElement(name = "AttributeValue", required = true)
-    protected AttributeValueType attributeValue;
-    @XmlElement(name = "SubjectAttributeDesignator")
-    protected SubjectAttributeDesignatorType subjectAttributeDesignator;
-    @XmlElement(name = "AttributeSelector")
-    protected AttributeSelectorType attributeSelector;
-    @XmlAttribute(name = "MatchId", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String matchId;
+   @XmlElement(name = "AttributeValue", required = true)
+   protected AttributeValueType attributeValue;
 
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public AttributeValueType getAttributeValue() {
-        return attributeValue;
-    }
+   @XmlElement(name = "SubjectAttributeDesignator")
+   protected SubjectAttributeDesignatorType subjectAttributeDesignator;
 
-    /**
-     * Sets the value of the attributeValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeValueType }
-     *     
-     */
-    public void setAttributeValue(AttributeValueType value) {
-        this.attributeValue = value;
-    }
+   @XmlElement(name = "AttributeSelector")
+   protected AttributeSelectorType attributeSelector;
 
-    /**
-     * Gets the value of the subjectAttributeDesignator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SubjectAttributeDesignatorType }
-     *     
-     */
-    public SubjectAttributeDesignatorType getSubjectAttributeDesignator() {
-        return subjectAttributeDesignator;
-    }
+   @XmlAttribute(name = "MatchId", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String matchId;
 
-    /**
-     * Sets the value of the subjectAttributeDesignator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SubjectAttributeDesignatorType }
-     *     
-     */
-    public void setSubjectAttributeDesignator(SubjectAttributeDesignatorType value) {
-        this.subjectAttributeDesignator = value;
-    }
+   /**
+    * Gets the value of the attributeValue property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public AttributeValueType getAttributeValue()
+   {
+      return attributeValue;
+   }
 
-    /**
-     * Gets the value of the attributeSelector property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public AttributeSelectorType getAttributeSelector() {
-        return attributeSelector;
-    }
+   /**
+    * Sets the value of the attributeValue property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeValueType }
+    *     
+    */
+   public void setAttributeValue(AttributeValueType value)
+   {
+      this.attributeValue = value;
+   }
 
-    /**
-     * Sets the value of the attributeSelector property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttributeSelectorType }
-     *     
-     */
-    public void setAttributeSelector(AttributeSelectorType value) {
-        this.attributeSelector = value;
-    }
+   /**
+    * Gets the value of the subjectAttributeDesignator property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link SubjectAttributeDesignatorType }
+    *     
+    */
+   public SubjectAttributeDesignatorType getSubjectAttributeDesignator()
+   {
+      return subjectAttributeDesignator;
+   }
 
-    /**
-     * Gets the value of the matchId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMatchId() {
-        return matchId;
-    }
+   /**
+    * Sets the value of the subjectAttributeDesignator property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link SubjectAttributeDesignatorType }
+    *     
+    */
+   public void setSubjectAttributeDesignator(SubjectAttributeDesignatorType value)
+   {
+      this.subjectAttributeDesignator = value;
+   }
 
-    /**
-     * Sets the value of the matchId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMatchId(String value) {
-        this.matchId = value;
-    }
+   /**
+    * Gets the value of the attributeSelector property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public AttributeSelectorType getAttributeSelector()
+   {
+      return attributeSelector;
+   }
 
+   /**
+    * Sets the value of the attributeSelector property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link AttributeSelectorType }
+    *     
+    */
+   public void setAttributeSelector(AttributeSelectorType value)
+   {
+      this.attributeSelector = value;
+   }
+
+   /**
+    * Gets the value of the matchId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getMatchId()
+   {
+      return matchId;
+   }
+
+   /**
+    * Sets the value of the matchId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setMatchId(String value)
+   {
+      this.matchId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for SubjectType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SubjectType", propOrder = {
-    "subjectMatch"
-})
-public class SubjectType {
+ at XmlType(name = "SubjectType", propOrder =
+{"subjectMatch"})
+public class SubjectType
+{
 
-    @XmlElement(name = "SubjectMatch", required = true)
-    protected List<SubjectMatchType> subjectMatch;
+   @XmlElement(name = "SubjectMatch", required = true)
+   protected List<SubjectMatchType> subjectMatch;
 
-    /**
-     * Gets the value of the subjectMatch property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the subjectMatch property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSubjectMatch().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SubjectMatchType }
-     * 
-     * 
-     */
-    public List<SubjectMatchType> getSubjectMatch() {
-        if (subjectMatch == null) {
-            subjectMatch = new ArrayList<SubjectMatchType>();
-        }
-        return this.subjectMatch;
-    }
+   /**
+    * Gets the value of the subjectMatch property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the subjectMatch property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getSubjectMatch().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link SubjectMatchType }
+    * 
+    * 
+    */
+   public List<SubjectMatchType> getSubjectMatch()
+   {
+      if (subjectMatch == null)
+      {
+         subjectMatch = new ArrayList<SubjectMatchType>();
+      }
+      return this.subjectMatch;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/SubjectsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for SubjectsType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SubjectsType", propOrder = {
-    "subject"
-})
-public class SubjectsType {
+ at XmlType(name = "SubjectsType", propOrder =
+{"subject"})
+public class SubjectsType
+{
 
-    @XmlElement(name = "Subject", required = true)
-    protected List<SubjectType> subject;
+   @XmlElement(name = "Subject", required = true)
+   protected List<SubjectType> subject;
 
-    /**
-     * Gets the value of the subject property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the subject property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSubject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SubjectType }
-     * 
-     * 
-     */
-    public List<SubjectType> getSubject() {
-        if (subject == null) {
-            subject = new ArrayList<SubjectType>();
-        }
-        return this.subject;
-    }
+   /**
+    * Gets the value of the subject property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the subject property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getSubject().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link SubjectType }
+    * 
+    * 
+    */
+   public List<SubjectType> getSubject()
+   {
+      if (subject == null)
+      {
+         subject = new ArrayList<SubjectType>();
+      }
+      return this.subject;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/TargetType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/TargetType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/TargetType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for TargetType complex type.
  * 
@@ -37,117 +35,125 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TargetType", propOrder = {
-    "subjects",
-    "resources",
-    "actions",
-    "environments"
-})
-public class TargetType {
+ at XmlType(name = "TargetType", propOrder =
+{"subjects", "resources", "actions", "environments"})
+public class TargetType
+{
 
-    @XmlElement(name = "Subjects")
-    protected SubjectsType subjects;
-    @XmlElement(name = "Resources")
-    protected ResourcesType resources;
-    @XmlElement(name = "Actions")
-    protected ActionsType actions;
-    @XmlElement(name = "Environments")
-    protected EnvironmentsType environments;
+   @XmlElement(name = "Subjects")
+   protected SubjectsType subjects;
 
-    /**
-     * Gets the value of the subjects property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SubjectsType }
-     *     
-     */
-    public SubjectsType getSubjects() {
-        return subjects;
-    }
+   @XmlElement(name = "Resources")
+   protected ResourcesType resources;
 
-    /**
-     * Sets the value of the subjects property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SubjectsType }
-     *     
-     */
-    public void setSubjects(SubjectsType value) {
-        this.subjects = value;
-    }
+   @XmlElement(name = "Actions")
+   protected ActionsType actions;
 
-    /**
-     * Gets the value of the resources property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ResourcesType }
-     *     
-     */
-    public ResourcesType getResources() {
-        return resources;
-    }
+   @XmlElement(name = "Environments")
+   protected EnvironmentsType environments;
 
-    /**
-     * Sets the value of the resources property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ResourcesType }
-     *     
-     */
-    public void setResources(ResourcesType value) {
-        this.resources = value;
-    }
+   /**
+    * Gets the value of the subjects property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link SubjectsType }
+    *     
+    */
+   public SubjectsType getSubjects()
+   {
+      return subjects;
+   }
 
-    /**
-     * Gets the value of the actions property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActionsType }
-     *     
-     */
-    public ActionsType getActions() {
-        return actions;
-    }
+   /**
+    * Sets the value of the subjects property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link SubjectsType }
+    *     
+    */
+   public void setSubjects(SubjectsType value)
+   {
+      this.subjects = value;
+   }
 
-    /**
-     * Sets the value of the actions property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActionsType }
-     *     
-     */
-    public void setActions(ActionsType value) {
-        this.actions = value;
-    }
+   /**
+    * Gets the value of the resources property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ResourcesType }
+    *     
+    */
+   public ResourcesType getResources()
+   {
+      return resources;
+   }
 
-    /**
-     * Gets the value of the environments property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnvironmentsType }
-     *     
-     */
-    public EnvironmentsType getEnvironments() {
-        return environments;
-    }
+   /**
+    * Sets the value of the resources property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ResourcesType }
+    *     
+    */
+   public void setResources(ResourcesType value)
+   {
+      this.resources = value;
+   }
 
-    /**
-     * Sets the value of the environments property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnvironmentsType }
-     *     
-     */
-    public void setEnvironments(EnvironmentsType value) {
-        this.environments = value;
-    }
+   /**
+    * Gets the value of the actions property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link ActionsType }
+    *     
+    */
+   public ActionsType getActions()
+   {
+      return actions;
+   }
 
+   /**
+    * Sets the value of the actions property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link ActionsType }
+    *     
+    */
+   public void setActions(ActionsType value)
+   {
+      this.actions = value;
+   }
+
+   /**
+    * Gets the value of the environments property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link EnvironmentsType }
+    *     
+    */
+   public EnvironmentsType getEnvironments()
+   {
+      return environments;
+   }
+
+   /**
+    * Sets the value of the environments property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link EnvironmentsType }
+    *     
+    */
+   public void setEnvironments(EnvironmentsType value)
+   {
+      this.environments = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableDefinitionType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableDefinitionType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableDefinitionType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.JAXBElement;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for VariableDefinitionType complex type.
  * 
@@ -37,80 +35,85 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "VariableDefinitionType", propOrder = {
-    "expression"
-})
-public class VariableDefinitionType {
+ at XmlType(name = "VariableDefinitionType", propOrder =
+{"expression"})
+public class VariableDefinitionType
+{
 
-    @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
-    protected JAXBElement<?> expression;
-    @XmlAttribute(name = "VariableId", required = true)
-    protected String variableId;
+   @XmlElementRef(name = "Expression", namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", type = JAXBElement.class)
+   protected JAXBElement<?> expression;
 
-    /**
-     * Gets the value of the expression property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
-     *     
-     */
-    public JAXBElement<?> getExpression() {
-        return expression;
-    }
+   @XmlAttribute(name = "VariableId", required = true)
+   protected String variableId;
 
-    /**
-     * Sets the value of the expression property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
-     *     
-     */
-    public void setExpression(JAXBElement<?> value) {
-        this.expression = ((JAXBElement<?> ) value);
-    }
+   /**
+    * Gets the value of the expression property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
+    *     
+    */
+   public JAXBElement<?> getExpression()
+   {
+      return expression;
+   }
 
-    /**
-     * Gets the value of the variableId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVariableId() {
-        return variableId;
-    }
+   /**
+    * Sets the value of the expression property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeSelectorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link VariableReferenceType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ExpressionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeValueType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link ApplyType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link AttributeDesignatorType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link FunctionType }{@code >}
+    *     {@link JAXBElement }{@code <}{@link SubjectAttributeDesignatorType }{@code >}
+    *     
+    */
+   public void setExpression(JAXBElement<?> value)
+   {
+      this.expression = ((JAXBElement<?>) value);
+   }
 
-    /**
-     * Sets the value of the variableId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVariableId(String value) {
-        this.variableId = value;
-    }
+   /**
+    * Gets the value of the variableId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getVariableId()
+   {
+      return variableId;
+   }
 
+   /**
+    * Sets the value of the variableId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setVariableId(String value)
+   {
+      this.variableId = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableReferenceType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableReferenceType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/VariableReferenceType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.19 at 04:54:59 PM CDT 
 //
 
-
 package org.jboss.security.xacml.core.model.policy;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for VariableReferenceType complex type.
  * 
@@ -33,35 +31,36 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VariableReferenceType")
-public class VariableReferenceType
-    extends ExpressionType
+public class VariableReferenceType extends ExpressionType
 {
 
-    @XmlAttribute(name = "VariableId", required = true)
-    protected String variableId;
+   @XmlAttribute(name = "VariableId", required = true)
+   protected String variableId;
 
-    /**
-     * Gets the value of the variableId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getVariableId() {
-        return variableId;
-    }
+   /**
+    * Gets the value of the variableId property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getVariableId()
+   {
+      return variableId;
+   }
 
-    /**
-     * Sets the value of the variableId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setVariableId(String value) {
-        this.variableId = value;
-    }
+   /**
+    * Sets the value of the variableId property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setVariableId(String value)
+   {
+      this.variableId = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/package-info.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/package-info.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/model/policy/package-info.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:xacml:2.0:policy:schema:os", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jboss.security.xacml.core.model.policy;
+

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/PolicyFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/PolicyFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/PolicyFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -24,7 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.lang.reflect.Constructor; 
+import java.lang.reflect.Constructor;
 
 import javax.xml.bind.JAXB;
 import javax.xml.bind.JAXBElement;
@@ -34,8 +34,7 @@
 import org.jboss.security.xacml.core.SecurityActions;
 import org.jboss.security.xacml.core.model.policy.ObjectFactory;
 import org.jboss.security.xacml.core.model.policy.PolicyType;
-import org.jboss.security.xacml.interfaces.XACMLPolicy; 
- 
+import org.jboss.security.xacml.interfaces.XACMLPolicy;
 
 //$Id$
 
@@ -47,85 +46,68 @@
  *  @version $Revision$
  */
 public class PolicyFactory
-{ 
+{
    public static Class<?> constructingClass = JBossXACMLPolicy.class;
-   
+
    public static void setConstructingClass(Class<?> clazz)
    {
-     if(XACMLPolicy.class.isAssignableFrom(clazz) == false)
-        throw new RuntimeException("clazz is not of type XACMLPolicy");
-     constructingClass = clazz;
+      if (XACMLPolicy.class.isAssignableFrom(clazz) == false)
+         throw new RuntimeException("clazz is not of type XACMLPolicy");
+      constructingClass = clazz;
    }
-   
+
    public static void setConstructingClass(String fqn)
    {
-      ClassLoader tcl = SecurityActions.getContextClassLoader(); 
+      ClassLoader tcl = SecurityActions.getContextClassLoader();
       try
       {
-         setConstructingClass(tcl.loadClass(fqn)); 
+         setConstructingClass(tcl.loadClass(fqn));
       }
       catch (Exception e)
       {
          throw new RuntimeException(e);
       }
    }
-   
-   
-   public static XACMLPolicy createPolicySet(InputStream policySetFile)
-   throws Exception
-   { 
-      return (XACMLPolicy) getCtr().newInstance(new Object[]{policySetFile, 
-                                                             XACMLPolicy.POLICYSET});
+
+   public static XACMLPolicy createPolicySet(InputStream policySetFile) throws Exception
+   {
+      return (XACMLPolicy) getCtr().newInstance(new Object[]
+      {policySetFile, XACMLPolicy.POLICYSET});
    }
-   
-   public static XACMLPolicy createPolicySet(InputStream policySetFile,
-         JBossPolicyFinder theFinder)
-   throws Exception
-   { 
-      return (XACMLPolicy) getCtrWithFinder().newInstance(new Object[]{policySetFile, 
-                                                             XACMLPolicy.POLICYSET,
-                                                             theFinder});
+
+   public static XACMLPolicy createPolicySet(InputStream policySetFile, JBossPolicyFinder theFinder) throws Exception
+   {
+      return (XACMLPolicy) getCtrWithFinder().newInstance(new Object[]
+      {policySetFile, XACMLPolicy.POLICYSET, theFinder});
    }
-   
-   public static XACMLPolicy createPolicy(InputStream policyFile)
-   throws Exception
-   { 
+
+   public static XACMLPolicy createPolicy(InputStream policyFile) throws Exception
+   {
       return (XACMLPolicy) getCtr().newInstance(new Object[]
-                                                  {
-                                                     policyFile, 
-                                                     XACMLPolicy.POLICY
-                                                  }
-                                           );
+      {policyFile, XACMLPolicy.POLICY});
    }
-   
-   public static XACMLPolicy createPolicy(PolicyType policyFile)
-   throws Exception
-   { 
+
+   public static XACMLPolicy createPolicy(PolicyType policyFile) throws Exception
+   {
       JAXBElement<PolicyType> jaxbPolicy = new ObjectFactory().createPolicy(policyFile);
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       JAXB.marshal(jaxbPolicy, baos);
       ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray());
       return (XACMLPolicy) getCtr().newInstance(new Object[]
-                                                  { bis, 
-                                                     XACMLPolicy.POLICY
-                                                  }
-                                           );
+      {bis, XACMLPolicy.POLICY});
    }
-   
+
    @SuppressWarnings("unchecked")
-   private static Constructor<XACMLPolicy> getCtr() throws  Exception 
+   private static Constructor<XACMLPolicy> getCtr() throws Exception
    {
-      return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[] {
-                                                          InputStream.class, 
-                                                          Integer.TYPE });
+      return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[]
+      {InputStream.class, Integer.TYPE});
    }
-   
+
    @SuppressWarnings("unchecked")
-   private static Constructor<XACMLPolicy> getCtrWithFinder() throws  Exception 
+   private static Constructor<XACMLPolicy> getCtrWithFinder() throws Exception
    {
-      return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[] {
-                                                          InputStream.class, 
-                                                          Integer.TYPE ,
-                                                          JBossPolicyFinder.class});
+      return (Constructor<XACMLPolicy>) constructingClass.getConstructor(new Class[]
+      {InputStream.class, Integer.TYPE, JBossPolicyFinder.class});
    }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/RequestResponseContextFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/RequestResponseContextFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/factories/RequestResponseContextFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -35,7 +35,7 @@
  *  @version $Revision$
  */
 public class RequestResponseContextFactory
-{ 
+{
    /**
     * Create a bare RequestContext object
     * @see RequestContext#setRequest(org.jboss.security.xacml.core.model.context.RequestType)
@@ -45,7 +45,7 @@
    {
       return new JBossRequestContext();
    }
-   
+
    /**
     * Create a ResponseContext object
     * @return a ResponseContext object
@@ -53,5 +53,5 @@
    public static ResponseContext createResponseContext()
    {
       return new JBossResponseContext();
-   }  
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ContextMapOp.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ContextMapOp.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ContextMapOp.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -38,8 +38,8 @@
     * @param key Key
     * @return object from the map
     */
-   <T> T get(String key);  
-   
+   <T> T get(String key);
+
    /**
     * Set an object on the map
     * @param <T>

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyDecisionPoint.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyDecisionPoint.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyDecisionPoint.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -31,7 +31,7 @@
  *  @since  Jul 5, 2007 
  *  @version $Revision$
  */
-public interface PolicyDecisionPoint 
+public interface PolicyDecisionPoint
 {
    /**
     * Set a set of Policy/PolicySet instances on the PDP
@@ -40,7 +40,7 @@
     * @param policies  a Set of Policy/PolicySet instances
     */
    void setPolicies(Set<XACMLPolicy> policies);
-   
+
    /**
     * Set a set of policy locators.
     * - This method is primarily used when the policy/policyset
@@ -49,8 +49,8 @@
     * objects in the locators via their setPolicies method
     * @param locators a set of PolicyLocator instances
     */
-   void setLocators(Set<PolicyLocator> locators); 
-   
+   void setLocators(Set<PolicyLocator> locators);
+
    /**
     * Method to evaluate a XACML Request
     * @param request The RequestContext that contains the XACML Request

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyLocator.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/PolicyLocator.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -40,8 +40,8 @@
     * Set a list of options on the locator
     * @param options
     */
-   void setOptions(List<Option> options); 
-   
+   void setOptions(List<Option> options);
+
    /**
     * Set of policies that this locator is able to return
     * @param policies

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/RequestContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/RequestContext.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/RequestContext.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -37,32 +37,32 @@
  *  @version $Revision$
  */
 public interface RequestContext extends ContextMapOp
-{ 
+{
    /**
     * Place the Request instance on the context
     * @param requestType An instance of RequestType 
     * @throws IOException
     */
    void setRequest(RequestType requestType) throws IOException;
-   
+
    /**
     * Read the Request from a stream
     * @param is InputStream for the request 
     * @throws IOException
     */
    void readRequest(InputStream is) throws IOException;
-   
+
    /**
     * Read a preparsed Node
     * @param node
     * @throws IOException
     */
    void readRequest(Node node) throws IOException;
-   
+
    /**
     * Marshall the request context onto an Output Stream
     * @param os OutputStream (System.out, ByteArrayOutputStream etc)
     * @throws IOException
     */
    void marshall(OutputStream os) throws IOException;
-} 
\ No newline at end of file
+}
\ No newline at end of file

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ResponseContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ResponseContext.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/ResponseContext.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -35,21 +35,21 @@
  *  @version $Revision$
  */
 public interface ResponseContext extends ContextMapOp
-{ 
+{
    /**
     * Decision based on the evaluation of policies
     * @return int value {@see XACMLConstants#DECISION_PERMIT}
     * @see XACMLConstants
     */
    int getDecision();
-   
+
    /**
     * Read a preparsed Node
     * @param node
     * @throws IOException
     */
    void readResponse(Node node) throws IOException;
-   
+
    /**
     * Marshall the response context onto an Output Stream
     * @param os OutputStream (System.out, ByteArrayOutputStream etc)

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLConstants.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLConstants.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLConstants.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -32,317 +32,541 @@
 public interface XACMLConstants
 {
    String XACML = "xacml";
+
    String PREFIX_XACML_CONTEXT = "xacml-context";
-   
+
    String UNDERLYING_POLICY = "underlying_policy";
+
    String POLICY_FINDER = "policy_finder";
+
    String POLICY_FINDER_MODULE = "policy_finder_module";
+
    String REQUEST_CTX = "request_ctx";
+
    String RESPONSE_CTX = "response_ctx";
-   
+
    String CONTEXT_SCHEMA = "urn:oasis:names:tc:xacml:2.0:context:schema:os";
+
    String POLICY_SCHEMA = "urn:oasis:names:tc:xacml:2.0:policy:schema:os";
-   
+
    //Action Attribute IDs
    String ATTRIBUTEID_ACTION_ID = "urn:oasis:names:tc:xacml:1.0:action:action-id";
+
    String ATTRIBUTEID_IMPLIED_ACTION = "urn:oasis:names:tc:xacml:1.0:action:implied-action";
+
    String ATTRIBUTEID_ACTION_NAMESPACE = "urn:oasis:names:tc:xacml:1.0:action:action-namespace";
-   
+
    //Environment Attribute IDs
    String ATTRIBUTEID_CURRENT_TIME = "urn:oasis:names:tc:xacml:1.0:environment:current-time";
+
    String ATTRIBUTEID_CURRENT_DATE = "urn:oasis:names:tc:xacml:1.0:environment:current-date";
+
    String ATTRIBUTEID_CURRENT_DATE_TIME = "urn:oasis:names:tc:xacml:1.0:environment:current-dateTime";
-   
+
    //Resource Attribute IDs
    String ATTRIBUTEID_RESOURCE_ID = "urn:oasis:names:tc:xacml:1.0:resource:resource-id";
+
    String ATTRIBUTEID_TARGET_NAMESPACE = "urn:oasis:names:tc:xacml:2.0:resource:target-namespace";
+
    String ATTRIBUTEID_RESOURCE_LOCATION = "urn:oasis:names:tc:xacml:1.0:resource:resource-location";
+
    String ATTRIBUTEID_XPATH = "urn:oasis:names:tc:xacml:1.0:resource:xpath";
+
    String ATTRIBUTEID_SIMPLE_FILE_NAME = "urn:oasis:names:tc:xacml:1.0:resource:simple-file-name";
-   
+
    //Subject Attribute IDs
    String ATTRIBUTEID_SUBJECT_ID = "urn:oasis:names:tc:xacml:1.0:subject:subject-id";
+
    String ATTRIBUTEID_ROLE = "urn:oasis:names:tc:xacml:2.0:subject:role";
+
    String ATTRIBUTEID_DNS_NAME = "urn:oasis:names:tc:xacml:1.0:subject:authn-locality:dns-name";
+
    String ATTRIBUTEID_IP_ADDRESS = "urn:oasis:names:tc:xacml:1.0:subject:authn-locality:ip-address";
+
    String ATTRIBUTEID_AUTHENTICATION_METHOD = "urn:oasis:names:tc:xacml:1.0:subject:authentication-method";
+
    String ATTRIBUTEID_AUTHENTICATION_TIME = "urn:oasis:names:tc:xacml:1.0:subject:authentication-time";
+
    String ATTRIBUTEID_KEY_INFO = "urn:oasis:names:tc:xacml:1.0:subject:key-info";
+
    String ATTRIBUTEID_REQUEST_TIME = "urn:oasis:names:tc:xacml:1.0:subject:request-time";
+
    String ATTRIBUTEID_NAME_FORMAT = "urn:oasis:names:tc:xacml:1.0:subject:name-format";
+
    String ATTRIBUTEID_SESSION_START_TIME = "urn:oasis:names:tc:xacml:1.0:subject:session-start-time";
+
    String ATTRIBUTEID_SUBJECT_ID_QUALIFIER = "urn:oasis:names:tc:xacml:1.0:subject:subject-id-qualifier";
+
    String ATTRIBUTEID_ACCESS_SUBJECT = "urn:oasis:names:tc:xacml:1.0:subject-category:access-subject";
+
    String ATTRIBUTEID_CODEBASE = "urn:oasis:names:tc:xacml:1.0:subject-category:codebase";
+
    String ATTRIBUTEID_INTERMEDIARY_SUBJECT = "urn:oasis:names:tc:xacml:1.0:subject-category:intermediary-subject";
+
    String ATTRIBUTEID_RECIPIENT_SUBJECT = "urn:oasis:names:tc:xacml:1.0:subject-category:recipient-subject";
+
    String ATTRIBUTEID_REQUESTING_MACHINE = "urn:oasis:names:tc:xacml:1.0:subject-category:requesting-machine";
-   
+
    //Begin Functions
    //Equal
    String FUNCTION_ANYURI_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:anyURI-equal";
+
    String FUNCTION_BASEBINARY_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-equal";
+
    String FUNCTION_BOOLEAN_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:boolean-equal";
+
    String FUNCTION_DATE_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:date-equal";
+
    String FUNCTION_DATETIME_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:dateTime-equal";
+
    String FUNCTION_DAYTIMEDURATION_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-equal";
+
    String FUNCTION_DOUBLE_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:double-equal";
+
    String FUNCTION_HEXBINARY_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-equal";
+
    String FUNCTION_INTEGER_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:integer-equal";
+
    String FUNCTION_RFC822NAME_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-equal";
+
    String FUNCTION_STRING_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:string-equal";
+
    String FUNCTION_TIME_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:time-equal";
+
    String FUNCTION_X500NAME_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:x500Name-equal";
+
    String FUNCTION_YEARMONTHDURATION_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-equal";
-   
+
    //Abs
    String FUNCTION_DOUBLE_ABS = "urn:oasis:names:tc:xacml:1.0:function:double-abs";
+
    String FUNCTION_INTEGER_ABS = "urn:oasis:names:tc:xacml:1.0:function:integer-abs";
-   
+
    //Add
    String FUNCTION_DOUBLE_ADD = "urn:oasis:names:tc:xacml:1.0:function:double-add";
+
    String FUNCTION_INTEGER_ADD = "urn:oasis:names:tc:xacml:1.0:function:integer-add";
-   
+
    //Bag
    String FUNCTION_ANYURI_BAG = "urn:oasis:names:tc:xacml:1.0:function:anyURI-bag";
+
    String FUNCTION_ANYURI_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:anyURI-bag-size";
+
    String FUNCTION_ANYURI_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:anyURI-is-in";
+
    String FUNCTION_ANYURI_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:anyURI-one-and-only";
+
    String FUNCTION_BASE64BINARY_BAG = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-bag";
+
    String FUNCTION_BASE64BINARY_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-bag-size";
+
    String FUNCTION_BASE64BINARY_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-is-in";
+
    String FUNCTION_BASE64BINARY_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-one-and-only";
+
    String FUNCTION_BOOLEAN_BAG = "urn:oasis:names:tc:xacml:1.0:function:boolean-bag";
+
    String FUNCTION_BOOLEAN_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:boolean-bag-size";
+
    String FUNCTION_BOOLEAN_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:boolean-is-in";
+
    String FUNCTION_BOOLEAN_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:boolean-one-and-only";
+
    String FUNCTION_DATE_BAG = "urn:oasis:names:tc:xacml:1.0:function:date-bag";
+
    String FUNCTION_DATE_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:date-bag-size";
+
    String FUNCTION_DATE_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:date-is-in";
+
    String FUNCTION_DATE_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:date-one-and-only";
+
    String FUNCTION_DATETIME_BAG = "urn:oasis:names:tc:xacml:1.0:function:dateTime-bag";
+
    String FUNCTION_DATETIME_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:dateTime-bag-size";
+
    String FUNCTION_DATETIME_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:dateTime-is-in";
+
    String FUNCTION_DATETIME_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:dateTime-one-and-only";
+
    String FUNCTION_DAYTIMEDURATION_BAG = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-bag";
+
    String FUNCTION_DAYTIMEDURATION_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-bag-size";
+
    String FUNCTION_DAYTIMEDURATION_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-is-in";
+
    String FUNCTION_DAYTIMEDURATION_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-one-and-only";
+
    String FUNCTION_DOUBLE_BAG = "urn:oasis:names:tc:xacml:1.0:function:double-bag";
+
    String FUNCTION_DOUBLE_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:double-bag-size";
+
    String FUNCTION_DOUBLE_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:double-is-in";
+
    String FUNCTION_DOUBLE_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:double-one-and-only";
+
    String FUNCTION_HEXBINARY_BAG = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-bag";
+
    String FUNCTION_HEXBINARY_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-bag-size";
+
    String FUNCTION_HEXBINARY_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-is-in";
+
    String FUNCTION_HEXBINARY_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-one-and-only";
+
    String FUNCTION_INTEGER_BAG = "urn:oasis:names:tc:xacml:1.0:function:integer-bag";
+
    String FUNCTION_INTEGER_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:integer-bag-size";
+
    String FUNCTION_INTEGER_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:integer-is-in";
+
    String FUNCTION_INTEGER_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:integer-one-and-only";
+
    String FUNCTION_RFC822NAME_BAG = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-bag";
+
    String FUNCTION_RFC822NAME_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-bag-size";
+
    String FUNCTION_RFC822NAME_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-is-in";
+
    String FUNCTION_RFC822NAME_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-one-and-only";
+
    String FUNCTION_STRING_BAG = "urn:oasis:names:tc:xacml:1.0:function:string-bag";
+
    String FUNCTION_STRING_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:string-bag-size";
+
    String FUNCTION_STRING_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:string-is-in";
+
    String FUNCTION_STRING_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:string-one-and-only";
+
    String FUNCTION_TIME_BAG = "urn:oasis:names:tc:xacml:1.0:function:time-bag";
+
    String FUNCTION_TIME_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:time-bag-size";
+
    String FUNCTION_TIME_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:time-is-in";
+
    String FUNCTION_TIME_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:time-one-and-only";
+
    String FUNCTION_X500NAME_BAG = "urn:oasis:names:tc:xacml:1.0:function:x500Name-bag";
+
    String FUNCTION_X500NAME_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:x500Name-bag-size";
+
    String FUNCTION_X500NAME_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:x500Name-is-in";
+
    String FUNCTION_X500NAME_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:x500Name-one-and-only";
+
    String FUNCTION_YEARMONTHDURATION_BAG = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-bag";
+
    String FUNCTION_YEARMONTHDURATION_BAG_SIZE = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-bag-size";
+
    String FUNCTION_YEARMONTHDURATION_IS_IN = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-is-in";
+
    String FUNCTION_YEARMONTHDURATION_ONE_AND_ONLY = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-one-and-only";
-   
+
    //Comparison
    String FUNCTION_DATE_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:date-greater-than";
+
    String FUNCTION_DATE_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:date-greater-than-or-equal";
+
    String FUNCTION_DATE_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:date-less-than";
+
    String FUNCTION_DATE_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:date-less-than-or-equal";
+
    String FUNCTION_DATETIME_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:dateTime-greater-than";
+
    String FUNCTION_DATETIME_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:dateTime-greater-than-or-equal";
+
    String FUNCTION_DATETIME_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:dateTime-less-than";
+
    String FUNCTION_DATETIME_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:dateTime-less-than-or-equal";
+
    String FUNCTION_DOUBLE_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:double-greater-than";
+
    String FUNCTION_DOUBLE_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:double-greater-than-or-equal";
+
    String FUNCTION_DOUBLE_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:double-less-than";
+
    String FUNCTION_DOUBLE_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:double-less-than-or-equal";
+
    String FUNCTION_INTEGER_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:integer-greater-than";
+
    String FUNCTION_INTEGER_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:integer-greater-than-or-equal";
+
    String FUNCTION_INTEGER_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:integer-less-than";
+
    String FUNCTION_INTEGER_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:integer-less-than-or-equal";
+
    String FUNCTION_STRING_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:string-greater-than";
+
    String FUNCTION_STRING_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:string-greater-than-or-equal";
+
    String FUNCTION_STRING_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:string-less-than";
+
    String FUNCTION_STRING_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:string-less-than-or-equal";
+
    String FUNCTION_TIME_IN_RANGE = "urn:oasis:names:tc:xacml:2.0:function:time-in-range";
+
    String FUNCTION_TIME_GREATER_THAN = "urn:oasis:names:tc:xacml:1.0:function:time-greater-than";
+
    String FUNCTION_TIME_GREATER_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:time-greater-than-or-equal";
+
    String FUNCTION_TIME_LESS_THAN = "urn:oasis:names:tc:xacml:1.0:function:time-less-than";
+
    String FUNCTION_TIME_LESS_THAN_OR_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:time-less-than-or-equal";
-   
+
    //Date Math
    String FUNCTION_DATE_ADD_YEARMONTHDURATION = "urn:oasis:names:tc:xacml:1.0:function:date-add-yearMonthDuration";
+
    String FUNCTION_DATE_SUBTRACT_YEARMONTHDURATION = "urn:oasis:names:tc:xacml:1.0:function:date-subtract-yearMonthDuration";
+
    String FUNCTION_DATETIME_ADD_DAYTIMEDURATION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-add-dayTimeDuration";
+
    String FUNCTION_DATETIME_SUBTRACT_DAYTIMEDURATION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-subtract-dayTimeDuration";
+
    String FUNCTION_DATETIME_ADD_YEARMONTHDURATION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-add-yearMonthDuration";
+
    String FUNCTION_DATETIME_SUBTRACT_YEARMONTHDURATION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-subtract-yearMonthDuration";
-   
+
    //Divide
    String FUNCTION_DOUBLE_DIVIDE = "urn:oasis:names:tc:xacml:1.0:function:double-divide";
+
    String FUNCTION_INTEGER_DIVIDE = "urn:oasis:names:tc:xacml:1.0:function:integer-divide";
-   
+
    //Floor
    String FUNCTION_FLOOR = "urn:oasis:names:tc:xacml:1.0:function:floor";
-   
+
    //High Order
    String FUNCTION_ALL_OF = "urn:oasis:names:tc:xacml:1.0:function:all-of";
+
    String FUNCTION_ALL_OF_ALL = "urn:oasis:names:tc:xacml:1.0:function:all-of-all";
+
    String FUNCTION_ALL_ANY = "urn:oasis:names:tc:xacml:1.0:function:all-any";
+
    String FUNCTION_ANY_OF = "urn:oasis:names:tc:xacml:1.0:function:any-of";
+
    String FUNCTION_ANY_OF_ALL = "urn:oasis:names:tc:xacml:1.0:function:any-of-all";
+
    String FUNCTION_ANY_OF_ANY = "urn:oasis:names:tc:xacml:1.0:function:any-of-any";
-   
+
    //Logical
    String FUNCTION_AND = "urn:oasis:names:tc:xacml:1.0:function:and";
+
    String FUNCTION_OR = "urn:oasis:names:tc:xacml:1.0:function:or";
+
    String FUNCTION_NOT = "urn:oasis:names:tc:xacml:1.0:function:not";
-   
+
    //Map
    String FUNCTION_MAP = "urn:oasis:names:tc:xacml:1.0:function:map";
-   
+
    //Match
    String FUNCTION_REGEXP_URI_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-uri-match";
+
    String FUNCTION_REGEXP_DNSNAME_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-dnsName-match";
+
    String FUNCTION_REGEXP_IPADDRESS_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-ipAddress-match";
+
    String FUNCTION_RFC822NAME_MATCH = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-match";
+
    String FUNCTION_REGEXP_RFC822NAME_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-rfc822Name-match";
+
    String FUNCTION_REGEXP_STRING_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-string-match";
+
    String FUNCTION_X500NAME_MATCH = "urn:oasis:names:tc:xacml:1.0:function:x500Name-match";
+
    String FUNCTION_REGEXP_X500NAME_MATCH = "urn:oasis:names:tc:xacml:1.0:function:regexp-x500Name-match";
-   
+
    //Mod
    String FUNCTION_INTEGER_MOD = "urn:oasis:names:tc:xacml:1.0:function:integer-mod";
-   
+
    //Multiply
    String FUNCTION_DOUBLE_MULTIPLY = "urn:oasis:names:tc:xacml:1.0:function:double-multiply";
+
    String FUNCTION_INTEGER_MULTIPLY = "urn:oasis:names:tc:xacml:1.0:function:integer-multiply";
-   
+
    //Nof
    String FUNCTION_N_OF = "urn:oasis:names:tc:xacml:1.0:function:n-of";
-   
+
    //Numeric Convert
    String FUNCTION_DOUBLE_TO_INTEGER = "urn:oasis:names:tc:xacml:1.0:function:double-to-integer";
+
    String FUNCTION_INTEGER_TO_DOUBLE = "urn:oasis:names:tc:xacml:1.0:function:integer-to-double";
-   
+
    //Round
    String FUNCTION_ROUND = "urn:oasis:names:tc:xacml:1.0:function:round";
-   
+
    //Set
    String FUNCTION_ANYURI_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:anyURI-at-least-one-member-of";
+
    String FUNCTION_ANYURI_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:anyURI-intersection";
+
    String FUNCTION_ANYURI_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:anyURI-set-equals";
+
    String FUNCTION_ANYURI_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:anyURI-subset";
+
    String FUNCTION_ANYURI_UNION = "urn:oasis:names:tc:xacml:1.0:function:anyURI-union";
+
    String FUNCTION_BASE64BINARY_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-at-least-one-member-of";
+
    String FUNCTION_BASE64BINARY_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-intersection";
+
    String FUNCTION_BASE64BINARY_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-set-equals";
+
    String FUNCTION_BASE64BINARY_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-subset";
+
    String FUNCTION_BASE64BINARY_UNION = "urn:oasis:names:tc:xacml:1.0:function:base64Binary-union";
+
    String FUNCTION_BOOLEAN_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:boolean-at-least-one-member-of";
+
    String FUNCTION_BOOLEAN_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:boolean-intersection";
+
    String FUNCTION_BOOLEAN_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:boolean-set-equals";
+
    String FUNCTION_BOOLEAN_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:boolean-subset";
+
    String FUNCTION_BOOLEAN_UNION = "urn:oasis:names:tc:xacml:1.0:function:boolean-union";
+
    String FUNCTION_DATE_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:date-at-least-one-member-of";
+
    String FUNCTION_DATE_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:date-intersection";
+
    String FUNCTION_DATE_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:date-set-equals";
+
    String FUNCTION_DATE_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:date-subset";
+
    String FUNCTION_DATE_UNION = "urn:oasis:names:tc:xacml:1.0:function:date-union";
+
    String FUNCTION_DATETIME_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:dateTime-at-least-one-member-of";
+
    String FUNCTION_DATETIME_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-intersection";
+
    String FUNCTION_DATETIME_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:dateTime-set-equals";
+
    String FUNCTION_DATETIME_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:dateTime-subset";
+
    String FUNCTION_DATETIME_UNION = "urn:oasis:names:tc:xacml:1.0:function:dateTime-union";
+
    String FUNCTION_DAYTIMEDURATION_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-at-least-one-member-of";
+
    String FUNCTION_DAYTIMEDURATION_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-intersection";
+
    String FUNCTION_DAYTIMEDURATION_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-set-equals";
+
    String FUNCTION_DAYTIMEDURATION_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-subset";
+
    String FUNCTION_DAYTIMEDURATION_UNION = "urn:oasis:names:tc:xacml:1.0:function:dayTimeDuration-union";
+
    String FUNCTION_DOUBLE_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:double-at-least-one-member-of";
+
    String FUNCTION_DOUBLE_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:double-intersection";
+
    String FUNCTION_DOUBLE_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:double-set-equals";
+
    String FUNCTION_DOUBLE_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:double-subset";
+
    String FUNCTION_DOUBLE_UNION = "urn:oasis:names:tc:xacml:1.0:function:double-union";
+
    String FUNCTION_HEXBINARY_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-at-least-one-member-of";
+
    String FUNCTION_HEXBINARY_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-intersection";
+
    String FUNCTION_HEXBINARY_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-set-equals";
+
    String FUNCTION_HEXBINARY_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-subset";
+
    String FUNCTION_HEXBINARY_UNION = "urn:oasis:names:tc:xacml:1.0:function:hexBinary-union";
+
    String FUNCTION_INTEGER_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:integer-at-least-one-member-of";
+
    String FUNCTION_INTEGER_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:integer-intersection";
+
    String FUNCTION_INTEGER_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:integer-set-equals";
+
    String FUNCTION_INTEGER_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:integer-subset";
+
    String FUNCTION_INTEGER_UNION = "urn:oasis:names:tc:xacml:1.0:function:integer-union";
+
    String FUNCTION_RFC822NAME_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-at-least-one-member-of";
+
    String FUNCTION_RFC822NAME_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-intersection";
+
    String FUNCTION_RFC822NAME_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-set-equals";
+
    String FUNCTION_RFC822NAME_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-subset";
+
    String FUNCTION_RFC822NAME_UNION = "urn:oasis:names:tc:xacml:1.0:function:rfc822Name-union";
+
    String FUNCTION_STRING_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:string-at-least-one-member-of";
+
    String FUNCTION_STRING_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:string-intersection";
+
    String FUNCTION_STRING_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:string-set-equals";
+
    String FUNCTION_STRING_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:string-subset";
+
    String FUNCTION_STRING_UNION = "urn:oasis:names:tc:xacml:1.0:function:string-union";
+
    String FUNCTION_TIME_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:time-at-least-one-member-of";
+
    String FUNCTION_TIME_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:time-intersection";
+
    String FUNCTION_TIME_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:time-set-equals";
+
    String FUNCTION_TIME_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:time-subset";
+
    String FUNCTION_TIME_UNION = "urn:oasis:names:tc:xacml:1.0:function:time-union";
+
    String FUNCTION_X500NAME_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:x500Name-at-least-one-member-of";
+
    String FUNCTION_X500NAME_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:x500Name-intersection";
+
    String FUNCTION_X500NAME_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:x500Name-set-equals";
+
    String FUNCTION_X500NAME_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:x500Name-subset";
+
    String FUNCTION_X500NAME_UNION = "urn:oasis:names:tc:xacml:1.0:function:x500Name-union";
+
    String FUNCTION_YEARMONTHDURATION_AT_LEAST_ONE_MEMBER_OF = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-at-least-one-member-of";
+
    String FUNCTION_YEARMONTHDURATION_INTERSECTION = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-intersection";
+
    String FUNCTION_YEARMONTHDURATION_SET_EQUALS = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-set-equals";
+
    String FUNCTION_YEARMONTHDURATION_SUBSET = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-subset";
+
    String FUNCTION_YEARMONTHDURATION_UNION = "urn:oasis:names:tc:xacml:1.0:function:yearMonthDuration-union";
-   
+
    //String Concatenate
    String FUNCTION_STRING_CONCATENATE = "urn:oasis:names:tc:xacml:2.0:function:string-concatenate";
+
    String FUNCTION_URL_STRING_CONCATENATE = "urn:oasis:names:tc:xacml:2.0:function:url-string-concatenate";
-   
+
    //String Normalize
    String FUNCTION_STRING_NORMALIZE_SPACE = "urn:oasis:names:tc:xacml:1.0:function:string-normalize-space";
+
    String FUNCTION_STRING_NORMALIZE_TO_LOWER_CASE = "urn:oasis:names:tc:xacml:1.0:function:string-normalize-to-lower-case";
-   
+
    //Subtract
    String FUNCTION_DOUBLE_SUBTRACT = "urn:oasis:names:tc:xacml:1.0:function:double-subtract";
+
    String FUNCTION_INTEGER_SUBTRACT = "urn:oasis:names:tc:xacml:1.0:function:integer-subtract";
-   
+
    //XPath
    String FUNCTION_XPATH_NODE_COUNT = "urn:oasis:names:tc:xacml:1.0:function:xpath-node-count";
+
    String FUNCTION_XPATH_NODE_EQUAL = "urn:oasis:names:tc:xacml:1.0:function:xpath-node-equal";
+
    String FUNCTION_XPATH_NODE_MATCH = "urn:oasis:names:tc:xacml:1.0:function:xpath-node-match";
+
    //End Functions
-   
+
    //Rule Combining Algorithms
    String RULE_COMBINING_FIRST_APPLICABLE = "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable";
+
    String RULE_COMBINING_DENY_OVERRIDES = "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides";
+
    String RULE_COMBINING_ORDERED_DENY_OVERRIDES = "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:ordered-deny-overrides";
+
    String RULE_COMBINING_PERMIT_OVERRIDES = "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:permit-overrides";
+
    String RULE_COMBINING_ORDERED_PERMIT_OVERRIDES = "urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:ordered-permit-overrides";
-   
+
    /**
     * The decision to permit the request
     */

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLPolicy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLPolicy.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/interfaces/XACMLPolicy.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -32,33 +32,33 @@
  *  @version $Revision$
  */
 public interface XACMLPolicy extends ContextMapOp
-{ 
+{
    /**
     * Type identifying a PolicySet
     */
    int POLICYSET = 0;
-   
+
    /**
     * Type identifying a Policy
     */
    int POLICY = 1;
-   
+
    /**
     * Return a type (PolicySet or Policy)
     * @return int value representing type
     */
    int getType();
-   
+
    /**
     * A PolicySet can contain policies within.
     * Setter to set the policies inside a policyset
     * @param policies a list of policies
     */
    void setEnclosingPolicies(List<XACMLPolicy> policies);
-   
+
    /**
     * Return the enclosing policies for a PolicySet
     * @return a list of policies
     */
-   List<XACMLPolicy> getEnclosingPolicies(); 
+   List<XACMLPolicy> getEnclosingPolicies();
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import java.util.ArrayList;
@@ -16,7 +15,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for LocatorType complex type.
  * 
@@ -38,67 +36,72 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "LocatorType", propOrder = {
-    "option"
-})
-public class LocatorType {
+ at XmlType(name = "LocatorType", propOrder =
+{"option"})
+public class LocatorType
+{
 
-    @XmlElement(name = "Option")
-    protected List<Option> option;
-    @XmlAttribute(name = "Name")
-    protected String name;
+   @XmlElement(name = "Option")
+   protected List<Option> option;
 
-    /**
-     * Gets the value of the option property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the option property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOption().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Option }
-     * 
-     * 
-     */
-    public List<Option> getOption() {
-        if (option == null) {
-            option = new ArrayList<Option>();
-        }
-        return this.option;
-    }
+   @XmlAttribute(name = "Name")
+   protected String name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+   /**
+    * Gets the value of the option property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the option property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getOption().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link Option }
+    * 
+    * 
+    */
+   public List<Option> getOption()
+   {
+      if (option == null)
+      {
+         option = new ArrayList<Option>();
+      }
+      return this.option;
+   }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+   /**
+    * Gets the value of the name property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getName()
+   {
+      return name;
+   }
 
+   /**
+    * Sets the value of the name property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setName(String value)
+   {
+      this.name = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorsType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorsType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/LocatorsType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for LocatorsType complex type.
  * 
@@ -36,41 +34,43 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "LocatorsType", propOrder = {
-    "locator"
-})
-public class LocatorsType {
+ at XmlType(name = "LocatorsType", propOrder =
+{"locator"})
+public class LocatorsType
+{
 
-    @XmlElement(name = "Locator")
-    protected List<LocatorType> locator;
+   @XmlElement(name = "Locator")
+   protected List<LocatorType> locator;
 
-    /**
-     * Gets the value of the locator property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the locator property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLocator().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link LocatorType }
-     * 
-     * 
-     */
-    public List<LocatorType> getLocator() {
-        if (locator == null) {
-            locator = new ArrayList<LocatorType>();
-        }
-        return this.locator;
-    }
+   /**
+    * Gets the value of the locator property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the locator property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getLocator().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link LocatorType }
+    * 
+    * 
+    */
+   public List<LocatorType> getLocator()
+   {
+      if (locator == null)
+      {
+         locator = new ArrayList<LocatorType>();
+      }
+      return this.locator;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/ObjectFactory.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/ObjectFactory.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/ObjectFactory.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import javax.xml.bind.JAXBElement;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
@@ -29,100 +27,114 @@
  * 
  */
 @XmlRegistry
-public class ObjectFactory {
+public class ObjectFactory
+{
 
-    private final static QName _Policies_QNAME = new QName("urn:jboss:xacml:2.0", "Policies");
-    private final static QName _Locators_QNAME = new QName("urn:jboss:xacml:2.0", "Locators");
-    private final static QName _Jbosspdp_QNAME = new QName("urn:jboss:xacml:2.0", "jbosspdp");
+   private final static QName _Policies_QNAME = new QName("urn:jboss:xacml:2.0", "Policies");
 
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.security.xacml.jaxb
-     * 
-     */
-    public ObjectFactory() {
-    }
+   private final static QName _Locators_QNAME = new QName("urn:jboss:xacml:2.0", "Locators");
 
-    /**
-     * Create an instance of {@link PDP }
-     * 
-     */
-    public PDP createPDP() {
-        return new PDP();
-    }
+   private final static QName _Jbosspdp_QNAME = new QName("urn:jboss:xacml:2.0", "jbosspdp");
 
-    /**
-     * Create an instance of {@link LocatorType }
-     * 
-     */
-    public LocatorType createLocatorType() {
-        return new LocatorType();
-    }
+   /**
+    * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.security.xacml.jaxb
+    * 
+    */
+   public ObjectFactory()
+   {
+   }
 
-    /**
-     * Create an instance of {@link PolicyType }
-     * 
-     */
-    public PolicyType createPolicyType() {
-        return new PolicyType();
-    }
+   /**
+    * Create an instance of {@link PDP }
+    * 
+    */
+   public PDP createPDP()
+   {
+      return new PDP();
+   }
 
-    /**
-     * Create an instance of {@link PolicySetType }
-     * 
-     */
-    public PolicySetType createPolicySetType() {
-        return new PolicySetType();
-    }
+   /**
+    * Create an instance of {@link LocatorType }
+    * 
+    */
+   public LocatorType createLocatorType()
+   {
+      return new LocatorType();
+   }
 
-    /**
-     * Create an instance of {@link Option }
-     * 
-     */
-    public Option createOption() {
-        return new Option();
-    }
+   /**
+    * Create an instance of {@link PolicyType }
+    * 
+    */
+   public PolicyType createPolicyType()
+   {
+      return new PolicyType();
+   }
 
-    /**
-     * Create an instance of {@link PoliciesType }
-     * 
-     */
-    public PoliciesType createPoliciesType() {
-        return new PoliciesType();
-    }
+   /**
+    * Create an instance of {@link PolicySetType }
+    * 
+    */
+   public PolicySetType createPolicySetType()
+   {
+      return new PolicySetType();
+   }
 
-    /**
-     * Create an instance of {@link LocatorsType }
-     * 
-     */
-    public LocatorsType createLocatorsType() {
-        return new LocatorsType();
-    }
+   /**
+    * Create an instance of {@link Option }
+    * 
+    */
+   public Option createOption()
+   {
+      return new Option();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PoliciesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "Policies")
-    public JAXBElement<PoliciesType> createPolicies(PoliciesType value) {
-        return new JAXBElement<PoliciesType>(_Policies_QNAME, PoliciesType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link PoliciesType }
+    * 
+    */
+   public PoliciesType createPoliciesType()
+   {
+      return new PoliciesType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LocatorsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "Locators")
-    public JAXBElement<LocatorsType> createLocators(LocatorsType value) {
-        return new JAXBElement<LocatorsType>(_Locators_QNAME, LocatorsType.class, null, value);
-    }
+   /**
+    * Create an instance of {@link LocatorsType }
+    * 
+    */
+   public LocatorsType createLocatorsType()
+   {
+      return new LocatorsType();
+   }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PDP }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "jbosspdp")
-    public JAXBElement<PDP> createJbosspdp(PDP value) {
-        return new JAXBElement<PDP>(_Jbosspdp_QNAME, PDP.class, null, value);
-    }
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PoliciesType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "Policies")
+   public JAXBElement<PoliciesType> createPolicies(PoliciesType value)
+   {
+      return new JAXBElement<PoliciesType>(_Policies_QNAME, PoliciesType.class, null, value);
+   }
 
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link LocatorsType }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "Locators")
+   public JAXBElement<LocatorsType> createLocators(LocatorsType value)
+   {
+      return new JAXBElement<LocatorsType>(_Locators_QNAME, LocatorsType.class, null, value);
+   }
+
+   /**
+    * Create an instance of {@link JAXBElement }{@code <}{@link PDP }{@code >}}
+    * 
+    */
+   @XmlElementDecl(namespace = "urn:jboss:xacml:2.0", name = "jbosspdp")
+   public JAXBElement<PDP> createJbosspdp(PDP value)
+   {
+      return new JAXBElement<PDP>(_Jbosspdp_QNAME, PDP.class, null, value);
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/Option.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/Option.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/Option.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import java.util.ArrayList;
@@ -18,7 +17,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for anonymous complex type.
  * 
@@ -40,70 +38,75 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "", propOrder = {
-    "content"
-})
+ at XmlType(name = "", propOrder =
+{"content"})
 @XmlRootElement(name = "Option")
-public class Option {
+public class Option
+{
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Name")
-    protected String name;
+   @XmlMixed
+   @XmlAnyElement(lax = true)
+   protected List<Object> content;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+   @XmlAttribute(name = "Name")
+   protected String name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+   /**
+    * Gets the value of the content property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the content property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getContent().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link String }
+    * {@link Object }
+    * 
+    * 
+    */
+   public List<Object> getContent()
+   {
+      if (content == null)
+      {
+         content = new ArrayList<Object>();
+      }
+      return this.content;
+   }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+   /**
+    * Gets the value of the name property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getName()
+   {
+      return name;
+   }
 
+   /**
+    * Sets the value of the name property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setName(String value)
+   {
+      this.name = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PDP.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PDP.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,7 +12,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PDP complex type.
  * 
@@ -35,63 +33,67 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PDP", propOrder = {
-    "policies",
-    "locators"
-})
-public class PDP {
+ at XmlType(name = "PDP", propOrder =
+{"policies", "locators"})
+public class PDP
+{
 
-    @XmlElement(name = "Policies", required = true)
-    protected PoliciesType policies;
-    @XmlElement(name = "Locators", required = true)
-    protected LocatorsType locators;
+   @XmlElement(name = "Policies", required = true)
+   protected PoliciesType policies;
 
-    /**
-     * Gets the value of the policies property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PoliciesType }
-     *     
-     */
-    public PoliciesType getPolicies() {
-        return policies;
-    }
+   @XmlElement(name = "Locators", required = true)
+   protected LocatorsType locators;
 
-    /**
-     * Sets the value of the policies property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PoliciesType }
-     *     
-     */
-    public void setPolicies(PoliciesType value) {
-        this.policies = value;
-    }
+   /**
+    * Gets the value of the policies property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link PoliciesType }
+    *     
+    */
+   public PoliciesType getPolicies()
+   {
+      return policies;
+   }
 
-    /**
-     * Gets the value of the locators property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LocatorsType }
-     *     
-     */
-    public LocatorsType getLocators() {
-        return locators;
-    }
+   /**
+    * Sets the value of the policies property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link PoliciesType }
+    *     
+    */
+   public void setPolicies(PoliciesType value)
+   {
+      this.policies = value;
+   }
 
-    /**
-     * Sets the value of the locators property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LocatorsType }
-     *     
-     */
-    public void setLocators(LocatorsType value) {
-        this.locators = value;
-    }
+   /**
+    * Gets the value of the locators property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link LocatorsType }
+    *     
+    */
+   public LocatorsType getLocators()
+   {
+      return locators;
+   }
 
+   /**
+    * Sets the value of the locators property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link LocatorsType }
+    *     
+    */
+   public void setLocators(LocatorsType value)
+   {
+      this.locators = value;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PoliciesType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PoliciesType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PoliciesType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import java.util.ArrayList;
@@ -15,7 +14,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PoliciesType complex type.
  * 
@@ -37,73 +35,77 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PoliciesType", propOrder = {
-    "policySet",
-    "policy"
-})
-public class PoliciesType {
+ at XmlType(name = "PoliciesType", propOrder =
+{"policySet", "policy"})
+public class PoliciesType
+{
 
-    @XmlElement(name = "PolicySet")
-    protected List<PolicySetType> policySet;
-    @XmlElement(name = "Policy")
-    protected List<PolicyType> policy;
+   @XmlElement(name = "PolicySet")
+   protected List<PolicySetType> policySet;
 
-    /**
-     * Gets the value of the policySet property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the policySet property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPolicySet().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicySetType }
-     * 
-     * 
-     */
-    public List<PolicySetType> getPolicySet() {
-        if (policySet == null) {
-            policySet = new ArrayList<PolicySetType>();
-        }
-        return this.policySet;
-    }
+   @XmlElement(name = "Policy")
+   protected List<PolicyType> policy;
 
-    /**
-     * Gets the value of the policy property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the policy property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPolicy().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicyType }
-     * 
-     * 
-     */
-    public List<PolicyType> getPolicy() {
-        if (policy == null) {
-            policy = new ArrayList<PolicyType>();
-        }
-        return this.policy;
-    }
+   /**
+    * Gets the value of the policySet property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the policySet property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getPolicySet().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link PolicySetType }
+    * 
+    * 
+    */
+   public List<PolicySetType> getPolicySet()
+   {
+      if (policySet == null)
+      {
+         policySet = new ArrayList<PolicySetType>();
+      }
+      return this.policySet;
+   }
 
+   /**
+    * Gets the value of the policy property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the policy property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getPolicy().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link PolicyType }
+    * 
+    * 
+    */
+   public List<PolicyType> getPolicy()
+   {
+      if (policy == null)
+      {
+         policy = new ArrayList<PolicyType>();
+      }
+      return this.policy;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicySetType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicySetType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicySetType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2008.03.19 at 05:35:22 PM BRT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import java.util.ArrayList;
@@ -16,7 +15,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicySetType complex type.
  * 
@@ -39,101 +37,107 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PolicySetType", propOrder = {
-    "location",
-    "policy",
-    "policySet"
-})
-public class PolicySetType {
+ at XmlType(name = "PolicySetType", propOrder =
+{"location", "policy", "policySet"})
+public class PolicySetType
+{
 
-    @XmlElement(name = "Location")
-    @XmlSchemaType(name = "anyURI")
-    protected String location;
-    @XmlElement(name = "Policy")
-    protected List<PolicyType> policy;
-    @XmlElement(name = "PolicySet")
-    protected List<PolicySetType> policySet;
+   @XmlElement(name = "Location")
+   @XmlSchemaType(name = "anyURI")
+   protected String location;
 
-    /**
-     * Gets the value of the location property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLocation() {
-        return location;
-    }
+   @XmlElement(name = "Policy")
+   protected List<PolicyType> policy;
 
-    /**
-     * Sets the value of the location property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLocation(String value) {
-        this.location = value;
-    }
+   @XmlElement(name = "PolicySet")
+   protected List<PolicySetType> policySet;
 
-    /**
-     * Gets the value of the policy property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the policy property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPolicy().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicyType }
-     * 
-     * 
-     */
-    public List<PolicyType> getPolicy() {
-        if (policy == null) {
-            policy = new ArrayList<PolicyType>();
-        }
-        return this.policy;
-    }
+   /**
+    * Gets the value of the location property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getLocation()
+   {
+      return location;
+   }
 
-    /**
-     * Gets the value of the policySet property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the policySet property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPolicySet().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link PolicySetType }
-     * 
-     * 
-     */
-    public List<PolicySetType> getPolicySet() {
-        if (policySet == null) {
-            policySet = new ArrayList<PolicySetType>();
-        }
-        return this.policySet;
-    }
+   /**
+    * Sets the value of the location property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setLocation(String value)
+   {
+      this.location = value;
+   }
 
+   /**
+    * Gets the value of the policy property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the policy property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getPolicy().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link PolicyType }
+    * 
+    * 
+    */
+   public List<PolicyType> getPolicy()
+   {
+      if (policy == null)
+      {
+         policy = new ArrayList<PolicyType>();
+      }
+      return this.policy;
+   }
+
+   /**
+    * Gets the value of the policySet property.
+    * 
+    * <p>
+    * This accessor method returns a reference to the live list,
+    * not a snapshot. Therefore any modification you make to the
+    * returned list will be present inside the JAXB object.
+    * This is why there is not a <CODE>set</CODE> method for the policySet property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getPolicySet().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link PolicySetType }
+    * 
+    * 
+    */
+   public List<PolicySetType> getPolicySet()
+   {
+      if (policySet == null)
+      {
+         policySet = new ArrayList<PolicySetType>();
+      }
+      return this.policySet;
+   }
+
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicyType.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicyType.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/PolicyType.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -5,7 +5,6 @@
 // Generated on: 2007.07.06 at 03:19:27 PM CDT 
 //
 
-
 package org.jboss.security.xacml.jaxb;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,7 +13,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * <p>Java class for PolicyType complex type.
  * 
@@ -35,37 +33,39 @@
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PolicyType", propOrder = {
-    "location"
-})
-public class PolicyType {
+ at XmlType(name = "PolicyType", propOrder =
+{"location"})
+public class PolicyType
+{
 
-    @XmlElement(name = "Location", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String location;
+   @XmlElement(name = "Location", required = true)
+   @XmlSchemaType(name = "anyURI")
+   protected String location;
 
-    /**
-     * Gets the value of the location property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLocation() {
-        return location;
-    }
+   /**
+    * Gets the value of the location property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getLocation()
+   {
+      return location;
+   }
 
-    /**
-     * Sets the value of the location property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLocation(String value) {
-        this.location = value;
-    }
+   /**
+    * Sets the value of the location property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setLocation(String value)
+   {
+      this.location = value;
+   }
 
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/package-info.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/package-info.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/jaxb/package-info.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:xacml:2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jboss.security.xacml.jaxb;
+

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/AbstractJBossPolicyLocator.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -41,15 +41,17 @@
  */
 public abstract class AbstractJBossPolicyLocator implements PolicyLocator, ContextMapOp
 {
-   protected List<Option> options = null; 
-   protected Map<String,Object> map = new HashMap<String,Object>(); 
+   protected List<Option> options = null;
+
+   protected Map<String, Object> map = new HashMap<String, Object>();
+
    protected Set<XACMLPolicy> policies;
-   
+
    /**
     * @see PolicyLocator#setOptions(List)
     */
    public void setOptions(List<Option> theoptions)
-   { 
+   {
       this.options = theoptions;
    }
 
@@ -58,8 +60,8 @@
     */
    @SuppressWarnings("unchecked")
    public <T> T get(String key)
-   { 
-      return (T)map.get(key);
+   {
+      return (T) map.get(key);
    }
 
    /**
@@ -67,11 +69,11 @@
     */
    public <T> void set(String key, T obj)
    {
-      map.put(key, obj); 
+      map.put(key, obj);
    }
 
    /**
     * @see PolicyLocator#setPolicies(Set)
     */
-   public abstract void setPolicies(Set<XACMLPolicy> policies); 
+   public abstract void setPolicies(Set<XACMLPolicy> policies);
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicyLocator.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -30,7 +30,7 @@
 import org.jboss.security.xacml.interfaces.XACMLPolicy;
 import org.jboss.security.xacml.sunxacml.Policy;
 import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
-  
+
 /**
  *  Policy Locator for plain XACML Policy instances
  *  @author Anil.Saldhana at redhat.com
@@ -38,24 +38,24 @@
  *  @version $Revision$
  */
 public class JBossPolicyLocator extends AbstractJBossPolicyLocator
-{ 
-   private List<PolicyFinderModule> pfml = new ArrayList<PolicyFinderModule>(); 
-   
+{
+   private List<PolicyFinderModule> pfml = new ArrayList<PolicyFinderModule>();
+
    public JBossPolicyLocator()
-   {   
+   {
    }
-   
+
    public JBossPolicyLocator(Set<XACMLPolicy> policies)
    {
       setPolicies(policies);
-   } 
+   }
 
    @Override
    public void setPolicies(Set<XACMLPolicy> policies)
-   { 
-      for(XACMLPolicy xp:policies)
+   {
+      for (XACMLPolicy xp : policies)
       {
-         if(xp.getType() == XACMLPolicy.POLICY)
+         if (xp.getType() == XACMLPolicy.POLICY)
          {
             Policy p = xp.get(XACMLConstants.UNDERLYING_POLICY);
             WrapperPolicyFinderModule wpfm = new WrapperPolicyFinderModule(p);
@@ -63,5 +63,5 @@
          }
       }
       this.map.put(XACMLConstants.POLICY_FINDER_MODULE, pfml);
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/locators/JBossPolicySetLocator.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -1,99 +1,95 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2007, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.security.xacml.locators;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.security.xacml.bridge.PolicySetFinderModule;
-import org.jboss.security.xacml.interfaces.XACMLConstants;
-import org.jboss.security.xacml.interfaces.XACMLPolicy;
-import org.jboss.security.xacml.sunxacml.AbstractPolicy;
-import org.jboss.security.xacml.sunxacml.Policy;
-import org.jboss.security.xacml.sunxacml.PolicySet;
- 
-/**
- *  Locator for a PolicySet
- *  @author Anil.Saldhana at redhat.com
- *  @since  Jul 6, 2007 
- *  @version $Revision$
- */
-public class JBossPolicySetLocator extends AbstractJBossPolicyLocator
-{
-   private List<PolicySetFinderModule> pfml = new ArrayList<PolicySetFinderModule>();
-
-   public JBossPolicySetLocator()
-   {
-   }
-
-   public JBossPolicySetLocator(Set<XACMLPolicy> policies)
-   {
-      setPolicies(policies);
-   }
-
-   @Override
-   public void setPolicies(Set<XACMLPolicy> policies)
-   {
-      for (XACMLPolicy xp : policies)
-      {
-         if (xp.getType() == XACMLPolicy.POLICYSET)
-         {
-            pfml.add(getPopulatedPolicySetFinderModule(xp));
-         }
-      }
-      this.map.put(XACMLConstants.POLICY_FINDER_MODULE, pfml);
-   }
-
-   private PolicySetFinderModule getPopulatedPolicySetFinderModule(XACMLPolicy xpolicy)
-   {
-      PolicySetFinderModule psfm = new PolicySetFinderModule();
-      //Check for enclosed policies
-      List<Policy> sunxacmlPolicies = new ArrayList<Policy>();
-      List<PolicySet> sunxacmlPolicySets = new ArrayList<PolicySet>();
-      this.recursivePopulate(xpolicy, sunxacmlPolicySets, sunxacmlPolicies, psfm);
-
-      psfm.set((PolicySet) xpolicy.get(XACMLConstants.UNDERLYING_POLICY), sunxacmlPolicies, sunxacmlPolicySets);
-
-      //Make this PolicySetFinderModule the module for this policy set
-      xpolicy.set(XACMLConstants.POLICY_FINDER_MODULE, psfm);
-      return psfm;
-   }
-
-   private void recursivePopulate(XACMLPolicy policy, List<PolicySet> policySets, List<Policy> policies,
-         PolicySetFinderModule psfm)
-   {
-      List<XACMLPolicy> policyList = policy.getEnclosingPolicies();
-      for (XACMLPolicy xp : policyList)
-      {
-         AbstractPolicy p = xp.get(XACMLConstants.UNDERLYING_POLICY);
-         if (p instanceof Policy)
-            policies.add((Policy) p);
-         else if (p instanceof PolicySet)
-         {
-            policySets.add((PolicySet) p);
-            this.recursivePopulate(xp, policySets, policies, psfm);
-         }
-      }
-
-   }
-}
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2007, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.security.xacml.locators;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.security.xacml.bridge.PolicySetFinderModule;
+import org.jboss.security.xacml.interfaces.XACMLConstants;
+import org.jboss.security.xacml.interfaces.XACMLPolicy;
+import org.jboss.security.xacml.sunxacml.AbstractPolicy;
+import org.jboss.security.xacml.sunxacml.Policy;
+import org.jboss.security.xacml.sunxacml.PolicySet;
+
+/**
+ *  Locator for a PolicySet
+ *  @author Anil.Saldhana at redhat.com
+ *  @since  Jul 6, 2007 
+ *  @version $Revision$
+ */
+public class JBossPolicySetLocator extends AbstractJBossPolicyLocator
+{
+   private List<PolicySetFinderModule> pfml = new ArrayList<PolicySetFinderModule>();
+
+   public JBossPolicySetLocator()
+   {
+   }
+
+   public JBossPolicySetLocator(Set<XACMLPolicy> policies)
+   {
+      setPolicies(policies);
+   }
+
+   @Override
+   public void setPolicies(Set<XACMLPolicy> policies)
+   {
+      for (XACMLPolicy xp : policies)
+      {
+         if (xp.getType() == XACMLPolicy.POLICYSET)
+         {
+            pfml.add(getPopulatedPolicySetFinderModule(xp));
+         }
+      }
+      this.map.put(XACMLConstants.POLICY_FINDER_MODULE, pfml);
+   }
+
+   private PolicySetFinderModule getPopulatedPolicySetFinderModule(XACMLPolicy xpolicy)
+   {
+      PolicySetFinderModule psfm = new PolicySetFinderModule();
+      //Check for enclosed policies
+      List<AbstractPolicy> sunxacmlPolicies = new ArrayList<AbstractPolicy>();
+      this.recursivePopulate(xpolicy, sunxacmlPolicies, psfm);
+
+      psfm.set((PolicySet) xpolicy.get(XACMLConstants.UNDERLYING_POLICY), sunxacmlPolicies);
+
+      //Make this PolicySetFinderModule the module for this policy set
+      xpolicy.set(XACMLConstants.POLICY_FINDER_MODULE, psfm);
+      return psfm;
+   }
+
+   private void recursivePopulate(XACMLPolicy policy, List<AbstractPolicy> policies, PolicySetFinderModule psfm)
+   {
+      List<XACMLPolicy> policyList = policy.getEnclosingPolicies();
+      for (XACMLPolicy xp : policyList)
+      {
+         AbstractPolicy p = xp.get(XACMLConstants.UNDERLYING_POLICY);
+         policies.add(p);
+         if (p instanceof Policy)
+            System.out.println(p.getId());
+         if (p instanceof PolicySet)
+            this.recursivePopulate(xp, policies, psfm);
+      }
+
+   }
+}

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/util/XACMLPolicyUtil.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/util/XACMLPolicyUtil.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/util/XACMLPolicyUtil.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -35,14 +35,13 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-
 /**
  * Create an XACML Policy Object from the url for the policy xml
  * @author Anil.Saldhana at redhat.com
  *  @since  Jul 6, 2007 
  *  @version $Revision$
  */
-public class XACMLPolicyUtil 
+public class XACMLPolicyUtil
 {
    /**
     * Create a PolicySet
@@ -51,56 +50,55 @@
     * @return
     * @throws Exception
     */
-	public PolicySet createPolicySet(URL location, PolicyFinder finder) throws Exception
-	{
-        return createPolicySet(location.openStream(),  finder); 
-	}
-	
-    /**
-     * Create a policyset
-     * @param is
-     * @param finder
-     * @return
-     * @throws Exception
-     */
-	public PolicySet createPolicySet(InputStream is, PolicyFinder finder) throws Exception  
-	{
-       if(finder == null)
-          throw new IllegalArgumentException("Policy Finder is null");
-		Document doc = getDocument(is);
-		return PolicySet.getInstance(doc.getFirstChild(), finder); 
-	}
+   public PolicySet createPolicySet(URL location, PolicyFinder finder) throws Exception
+   {
+      return createPolicySet(location.openStream(), finder);
+   }
 
-    /**
-     * Create a Policy
-     * @param location Policy File
-     * @return
-     * @throws Exception
-     */
-	public Policy createPolicy(URL location) throws Exception
-	{  
-		return createPolicy(location.openStream());
-	}
+   /**
+    * Create a policyset
+    * @param is
+    * @param finder
+    * @return
+    * @throws Exception
+    */
+   public PolicySet createPolicySet(InputStream is, PolicyFinder finder) throws Exception
+   {
+      if (finder == null)
+         throw new IllegalArgumentException("Policy Finder is null");
+      Document doc = getDocument(is);
+      return PolicySet.getInstance(doc.getFirstChild(), finder);
+   }
 
-    /**
-     * Create a policy
-     * @param is Inputstream of the policy file
-     * @return
-     * @throws Exception
-     */
-	public Policy createPolicy(InputStream is) throws Exception
-	{ 
-		Document doc = getDocument(is);
-		return Policy.getInstance(doc.getFirstChild());
-	}
+   /**
+    * Create a Policy
+    * @param location Policy File
+    * @return
+    * @throws Exception
+    */
+   public Policy createPolicy(URL location) throws Exception
+   {
+      return createPolicy(location.openStream());
+   }
 
-	private Document getDocument(InputStream is)
-	throws ParserConfigurationException, SAXException, IOException 
-	{
-		DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-		docBuilderFactory.setNamespaceAware(true); 
-		DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-		Document doc = docBuilder.parse (is);
-		return doc;
-	}
+   /**
+    * Create a policy
+    * @param is Inputstream of the policy file
+    * @return
+    * @throws Exception
+    */
+   public Policy createPolicy(InputStream is) throws Exception
+   {
+      Document doc = getDocument(is);
+      return Policy.getInstance(doc.getFirstChild());
+   }
+
+   private Document getDocument(InputStream is) throws ParserConfigurationException, SAXException, IOException
+   {
+      DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+      docBuilderFactory.setNamespaceAware(true);
+      DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+      Document doc = docBuilder.parse(is);
+      return doc;
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/HttpRequestUtil.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/HttpRequestUtil.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/HttpRequestUtil.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -41,230 +41,285 @@
  *  @since  Jul 10, 2007 
  *  @version $Revision$
  */
-public class HttpRequestUtil 
+public class HttpRequestUtil
 {
-	public HttpServletRequest createRequest(final Principal gp, final String uri)
-	{
-		return new HttpServletRequest(){
+   public HttpServletRequest createRequest(final Principal gp, final String uri)
+   {
+      return new HttpServletRequest()
+      {
 
-			public String getAuthType() { 
-				return null;
-			}
+         public String getAuthType()
+         {
+            return null;
+         }
 
-			public String getContextPath() { 
-				return null;
-			}
+         public String getContextPath()
+         {
+            return null;
+         }
 
-			public Cookie[] getCookies() { 
-				return null;
-			}
+         public Cookie[] getCookies()
+         {
+            return null;
+         }
 
-			public long getDateHeader(String arg0) { 
-				return 0;
-			}
+         public long getDateHeader(String arg0)
+         {
+            return 0;
+         }
 
-			public String getHeader(String arg0) { 
-				return null;
-			}
+         public String getHeader(String arg0)
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Enumeration getHeaderNames() { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Enumeration getHeaderNames()
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Enumeration getHeaders(String arg0) { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Enumeration getHeaders(String arg0)
+         {
+            return null;
+         }
 
-			public int getIntHeader(String arg0) { 
-				return 0;
-			}
+         public int getIntHeader(String arg0)
+         {
+            return 0;
+         }
 
-			public String getMethod() { 
-				return "GET";
-			}
+         public String getMethod()
+         {
+            return "GET";
+         }
 
-			public String getPathInfo() { 
-				return null;
-			}
+         public String getPathInfo()
+         {
+            return null;
+         }
 
-			public String getPathTranslated() { 
-				return null;
-			}
+         public String getPathTranslated()
+         {
+            return null;
+         }
 
-			public String getQueryString() { 
-				return null;
-			}
+         public String getQueryString()
+         {
+            return null;
+         }
 
-			public String getRemoteUser() { 
-				return null;
-			}
+         public String getRemoteUser()
+         {
+            return null;
+         }
 
-			public String getRequestURI() { 
-				return uri;
-			}
+         public String getRequestURI()
+         {
+            return uri;
+         }
 
-			public StringBuffer getRequestURL() { 
-				return null;
-			}
+         public StringBuffer getRequestURL()
+         {
+            return null;
+         }
 
-			public String getRequestedSessionId() { 
-				return null;
-			}
+         public String getRequestedSessionId()
+         {
+            return null;
+         }
 
-			public String getServletPath() { 
-				return null;
-			}
+         public String getServletPath()
+         {
+            return null;
+         }
 
-			public HttpSession getSession() { 
-				return null;
-			}
+         public HttpSession getSession()
+         {
+            return null;
+         }
 
-			public HttpSession getSession(boolean arg0) { 
-				return null;
-			}
+         public HttpSession getSession(boolean arg0)
+         {
+            return null;
+         }
 
-			public Principal getUserPrincipal() { 
-				return gp;
-			}
+         public Principal getUserPrincipal()
+         {
+            return gp;
+         }
 
-			public boolean isRequestedSessionIdFromCookie() { 
-				return false;
-			}
+         public boolean isRequestedSessionIdFromCookie()
+         {
+            return false;
+         }
 
-			public boolean isRequestedSessionIdFromURL() { 
-				return false;
-			}
+         public boolean isRequestedSessionIdFromURL()
+         {
+            return false;
+         }
 
-			public boolean isRequestedSessionIdFromUrl() { 
-				return false;
-			}
+         public boolean isRequestedSessionIdFromUrl()
+         {
+            return false;
+         }
 
-			public boolean isRequestedSessionIdValid() { 
-				return false;
-			}
+         public boolean isRequestedSessionIdValid()
+         {
+            return false;
+         }
 
-			public boolean isUserInRole(String arg0) { 
-				return false;
-			}
+         public boolean isUserInRole(String arg0)
+         {
+            return false;
+         }
 
-			public Object getAttribute(String arg0) { 
-				return null;
-			}
+         public Object getAttribute(String arg0)
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Enumeration getAttributeNames() { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Enumeration getAttributeNames()
+         {
+            return null;
+         }
 
-			public String getCharacterEncoding() { 
-				return null;
-			}
+         public String getCharacterEncoding()
+         {
+            return null;
+         }
 
-			public int getContentLength() { 
-				return 0;
-			}
+         public int getContentLength()
+         {
+            return 0;
+         }
 
-			public String getContentType() { 
-				return null;
-			}
+         public String getContentType()
+         {
+            return null;
+         }
 
-			public ServletInputStream getInputStream() throws IOException { 
-				return null;
-			}
+         public ServletInputStream getInputStream() throws IOException
+         {
+            return null;
+         }
 
-			public String getLocalAddr() { 
-				return null;
-			}
+         public String getLocalAddr()
+         {
+            return null;
+         }
 
-			public String getLocalName() { 
-				return null;
-			}
+         public String getLocalName()
+         {
+            return null;
+         }
 
-			public int getLocalPort() { 
-				return 0;
-			}
+         public int getLocalPort()
+         {
+            return 0;
+         }
 
-			public Locale getLocale() { 
-				return null;
-			}
+         public Locale getLocale()
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Enumeration getLocales() { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Enumeration getLocales()
+         {
+            return null;
+         }
 
-			public String getParameter(String arg0) { 
-				return null;
-			}
+         public String getParameter(String arg0)
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Map getParameterMap() { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Map getParameterMap()
+         {
+            return null;
+         }
 
-			@SuppressWarnings("unchecked")
-            public Enumeration getParameterNames() { 
-				return null;
-			}
+         @SuppressWarnings("unchecked")
+         public Enumeration getParameterNames()
+         {
+            return null;
+         }
 
-			public String[] getParameterValues(String arg0) { 
-				return null;
-			}
+         public String[] getParameterValues(String arg0)
+         {
+            return null;
+         }
 
-			public String getProtocol() { 
-				return null;
-			}
+         public String getProtocol()
+         {
+            return null;
+         }
 
-			public BufferedReader getReader() throws IOException { 
-				return null;
-			}
+         public BufferedReader getReader() throws IOException
+         {
+            return null;
+         }
 
-			public String getRealPath(String arg0) { 
-				return null;
-			}
+         public String getRealPath(String arg0)
+         {
+            return null;
+         }
 
-			public String getRemoteAddr() { 
-				return null;
-			}
+         public String getRemoteAddr()
+         {
+            return null;
+         }
 
-			public String getRemoteHost() { 
-				return null;
-			}
+         public String getRemoteHost()
+         {
+            return null;
+         }
 
-			public int getRemotePort() { 
-				return 0;
-			}
+         public int getRemotePort()
+         {
+            return 0;
+         }
 
-			public RequestDispatcher getRequestDispatcher(String arg0) { 
-				return null;
-			}
+         public RequestDispatcher getRequestDispatcher(String arg0)
+         {
+            return null;
+         }
 
-			public String getScheme() { 
-				return null;
-			}
+         public String getScheme()
+         {
+            return null;
+         }
 
-			public String getServerName() { 
-				return null;
-			}
+         public String getServerName()
+         {
+            return null;
+         }
 
-			public int getServerPort() { 
-				return 0;
-			}
+         public int getServerPort()
+         {
+            return 0;
+         }
 
-			public boolean isSecure() { 
-				return false;
-			}
+         public boolean isSecure()
+         {
+            return false;
+         }
 
-			public void removeAttribute(String arg0) { 
-			}
+         public void removeAttribute(String arg0)
+         {
+         }
 
-			public void setAttribute(String arg0, Object arg1) { 
-			}
+         public void setAttribute(String arg0, Object arg1)
+         {
+         }
 
-			public void setCharacterEncoding(String arg0)
-					throws UnsupportedEncodingException { 
-			}};
-	}
+         public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
+         {
+         }
+      };
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebLayerUnitTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -46,72 +46,70 @@
 public class WebLayerUnitTestCase extends TestCase
 {
    //Enable for request trace
-   private boolean debug = "true".equals(System.getProperty("debug","false")); 
-   
+   private boolean debug = "true".equals(System.getProperty("debug", "false"));
+
    public void testWebBinding() throws Exception
-   { 
-      PolicyDecisionPoint pdp = getPDP(); 
+   {
+      PolicyDecisionPoint pdp = getPDP();
       assertNotNull("JBossPDP is != null", pdp);
-      
+
       Principal p = new Principal()
-      { 
+      {
          public String getName()
-         { 
+         {
             return "testuser";
-         } 
+         }
       };
 
       //Create Role Group
       Group grp = XACMLTestUtil.getRoleGroup("developer");
-      
+
       String requestURI = "http://test/developer-guide.html";
       HttpRequestUtil util = new HttpRequestUtil();
-      HttpServletRequest req = util.createRequest(p, requestURI); 
-      
+      HttpServletRequest req = util.createRequest(p, requestURI);
+
       //Check PERMIT condition
       WebPEP pep = new WebPEP();
       RequestContext request = pep.createXACMLRequest(req, p, grp);
-      if(debug)
-        request.marshall(System.out);
-      
-      assertEquals("Access Allowed?", XACMLConstants.DECISION_PERMIT,
-            XACMLTestUtil.getDecision(pdp,request)); 
+      if (debug)
+         request.marshall(System.out);
+
+      assertEquals("Access Allowed?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp, request));
    }
-   
+
    public void testNegativeAccessWebBinding() throws Exception
    {
-      PolicyDecisionPoint pdp = getPDP(); 
+      PolicyDecisionPoint pdp = getPDP();
       assertNotNull("JBossPDP is != null", pdp);
       Principal p = new Principal()
-      { 
+      {
          public String getName()
-         { 
+         {
             return "testuser";
-         } 
+         }
       };
 
       //Create Role Group
       Group grp = XACMLTestUtil.getRoleGroup("imposter");
       String requestURI = "http://test/developer-guide.html";
       HttpRequestUtil util = new HttpRequestUtil();
-      HttpServletRequest req = util.createRequest(p, requestURI); 
-      
+      HttpServletRequest req = util.createRequest(p, requestURI);
+
       //Check DENY condition
       WebPEP pep = new WebPEP();
       RequestContext request = pep.createXACMLRequest(req, p, grp);
-      if(debug)
+      if (debug)
          request.marshall(System.out);
-      
-      assertEquals("Access Disallowed?", XACMLConstants.DECISION_DENY,
-            XACMLTestUtil.getDecision(pdp,request));  
-   }  
-   
+
+      assertEquals("Access Disallowed?", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp, request));
+   }
+
    private PolicyDecisionPoint getPDP()
    {
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
       InputStream is = tcl.getResourceAsStream("test/config/webConfig.xml");
       assertNotNull("InputStream != null", is);
-      
-      return new JBossPDP(is);  
-   }  
+
+      return new JBossPDP(is);
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebPEP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebPEP.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/bindings/web/WebPEP.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -38,7 +38,7 @@
 import org.jboss.security.xacml.factories.RequestResponseContextFactory;
 import org.jboss.security.xacml.interfaces.RequestContext;
 import org.jboss.security.xacml.interfaces.XACMLConstants;
- 
+
 //$Id$
 
 /**
@@ -49,50 +49,53 @@
  */
 public class WebPEP
 {
-   
+
    @SuppressWarnings("unchecked")
-   public RequestContext createXACMLRequest(HttpServletRequest request,
-         Principal principal, Group roleGroup) throws Exception
-   {  
-      RequestContext requestCtx = RequestResponseContextFactory.createRequestCtx(); 
-      
+   public RequestContext createXACMLRequest(HttpServletRequest request, Principal principal, Group roleGroup)
+         throws Exception
+   {
+      RequestContext requestCtx = RequestResponseContextFactory.createRequestCtx();
+
       //Create a subject type
-      SubjectType subject = new SubjectType(); 
-      subject.getAttribute().add(RequestAttributeFactory.createStringAttributeType(
-            XACMLConstants.ATTRIBUTEID_SUBJECT_ID, "jboss.org", principal.getName()));
+      SubjectType subject = new SubjectType();
+      subject.getAttribute().add(
+            RequestAttributeFactory.createStringAttributeType(XACMLConstants.ATTRIBUTEID_SUBJECT_ID, "jboss.org",
+                  principal.getName()));
       Enumeration<Principal> roles = (Enumeration<Principal>) roleGroup.members();
-      while(roles.hasMoreElements())
+      while (roles.hasMoreElements())
       {
          Principal rolePrincipal = roles.nextElement();
          AttributeType attSubjectID = RequestAttributeFactory.createStringAttributeType(
-               XACMLConstants.ATTRIBUTEID_ROLE, "jboss.org", rolePrincipal.getName()); 
+               XACMLConstants.ATTRIBUTEID_ROLE, "jboss.org", rolePrincipal.getName());
          subject.getAttribute().add(attSubjectID);
-      } 
-      
+      }
+
       //Create a resource type
       ResourceType resourceType = new ResourceType();
-      resourceType.getAttribute().add(RequestAttributeFactory.createAnyURIAttributeType(
-            XACMLConstants.ATTRIBUTEID_RESOURCE_ID, null, new URI(request.getRequestURI())));
-      
+      resourceType.getAttribute().add(
+            RequestAttributeFactory.createAnyURIAttributeType(XACMLConstants.ATTRIBUTEID_RESOURCE_ID, null, new URI(
+                  request.getRequestURI())));
+
       //Create an action type
       ActionType actionType = new ActionType();
-      actionType.getAttribute().add(RequestAttributeFactory.createStringAttributeType(
-            XACMLConstants.ATTRIBUTEID_ACTION_ID, "jboss.org", "read"));
-      
+      actionType.getAttribute().add(
+            RequestAttributeFactory
+                  .createStringAttributeType(XACMLConstants.ATTRIBUTEID_ACTION_ID, "jboss.org", "read"));
+
       //Create an Environment Type (Optional)
-      EnvironmentType environmentType = new EnvironmentType(); 
-      environmentType.getAttribute().add(RequestAttributeFactory.createDateTimeAttributeType(
-            XACMLConstants.ATTRIBUTEID_CURRENT_TIME, null));
-       
+      EnvironmentType environmentType = new EnvironmentType();
+      environmentType.getAttribute().add(
+            RequestAttributeFactory.createDateTimeAttributeType(XACMLConstants.ATTRIBUTEID_CURRENT_TIME, null));
+
       //Create a Request Type
       RequestType requestType = new RequestType();
       requestType.getSubject().add(subject);
       requestType.getResource().add(resourceType);
       requestType.setAction(actionType);
       requestType.setEnvironment(environmentType);
-      
-      requestCtx.setRequest(requestType); 
-      
+
+      requestCtx.setRequest(requestType);
+
       return requestCtx;
-   }  
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -54,7 +54,7 @@
 {
    public void testBasicPolicySetConfig() throws Exception
    {
-      JAXBContext jc = JAXBContext.newInstance( "org.jboss.security.xacml.jaxb" ); 
+      JAXBContext jc = JAXBContext.newInstance("org.jboss.security.xacml.jaxb");
       assertNotNull("JAXBContext is !null", jc);
       Unmarshaller u = jc.createUnmarshaller();
       //Validate against schema
@@ -63,33 +63,33 @@
       assertNotNull("Schema URL != null", schemaURL);
       SchemaFactory scFact = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
       Schema schema = scFact.newSchema(schemaURL);
-      u.setSchema(schema); 
-      
+      u.setSchema(schema);
+
       URL configFile = tcl.getResource("test/config/basicPolicySetConfig.xml");
       JAXBElement<?> j = (JAXBElement<?>) u.unmarshal(configFile);
-      assertNotNull("JAXBElement is !null", j); 
+      assertNotNull("JAXBElement is !null", j);
       PDP pdp = (PDP) j.getValue();
       assertNotNull("PDP is not null", pdp);
-      
+
       //Validate Policies
       PoliciesType pts = pdp.getPolicies();
       assertNotNull("PoliciesType is not null", pts);
       List<PolicySetType> pst = pts.getPolicySet();
-      assertNotNull("PolicySetType is not null", pst); 
+      assertNotNull("PolicySetType is not null", pst);
       assertEquals("1 PolicySet", 1, pst.size());
       PolicySetType psetType = pst.get(0);
       String loc = psetType.getLocation();
       assertTrue("Location of PolicySet is >0", loc.length() > 0);
-      assertEquals("PolicyType is null", 0,pts.getPolicy().size());
-      
+      assertEquals("PolicyType is null", 0, pts.getPolicy().size());
+
       //Validate Locators
       LocatorsType lts = pdp.getLocators();
       assertNotNull("LocatorsType != null", lts);
       List<LocatorType> lt = lts.getLocator();
       assertNotNull("LocatorType != null", lt);
-      assertEquals("LocatorType != null", 1,lt.size());
-   } 
-   
+      assertEquals("LocatorType != null", 1, lt.size());
+   }
+
    /**
     * Test the URL version of the PDP construction
     * @throws Exception
@@ -101,5 +101,5 @@
       assertNotNull("configFile != null", configFile);
       PolicyDecisionPoint pdp = new JBossPDP(configFile);
       XACMLTestUtil.validateInteropCases(pdp);
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/JBossPDPUnitTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -48,11 +48,11 @@
  *  @version $Revision$
  */
 public class JBossPDPUnitTestCase extends TestCase
-{ 
+{
    /**Enable to see the xacml request in system out for the objects case**/
    //Enable for request trace
-   private boolean debug = "true".equals(System.getProperty("debug","false")); 
-   
+   private boolean debug = "true".equals(System.getProperty("debug", "false"));
+
    public void testInteropTestWithXMLRequests() throws Exception
    {
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
@@ -60,152 +60,133 @@
       assertNotNull("InputStream != null", is);
       PolicyDecisionPoint pdp = new JBossPDP(is);
       assertNotNull("JBossPDP is != null", pdp);
-//http://www.oasis-open.org/committees/download.php/24475/xacml-2.0-core-interop-draft-12-04.doc
-/*
- Test (Trade-limit)(Cred-line)(Curr-cred)(Req-tr-appr) (Req-cr-appr) (Num-shrs)(Buy-price)(Expected Decision
- 1     10000   15000           10000       False        False         1000       10  Deny
- 2     10000   15000           10000       False        False         1000       1    Permit
- 3     10000   15000           10000       True         False         1000       5   Permit
- 4     10000   15000           10000       True         False         1000       9   Deny
- 5     10000   15000           10000       True         False         1000       10  Deny
- 6     10000   15000           10000       True         False         1000       15  Deny
- 7     10000   15000           10000       True         True          1000       10  Permit
-*/
+      //http://www.oasis-open.org/committees/download.php/24475/xacml-2.0-core-interop-draft-12-04.doc
+      /*
+       Test (Trade-limit)(Cred-line)(Curr-cred)(Req-tr-appr) (Req-cr-appr) (Num-shrs)(Buy-price)(Expected Decision
+       1     10000   15000           10000       False        False         1000       10  Deny
+       2     10000   15000           10000       False        False         1000       1    Permit
+       3     10000   15000           10000       True         False         1000       5   Permit
+       4     10000   15000           10000       True         False         1000       9   Deny
+       5     10000   15000           10000       True         False         1000       10  Deny
+       6     10000   15000           10000       True         False         1000       15  Deny
+       7     10000   15000           10000       True         True          1000       10  Permit
+      */
 
       XACMLTestUtil.validateInteropCases(pdp);
-   } 
-   
+   }
+
    public void testInteropTestWithObjects() throws Exception
    {
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
       InputStream is = tcl.getResourceAsStream("test/config/interopPolicySetConfig.xml");
       assertNotNull("InputStream != null", is);
       PolicyDecisionPoint pdp = new JBossPDP(is);
-      assertNotNull("JBossPDP is != null", pdp); 
+      assertNotNull("JBossPDP is != null", pdp);
 
-      assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",10)));
-      assertEquals("Case 2 should be deny", XACMLConstants.DECISION_PERMIT,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",1)));
-      assertEquals("Case 3 should be deny", XACMLConstants.DECISION_PERMIT,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",5)));
-      assertEquals("Case 4 should be deny", XACMLConstants.DECISION_DENY,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("false","false",9)));
-      assertEquals("Case 5 should be deny", XACMLConstants.DECISION_DENY,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",10)));
-      assertEquals("Case 6 should be deny", XACMLConstants.DECISION_DENY,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("true","false",15)));
-      assertEquals("Case 7 should be deny", XACMLConstants.DECISION_PERMIT,
-            XACMLTestUtil.getDecision(pdp,getRequestContext("true","true",10)));  
+      assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("false", "false", 10)));
+      assertEquals("Case 2 should be deny", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("false", "false", 1)));
+      assertEquals("Case 3 should be deny", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("true", "false", 5)));
+      assertEquals("Case 4 should be deny", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("false", "false", 9)));
+      assertEquals("Case 5 should be deny", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("true", "false", 10)));
+      assertEquals("Case 6 should be deny", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("true", "false", 15)));
+      assertEquals("Case 7 should be deny", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
+            getRequestContext("true", "true", 10)));
    }
-   
-   private RequestContext getRequestContext(String reqTradeAppr, String reqCreditAppr,
-         int buyPrice) throws Exception
+
+   private RequestContext getRequestContext(String reqTradeAppr, String reqCreditAppr, int buyPrice) throws Exception
    {
       RequestType request = new RequestType();
-      request.getSubject().add(createSubject(reqTradeAppr,reqCreditAppr,buyPrice));
+      request.getSubject().add(createSubject(reqTradeAppr, reqCreditAppr, buyPrice));
       request.getResource().add(createResource());
       request.setAction(createAction());
-      request.setEnvironment( new EnvironmentType());
-      
+      request.setEnvironment(new EnvironmentType());
+
       RequestContext requestCtx = RequestResponseContextFactory.createRequestCtx();
       requestCtx.setRequest(request);
-      if(debug)
-        requestCtx.marshall(System.out);
-      
+      if (debug)
+         requestCtx.marshall(System.out);
+
       return requestCtx;
-   } 
-   
-   
-   private SubjectType createSubject(String reqTradeAppr, String reqCreditAppr,
-         int buyPrice)
+   }
+
+   private SubjectType createSubject(String reqTradeAppr, String reqCreditAppr, int buyPrice)
    {
       //Create a subject type
       SubjectType subject = new SubjectType();
       subject.setSubjectCategory("urn:oasis:names:tc:xacml:1.0:subject-category:access-subject");
       //create the subject attributes
       AttributeType attSubjectID = RequestAttributeFactory.createStringAttributeType(
-                                            "urn:oasis:names:tc:xacml:1.0:subject:subject-id",
-                                            "xacml20.interop.com", "123456"); 
+            "urn:oasis:names:tc:xacml:1.0:subject:subject-id", "xacml20.interop.com", "123456");
       subject.getAttribute().add(attSubjectID);
-      
+
       AttributeType attUserName = RequestAttributeFactory.createStringAttributeType(
-                                             "urn:xacml:2.0:interop:example:subject:user-name",
-                                             "xacml20.interop.com", "John Smith");
+            "urn:xacml:2.0:interop:example:subject:user-name", "xacml20.interop.com", "John Smith");
       subject.getAttribute().add(attUserName);
-      
+
       AttributeType attBuyNumShares = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:subject:buy-num-shares",
-            "xacml20.interop.com", 1000);
-      subject.getAttribute().add(attBuyNumShares); 
-      
+            "urn:xacml:2.0:interop:example:subject:buy-num-shares", "xacml20.interop.com", 1000);
+      subject.getAttribute().add(attBuyNumShares);
+
       AttributeType attBuyOfferShare = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:subject:buy-offer-price",
-            "xacml20.interop.com", buyPrice);
+            "urn:xacml:2.0:interop:example:subject:buy-offer-price", "xacml20.interop.com", buyPrice);
       subject.getAttribute().add(attBuyOfferShare);
-       
-      
+
       AttributeType attRequestExtCred = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:subject:req-credit-ext-approval",
-            "xacml20.interop.com", reqCreditAppr);
-      subject.getAttribute().add(attRequestExtCred); 
-      
+            "urn:xacml:2.0:interop:example:subject:req-credit-ext-approval", "xacml20.interop.com", reqCreditAppr);
+      subject.getAttribute().add(attRequestExtCred);
+
       AttributeType attRequestTradeApproval = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:subject:req-trade-approval",
-            "xacml20.interop.com", reqTradeAppr);
+            "urn:xacml:2.0:interop:example:subject:req-trade-approval", "xacml20.interop.com", reqTradeAppr);
       subject.getAttribute().add(attRequestTradeApproval);
 
-     return subject;
+      return subject;
    }
-   
+
    public ResourceType createResource()
    {
       ResourceType resourceType = new ResourceType();
-      
+
       AttributeType attResourceID = RequestAttributeFactory.createStringAttributeType(
-            "urn:oasis:names:tc:xacml:1.0:resource:resource-id",
-            "xacml20.interop.com", "CustomerAccount");
+            "urn:oasis:names:tc:xacml:1.0:resource:resource-id", "xacml20.interop.com", "CustomerAccount");
       resourceType.getAttribute().add(attResourceID);
-      
-      
+
       AttributeType attOwnerID = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:owner-id",
-            "xacml20.interop.com", "123456");
+            "urn:xacml:2.0:interop:example:resource:owner-id", "xacml20.interop.com", "123456");
       resourceType.getAttribute().add(attOwnerID);
 
       AttributeType attOwnerName = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:owner-name",
-            "xacml20.interop.com", "John Smith");
+            "urn:xacml:2.0:interop:example:resource:owner-name", "xacml20.interop.com", "John Smith");
       resourceType.getAttribute().add(attOwnerName);
-      
+
       AttributeType attAccountStatus = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:account-status",
-            "xacml20.interop.com", "Active");
-      resourceType.getAttribute().add(attAccountStatus); 
-      
+            "urn:xacml:2.0:interop:example:resource:account-status", "xacml20.interop.com", "Active");
+      resourceType.getAttribute().add(attAccountStatus);
+
       AttributeType attCreditLine = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:credit-line",
-            "xacml20.interop.com", 15000);
-      resourceType.getAttribute().add(attCreditLine); 
-      
+            "urn:xacml:2.0:interop:example:resource:credit-line", "xacml20.interop.com", 15000);
+      resourceType.getAttribute().add(attCreditLine);
+
       AttributeType attCurrentCredit = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:current-credit",
-            "xacml20.interop.com", 10000);
-      resourceType.getAttribute().add(attCurrentCredit); 
-      
+            "urn:xacml:2.0:interop:example:resource:current-credit", "xacml20.interop.com", 10000);
+      resourceType.getAttribute().add(attCurrentCredit);
+
       AttributeType attTradeLimit = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:trade-limit",
-            "xacml20.interop.com", 10000);
-      resourceType.getAttribute().add(attTradeLimit); 
+            "urn:xacml:2.0:interop:example:resource:trade-limit", "xacml20.interop.com", 10000);
+      resourceType.getAttribute().add(attTradeLimit);
       return resourceType;
    }
-   
+
    private ActionType createAction()
    {
       ActionType actionType = new ActionType();
       AttributeType attActionID = RequestAttributeFactory.createStringAttributeType(
-            "urn:oasis:names:tc:xacml:1.0:action:action-id",
-            "xacml20.interop.com", "Buy");
+            "urn:oasis:names:tc:xacml:1.0:action:action-id", "xacml20.interop.com", "Buy");
       actionType.getAttribute().add(attActionID);
       return actionType;
    }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/core/model/ContextUnitTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -39,7 +39,6 @@
 import org.jboss.security.xacml.interfaces.XACMLConstants;
 import org.jboss.test.security.xacml.factories.util.XACMLTestUtil;
 
-
 /**
  *  Construction of request/response
  *  @author Anil.Saldhana at redhat.com
@@ -47,29 +46,27 @@
  *  @version $Revision$
  */
 public class ContextUnitTestCase extends TestCase
-{ 
+{
    public void testConstructRequest() throws Exception
    {
       RequestType requestType = new RequestType();
       requestType.getSubject().add(createSubject());
       requestType.getResource().add(createResource());
       requestType.setAction(createAction());
-      requestType.setEnvironment( new EnvironmentType());
-      
+      requestType.setEnvironment(new EnvironmentType());
+
       RequestContext requestCtx = RequestResponseContextFactory.createRequestCtx();
-      requestCtx.setRequest(requestType); 
-      
+      requestCtx.setRequest(requestType);
+
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
       InputStream is = tcl.getResourceAsStream("test/config/interopPolicySetConfig.xml");
       assertNotNull("InputStream != null", is);
       PolicyDecisionPoint pdp = new JBossPDP(is);
       assertNotNull("JBossPDP is != null", pdp);
-      
-      assertEquals("Case 1 should be deny", 
-            XACMLConstants.DECISION_DENY, 
-            XACMLTestUtil.getDecision(pdp,requestCtx));
+
+      assertEquals("Case 1 should be deny", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp, requestCtx));
    }
-   
+
    private SubjectType createSubject()
    {
       //Create a subject type
@@ -77,88 +74,72 @@
       subject.setSubjectCategory("urn:oasis:names:tc:xacml:1.0:subject-category:access-subject");
       //create the subject attributes
       AttributeType attSubjectID = RequestAttributeFactory.createStringAttributeType(
-                                            "urn:oasis:names:tc:xacml:1.0:subject:subject-id",
-                                            "xacml20.interop.com", "123456"); 
+            "urn:oasis:names:tc:xacml:1.0:subject:subject-id", "xacml20.interop.com", "123456");
       subject.getAttribute().add(attSubjectID);
-      
+
       AttributeType attUserName = RequestAttributeFactory.createStringAttributeType(
-                                             "urn:xacml:2.0:interop:example:subject:user-name",
-                                             "xacml20.interop.com", "John Smith");
+            "urn:xacml:2.0:interop:example:subject:user-name", "xacml20.interop.com", "John Smith");
       subject.getAttribute().add(attUserName);
-      
+
       AttributeType attBuyNumShares = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:subject:buy-num-shares",
-            "xacml20.interop.com", 1000);
-      subject.getAttribute().add(attBuyNumShares); 
-      
+            "urn:xacml:2.0:interop:example:subject:buy-num-shares", "xacml20.interop.com", 1000);
+      subject.getAttribute().add(attBuyNumShares);
+
       AttributeType attBuyOfferShare = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:subject:buy-offer-price",
-            "xacml20.interop.com", 100);
+            "urn:xacml:2.0:interop:example:subject:buy-offer-price", "xacml20.interop.com", 100);
       subject.getAttribute().add(attBuyOfferShare);
-       
-      
+
       AttributeType attRequestExtCred = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:subject:req-credit-ext-approval",
-            "xacml20.interop.com", "false");
-      subject.getAttribute().add(attRequestExtCred); 
-      
+            "urn:xacml:2.0:interop:example:subject:req-credit-ext-approval", "xacml20.interop.com", "false");
+      subject.getAttribute().add(attRequestExtCred);
+
       AttributeType attRequestTradeApproval = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:subject:req-trade-approval",
-            "xacml20.interop.com", "false");
+            "urn:xacml:2.0:interop:example:subject:req-trade-approval", "xacml20.interop.com", "false");
       subject.getAttribute().add(attRequestTradeApproval);
 
-     return subject;
+      return subject;
    }
-   
+
    public ResourceType createResource()
    {
       ResourceType resourceType = new ResourceType();
-      
+
       AttributeType attResourceID = RequestAttributeFactory.createStringAttributeType(
-            "urn:oasis:names:tc:xacml:1.0:resource:resource-id",
-            "xacml20.interop.com", "CustomerAccount");
+            "urn:oasis:names:tc:xacml:1.0:resource:resource-id", "xacml20.interop.com", "CustomerAccount");
       resourceType.getAttribute().add(attResourceID);
-      
-      
+
       AttributeType attOwnerID = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:owner-id",
-            "xacml20.interop.com", "123456");
+            "urn:xacml:2.0:interop:example:resource:owner-id", "xacml20.interop.com", "123456");
       resourceType.getAttribute().add(attOwnerID);
 
       AttributeType attOwnerName = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:owner-name",
-            "xacml20.interop.com", "John Smith");
+            "urn:xacml:2.0:interop:example:resource:owner-name", "xacml20.interop.com", "John Smith");
       resourceType.getAttribute().add(attOwnerName);
-      
+
       AttributeType attAccountStatus = RequestAttributeFactory.createStringAttributeType(
-            "urn:xacml:2.0:interop:example:resource:account-status",
-            "xacml20.interop.com", "Active");
-      resourceType.getAttribute().add(attAccountStatus); 
-      
+            "urn:xacml:2.0:interop:example:resource:account-status", "xacml20.interop.com", "Active");
+      resourceType.getAttribute().add(attAccountStatus);
+
       AttributeType attCreditLine = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:credit-line",
-            "xacml20.interop.com", 15000);
-      resourceType.getAttribute().add(attCreditLine); 
-      
+            "urn:xacml:2.0:interop:example:resource:credit-line", "xacml20.interop.com", 15000);
+      resourceType.getAttribute().add(attCreditLine);
+
       AttributeType attCurrentCredit = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:current-credit",
-            "xacml20.interop.com", 10000);
-      resourceType.getAttribute().add(attCurrentCredit); 
-      
+            "urn:xacml:2.0:interop:example:resource:current-credit", "xacml20.interop.com", 10000);
+      resourceType.getAttribute().add(attCurrentCredit);
+
       AttributeType attTradeLimit = RequestAttributeFactory.createIntegerAttributeType(
-            "urn:xacml:2.0:interop:example:resource:trade-limit",
-            "xacml20.interop.com", 10000);
-      resourceType.getAttribute().add(attTradeLimit); 
+            "urn:xacml:2.0:interop:example:resource:trade-limit", "xacml20.interop.com", 10000);
+      resourceType.getAttribute().add(attTradeLimit);
       return resourceType;
    }
-   
+
    private ActionType createAction()
    {
       ActionType actionType = new ActionType();
       AttributeType attActionID = RequestAttributeFactory.createStringAttributeType(
-            "urn:oasis:names:tc:xacml:1.0:action:action-id",
-            "xacml20.interop.com", "Buy");
+            "urn:oasis:names:tc:xacml:1.0:action:action-id", "xacml20.interop.com", "Buy");
       actionType.getAttribute().add(attActionID);
       return actionType;
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/factories/PolicyFactoryUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/factories/PolicyFactoryUnitTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/factories/PolicyFactoryUnitTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -45,5 +45,5 @@
       XACMLPolicy xacmlPolicy = PolicyFactory.createPolicySet(is);
       assertNotNull("XACML PolicySet != null", xacmlPolicy);
       assertEquals("PolicySet?", xacmlPolicy.getType(), XACMLPolicy.POLICYSET);
-   } 
+   }
 }

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/RSAConferenceTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/RSAConferenceTestCase.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/RSAConferenceTestCase.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -82,8 +82,8 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
       request.marshall(System.out);
    }
@@ -121,8 +121,8 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
       request.marshall(System.out);
    }
@@ -168,11 +168,10 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
-      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
-            request));
+      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp, request));
    }
 
    public void atestUseCase1_2() throws Exception
@@ -210,8 +209,8 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithHL7Permissions(doctor, permissions, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
       assertEquals("Deny?", XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp, request));
    }
@@ -252,11 +251,10 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
-      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
-            request));
+      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp, request));
    }
 
    public void atestUseCase1_4() throws Exception
@@ -295,11 +293,10 @@
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-012");
       resourcePermissions.add(Util.PERMISSION_BASE + "prd-017");
 
-      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient,
-            confidentialityCodes, consentedIds, resourceType, resourcePermissions);
+      RequestContext request = Util.createRequestWithNormalRoles(doctor, roles, patient, confidentialityCodes,
+            consentedIds, resourceType, resourcePermissions);
 
-      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp,
-            request));
+      assertEquals("Permit?", XACMLConstants.DECISION_PERMIT, XACMLTestUtil.getDecision(pdp, request));
    }
 
    private PolicyDecisionPoint getPDP()

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/Util.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/Util.java	2008-04-02 23:27:00 UTC (rev 71656)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/tests/java/org/jboss/test/security/xacml/interop/rsaconf/Util.java	2008-04-02 23:35:21 UTC (rev 71657)
@@ -77,14 +77,14 @@
     * 
     * @return a <code>RequestContext</code> with the <code>RequestType</code> set.
     */
-   public static RequestContext createRequestWithNormalRoles(Principal principal,
-         List<String> roles, String resourceId, List<String> confidentialityCodes,
-         List<String> consentedIds, String resourceType, List<String> resourcePermissions)
+   public static RequestContext createRequestWithNormalRoles(Principal principal, List<String> roles,
+         String resourceId, List<String> confidentialityCodes, List<String> consentedIds, String resourceType,
+         List<String> resourcePermissions)
    {
       RequestContext request = RequestResponseContextFactory.createRequestCtx();
 
-      RequestType requestType = createRequestType(principal, resourceId, confidentialityCodes,
-            consentedIds, resourceType, resourcePermissions);
+      RequestType requestType = createRequestType(principal, resourceId, confidentialityCodes, consentedIds,
+            resourceType, resourcePermissions);
       addNormalRoles(roles, requestType);
 
       try
@@ -114,14 +114,14 @@
     * 
     * @return a <code>RequestContext</code> with the <code>RequestType</code> set.
     */
-   public static RequestContext createRequestWithHL7Permissions(Principal principal,
-         List<String> permissions, String resourceId, List<String> confidentialityCodes,
-         List<String> consentedIds, String resourceType, List<String> resourcePermissions)
+   public static RequestContext createRequestWithHL7Permissions(Principal principal, List<String> permissions,
+         String resourceId, List<String> confidentialityCodes, List<String> consentedIds, String resourceType,
+         List<String> resourcePermissions)
    {
       RequestContext request = RequestResponseContextFactory.createRequestCtx();
 
-      RequestType requestType = createRequestType(principal, resourceId, confidentialityCodes,
-            consentedIds, resourceType, resourcePermissions);
+      RequestType requestType = createRequestType(principal, resourceId, confidentialityCodes, consentedIds,
+            resourceType, resourcePermissions);
       addHL7Permissions(permissions, requestType);
 
       try
@@ -159,34 +159,31 @@
       //create the Subject of the request
       SubjectType subject = new SubjectType();
       subject.getAttribute().add(
-            RequestAttributeFactory.createStringAttributeType(
-                  XACMLConstants.ATTRIBUTEID_SUBJECT_ID, null, principal.getName()));
+            RequestAttributeFactory.createStringAttributeType(XACMLConstants.ATTRIBUTEID_SUBJECT_ID, null, principal
+                  .getName()));
       requestType.getSubject().add(subject);
 
       //create the Resource of the request
       ResourceType resource = new ResourceType();
-      resource.getAttribute().add(
-            RequestAttributeFactory.createStringAttributeType(
-                  XACMLConstants.ATTRIBUTEID_RESOURCE_ID, null, resourceId));
+      resource.getAttribute()
+            .add(
+                  RequestAttributeFactory.createStringAttributeType(XACMLConstants.ATTRIBUTEID_RESOURCE_ID, null,
+                        resourceId));
       for (String confidentialityCode : confidentialityCodes)
       {
          resource.getAttribute().add(
-               RequestAttributeFactory.createStringAttributeType(CONFIDENTIALITY_CODE, null,
-                     confidentialityCode));
+               RequestAttributeFactory.createStringAttributeType(CONFIDENTIALITY_CODE, null, confidentialityCode));
       }
       for (String consentedId : consentedIds)
       {
          resource.getAttribute().add(
-               RequestAttributeFactory.createStringAttributeType(CONSENTED_SUBJECT_ID, null,
-                     consentedId));
+               RequestAttributeFactory.createStringAttributeType(CONSENTED_SUBJECT_ID, null, consentedId));
       }
-      resource.getAttribute().add(
-            RequestAttributeFactory.createStringAttributeType(RESOURCE_TYPE, null, resourceType));
+      resource.getAttribute().add(RequestAttributeFactory.createStringAttributeType(RESOURCE_TYPE, null, resourceType));
       for (String resourcePermission : resourcePermissions)
       {
          resource.getAttribute().add(
-               RequestAttributeFactory.createStringAttributeType(HL7_RESOURCE_PERMISSION, null,
-                     resourcePermission));
+               RequestAttributeFactory.createStringAttributeType(HL7_RESOURCE_PERMISSION, null, resourcePermission));
       }
       requestType.getResource().add(resource);
 
@@ -211,8 +208,7 @@
          for (String role : roles)
          {
             subject.getAttribute().add(
-                  RequestAttributeFactory.createStringAttributeType(
-                        XACMLConstants.ATTRIBUTEID_ROLE, null, role));
+                  RequestAttributeFactory.createStringAttributeType(XACMLConstants.ATTRIBUTEID_ROLE, null, role));
          }
       }
    }
@@ -232,8 +228,7 @@
          for (String permission : permissions)
          {
             subject.getAttribute().add(
-                  RequestAttributeFactory.createStringAttributeType(HL7_SUBJECT_PERMISSION, null,
-                        permission));
+                  RequestAttributeFactory.createStringAttributeType(HL7_SUBJECT_PERMISSION, null, permission));
          }
       }
    }




More information about the jboss-cvs-commits mailing list