[jboss-cvs] JBossAS SVN: r71260 - in projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml: core and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 25 15:22:48 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-03-25 15:22:48 -0400 (Tue, 25 Mar 2008)
New Revision: 71260
Modified:
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/JBossPolicyFinder.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/util/XACMLPolicyUtil.java
Log:
SECURITY-156: jboss-sunxacml
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/JBossPolicyFinder.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/JBossPolicyFinder.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/JBossPolicyFinder.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -21,8 +21,9 @@
*/
package org.jboss.security.xacml.bridge;
-import com.sun.xacml.finder.PolicyFinder;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
+
//$Id$
/**
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/PolicySetFinderModule.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -25,18 +25,18 @@
import java.util.ArrayList;
import java.util.List;
-import com.sun.xacml.AbstractPolicy;
-import com.sun.xacml.EvaluationCtx;
-import com.sun.xacml.MatchResult;
-import com.sun.xacml.Policy;
-import com.sun.xacml.PolicyMetaData;
-import com.sun.xacml.PolicySet;
-import com.sun.xacml.VersionConstraints;
-import com.sun.xacml.ctx.Status;
-import com.sun.xacml.finder.PolicyFinder;
-import com.sun.xacml.finder.PolicyFinderModule;
-import com.sun.xacml.finder.PolicyFinderResult;
-
+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
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/bridge/WrapperPolicyFinderModule.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -23,14 +23,15 @@
import java.net.URI;
-import com.sun.xacml.EvaluationCtx;
-import com.sun.xacml.Policy;
-import com.sun.xacml.PolicyMetaData;
-import com.sun.xacml.VersionConstraints;
-import com.sun.xacml.finder.PolicyFinder;
-import com.sun.xacml.finder.PolicyFinderModule;
-import com.sun.xacml.finder.PolicyFinderResult;
+import org.jboss.security.xacml.sunxacml.EvaluationCtx;
+import org.jboss.security.xacml.sunxacml.Policy;
+import org.jboss.security.xacml.sunxacml.PolicyMetaData;
+import org.jboss.security.xacml.sunxacml.VersionConstraints;
+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
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossPDP.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -51,20 +51,17 @@
import org.jboss.security.xacml.jaxb.PoliciesType;
import org.jboss.security.xacml.jaxb.PolicySetType;
import org.jboss.security.xacml.jaxb.PolicyType;
+import org.jboss.security.xacml.sunxacml.PDPConfig;
+import org.jboss.security.xacml.sunxacml.ctx.RequestCtx;
+import org.jboss.security.xacml.sunxacml.ctx.ResponseCtx;
+import org.jboss.security.xacml.sunxacml.finder.AttributeFinder;
+import org.jboss.security.xacml.sunxacml.finder.AttributeFinderModule;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
+import org.jboss.security.xacml.sunxacml.finder.impl.CurrentEnvModule;
+import org.jboss.security.xacml.sunxacml.finder.impl.SelectorModule;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import com.sun.xacml.PDPConfig;
-import com.sun.xacml.ctx.RequestCtx;
-import com.sun.xacml.ctx.ResponseCtx;
-import com.sun.xacml.finder.AttributeFinder;
-import com.sun.xacml.finder.AttributeFinderModule;
-import com.sun.xacml.finder.PolicyFinderModule;
-import com.sun.xacml.finder.impl.CurrentEnvModule;
-import com.sun.xacml.finder.impl.SelectorModule;
-
-//$Id$
-
/**
* PDP for JBoss XACML
* @author Anil.Saldhana at redhat.com
@@ -217,7 +214,8 @@
attributeModules.add(new SelectorModule());
attributeFinder.setModules(attributeModules);
- com.sun.xacml.PDP pdp = new com.sun.xacml.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");
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossRequestContext.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -38,14 +38,11 @@
import org.jboss.security.xacml.interfaces.ContextMapOp;
import org.jboss.security.xacml.interfaces.RequestContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
+import org.jboss.security.xacml.sunxacml.ctx.RequestCtx;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import com.sun.xacml.ctx.RequestCtx;
-
-//$Id$
-
+
/**
* Implementation of the RequestContext interface
* @author Anil.Saldhana at redhat.com
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossResponseContext.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -30,12 +30,9 @@
import org.jboss.security.xacml.interfaces.ContextMapOp;
import org.jboss.security.xacml.interfaces.ResponseContext;
import org.jboss.security.xacml.interfaces.XACMLConstants;
-
-import com.sun.xacml.ctx.ResponseCtx;
-import com.sun.xacml.ctx.Result;
-
-//$Id$
-
+import org.jboss.security.xacml.sunxacml.ctx.ResponseCtx;
+import org.jboss.security.xacml.sunxacml.ctx.Result;
+
/**
* Implementation of the ResponseContext interface
* @author Anil.Saldhana at redhat.com
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/core/JBossXACMLPolicy.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -32,12 +32,9 @@
import org.jboss.security.xacml.interfaces.ContextMapOp;
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.util.XACMLPolicyUtil;
-
-import com.sun.xacml.AbstractPolicy;
-
-//$Id$
-
+
/**
* JBossXACML Policy
* @author Anil.Saldhana at redhat.com
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicyLocator.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -28,12 +28,9 @@
import org.jboss.security.xacml.bridge.WrapperPolicyFinderModule;
import org.jboss.security.xacml.interfaces.XACMLConstants;
import org.jboss.security.xacml.interfaces.XACMLPolicy;
-
-import com.sun.xacml.Policy;
-import com.sun.xacml.finder.PolicyFinderModule;
-
-//$Id$
-
+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
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/locators/JBossPolicySetLocator.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -28,13 +28,10 @@
import org.jboss.security.xacml.bridge.PolicySetFinderModule;
import org.jboss.security.xacml.interfaces.XACMLConstants;
import org.jboss.security.xacml.interfaces.XACMLPolicy;
-
-import com.sun.xacml.AbstractPolicy;
-import com.sun.xacml.Policy;
-import com.sun.xacml.PolicySet;
-
-//$Id$
-
+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
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/util/XACMLPolicyUtil.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/util/XACMLPolicyUtil.java 2008-03-25 19:21:59 UTC (rev 71259)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/org/jboss/security/xacml/util/XACMLPolicyUtil.java 2008-03-25 19:22:48 UTC (rev 71260)
@@ -29,12 +29,12 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.jboss.security.xacml.sunxacml.Policy;
+import org.jboss.security.xacml.sunxacml.PolicySet;
+import org.jboss.security.xacml.sunxacml.finder.PolicyFinder;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import com.sun.xacml.Policy;
-import com.sun.xacml.PolicySet;
-import com.sun.xacml.finder.PolicyFinder;
/**
* Create an XACML Policy Object from the url for the policy xml
More information about the jboss-cvs-commits
mailing list