JBoss Portal SVN: r12730 - in branches/Enterprise_Portal_Platform_4_3: theme/src/main/org/jboss/portal/theme/impl/render/dynamic and 1 other directory.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2009-01-30 13:15:07 -0500 (Fri, 30 Jan 2009)
New Revision: 12730
Modified:
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
Log:
Include DnD scripts statically, and remove old RF config from identity
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-01-30 17:46:15 UTC (rev 12729)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-01-30 18:15:07 UTC (rev 12730)
@@ -35,9 +35,6 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
- <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
@@ -56,9 +53,6 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
- <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
Modified: branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-01-30 17:46:15 UTC (rev 12729)
+++ branches/Enterprise_Portal_Platform_4_3/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-01-30 18:15:07 UTC (rev 12730)
@@ -132,9 +132,16 @@
markup.print("/prototype.js'></script>\n");
markup.print("<script type='text/javascript' src='");
markup.print(jsBase);
- markup.print("/scriptaculous.js?load=effects,dragdrop'></script>\n");
+ markup.print("/scriptaculous.js'></script>\n");
markup.print("<script type='text/javascript' src='");
markup.print(jsBase);
+ markup.print("/effects.js'></script>\n");
+ markup.print("<script type='text/javascript' src='");
+ markup.print(jsBase);
+ markup.print("/dragdrop.js'></script>\n");
+
+ markup.print("<script type='text/javascript' src='");
+ markup.print(jsBase);
markup.print("/dyna.js'></script>\n");
markup.print("<script type='text/javascript'>\n");
15 years, 3 months
JBoss Portal SVN: r12729 - modules/authorization/trunk/decision-point.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 12:46:15 -0500 (Fri, 30 Jan 2009)
New Revision: 12729
Modified:
modules/authorization/trunk/decision-point/
Log:
adding the policy "decision-point" component
Property changes on: modules/authorization/trunk/decision-point
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 3 months
JBoss Portal SVN: r12728 - in modules/authorization/trunk: decision-point and 10 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 12:44:00 -0500 (Fri, 30 Jan 2009)
New Revision: 12728
Added:
modules/authorization/trunk/decision-point/
modules/authorization/trunk/decision-point/pom.xml
modules/authorization/trunk/decision-point/src/
modules/authorization/trunk/decision-point/src/main/
modules/authorization/trunk/decision-point/src/main/java/
modules/authorization/trunk/decision-point/src/main/java/org/
modules/authorization/trunk/decision-point/src/main/java/org/jboss/
modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/
modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/
modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/
modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java
modules/authorization/trunk/decision-point/src/main/resources/
modules/authorization/trunk/decision-point/src/test/
modules/authorization/trunk/decision-point/src/test/java/
modules/authorization/trunk/decision-point/src/test/resources/
modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPointImpl.java
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Request.java
modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Response.java
modules/authorization/trunk/pom.xml
Log:
adding the policy "decision-point" component
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-01-30 16:43:12 UTC (rev 12727)
+++ modules/authorization/trunk/.classpath 2009-01-30 17:44:00 UTC (rev 12728)
@@ -7,7 +7,11 @@
<classpathentry kind="src" path="core-components/src/main/java"/>
<classpathentry kind="src" path="core-components/src/main/resources"/>
<classpathentry kind="src" path="core-components/src/test/java"/>
- <classpathentry kind="src" path="core-components/src/test/resources"/>
+ <classpathentry kind="src" path="core-components/src/test/resources"/>
+ <classpathentry kind="src" path="decision-point/src/main/java"/>
+ <classpathentry kind="src" path="decision-point/src/main/resources"/>
+ <classpathentry kind="src" path="decision-point/src/test/java"/>
+ <classpathentry kind="src" path="decision-point/src/test/resources"/>
<classpathentry kind="src" path="enforcement/src/main/java"/>
<classpathentry kind="src" path="enforcement/src/main/resources"/>
<classpathentry kind="src" path="enforcement/src/test/java"/>
@@ -16,10 +20,10 @@
<classpathentry kind="src" path="provisioning/src/main/resources"/>
<classpathentry kind="src" path="provisioning/src/test/java"/>
<classpathentry kind="src" path="provisioning/src/test/resources"/>
- <classpathentry kind="src" path="http-authz/src/main/java"/>
- <classpathentry kind="src" path="http-authz/src/main/resources"/>
- <classpathentry kind="src" path="http-authz/src/test/java"/>
- <classpathentry kind="src" path="http-authz/src/test/resources"/>
+ <classpathentry kind="src" path="http-profile/src/main/java"/>
+ <classpathentry kind="src" path="http-profile/src/main/resources"/>
+ <classpathentry kind="src" path="http-profile/src/test/java"/>
+ <classpathentry kind="src" path="http-profile/src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
Added: modules/authorization/trunk/decision-point/pom.xml
===================================================================
--- modules/authorization/trunk/decision-point/pom.xml (rev 0)
+++ modules/authorization/trunk/decision-point/pom.xml 2009-01-30 17:44:00 UTC (rev 12728)
@@ -0,0 +1,67 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>jboss-authz-parent</artifactId>
+ <version>trunk-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-authz-decision-point</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Authorization Policy Decision Point</name>
+ <url>http://www.jboss.org</url>
+ <description>A Policy Decision Point where all Enforcement Requests are routed and processed</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>jboss-authz-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- jboss xacml -->
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-xacml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-sunxacml</artifactId>
+ </dependency>
+
+ <!-- sun jaxb -->
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+
+ <!-- junit -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <includes>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java
===================================================================
--- modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java (rev 0)
+++ modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java 2009-01-30 17:44:00 UTC (rev 12728)
@@ -0,0 +1,50 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.authz.decision;
+
+/**
+ * This component processes all incoming Authorization requests and responds with a response
+ *
+ * This component receives requests from native application layer Policy Enforcement Points.
+ *
+ * This typically runs inside the Policy Server and is reachable over a network connection
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class PolicyDecisionPoint
+{
+ public PolicyDecisionPoint()
+ {
+
+ }
+
+ public void start()
+ {
+
+ }
+
+ public void stop()
+ {
+
+ }
+ //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+}
Modified: modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
===================================================================
--- modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java 2009-01-30 16:43:12 UTC (rev 12727)
+++ modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java 2009-01-30 17:44:00 UTC (rev 12728)
@@ -22,28 +22,22 @@
package org.jboss.security.authz.enforcement;
/**
+ * This component typically integrates natively with the application layer to receive Authorization Requests
+ * It then processes the native request and routes it to the Policy Decision Point component of the Policy Server to get a decision whether the
+ * Authorization should be granted or not or to do something else
+ *
+ * Sometimes, this component can just be a native stub that routes all requests over the network to the Policy Server, and sometimes this component can be co-located with the Policy Server
+ *
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class PolicyEnforcementPoint
+public interface PolicyEnforcementPoint
{
- public PolicyEnforcementPoint()
- {
-
- }
-
- public void start()
- {
-
- }
-
- public void stop()
- {
-
- }
- //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- public Response checkAccess(Request request) throws EnforcementException
- {
- Response response = new Response();
- return response;
- }
+ /**
+ * Checks if Access should be granted for this particular Authorization Request
+ *
+ * @param request
+ * @return
+ * @throws EnforcementException
+ */
+ public Response checkAccess(Request request) throws EnforcementException;
}
Copied: modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPointImpl.java (from rev 12727, modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java)
===================================================================
--- modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPointImpl.java (rev 0)
+++ modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPointImpl.java 2009-01-30 17:44:00 UTC (rev 12728)
@@ -0,0 +1,56 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.authz.enforcement;
+
+/**
+ * This component typically integrates natively with the application layer to receive Authorization Requests
+ * It then processes the native request and routes it to the Policy Decision Point component of the Policy Server to get a decision whether the
+ * Authorization should be granted or not or to do something else
+ *
+ * Sometimes, this component can just be a native stub that routes all requests over the network to the Policy Server, and sometimes this component can be co-located with the Policy Server
+ *
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class PolicyEnforcementPointImpl implements PolicyEnforcementPoint
+{
+ public PolicyEnforcementPointImpl()
+ {
+
+ }
+
+ public void start()
+ {
+
+ }
+
+ public void stop()
+ {
+
+ }
+ //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ public Response checkAccess(Request request) throws EnforcementException
+ {
+ Response response = new Response();
+ return response;
+ }
+}
Property changes on: modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPointImpl.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Request.java
===================================================================
--- modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Request.java 2009-01-30 16:43:12 UTC (rev 12727)
+++ modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Request.java 2009-01-30 17:44:00 UTC (rev 12728)
@@ -31,6 +31,8 @@
import org.jboss.security.authz.model.Environment;
/**
+ * An Authorization Request
+ *
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class Request implements Serializable
Modified: modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Response.java
===================================================================
--- modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Response.java 2009-01-30 16:43:12 UTC (rev 12727)
+++ modules/authorization/trunk/enforcement/src/main/java/org/jboss/security/authz/enforcement/Response.java 2009-01-30 17:44:00 UTC (rev 12728)
@@ -24,6 +24,8 @@
import java.io.Serializable;
/**
+ * An Authorization Response
+ *
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class Response implements Serializable
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-01-30 16:43:12 UTC (rev 12727)
+++ modules/authorization/trunk/pom.xml 2009-01-30 17:44:00 UTC (rev 12728)
@@ -11,7 +11,8 @@
<modules>
<module>common</module>
- <module>core-components</module>
+ <module>core-components</module>
+ <module>decision-point</module>
<module>enforcement</module>
<module>provisioning</module>
<module>http-profile</module>
15 years, 3 months
JBoss Portal SVN: r12727 - in modules/authorization/trunk: http-profile and 1 other directory.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 11:43:12 -0500 (Fri, 30 Jan 2009)
New Revision: 12727
Added:
modules/authorization/trunk/http-profile/
Removed:
modules/authorization/trunk/http-authz/
Modified:
modules/authorization/trunk/http-profile/pom.xml
modules/authorization/trunk/pom.xml
Log:
renaming 'http-authz' to 'http-profile'
Copied: modules/authorization/trunk/http-profile (from rev 12725, modules/authorization/trunk/http-authz)
Property changes on: modules/authorization/trunk/http-profile
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/http-profile/pom.xml
===================================================================
--- modules/authorization/trunk/http-authz/pom.xml 2009-01-30 08:28:10 UTC (rev 12725)
+++ modules/authorization/trunk/http-profile/pom.xml 2009-01-30 16:43:12 UTC (rev 12727)
@@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-http-authz</artifactId>
+ <artifactId>jboss-http-profile</artifactId>
<packaging>jar</packaging>
<name>JBoss Authorization for the HTTP tier</name>
<url>http://www.jboss.org</url>
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-01-30 13:13:38 UTC (rev 12726)
+++ modules/authorization/trunk/pom.xml 2009-01-30 16:43:12 UTC (rev 12727)
@@ -14,7 +14,7 @@
<module>core-components</module>
<module>enforcement</module>
<module>provisioning</module>
- <module>http-authz</module>
+ <module>http-profile</module>
<!--
<module>security-console</module>
-->
15 years, 3 months
JBoss Portal SVN: r12726 - branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-30 08:13:38 -0500 (Fri, 30 Jan 2009)
New Revision: 12726
Modified:
branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
Log:
"Fix" the serialization issue
Modified: branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java 2009-01-30 08:28:10 UTC (rev 12725)
+++ branches/Enterprise_Portal_Platform_4_3/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java 2009-01-30 13:13:38 UTC (rev 12726)
@@ -30,6 +30,7 @@
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.core.SessionContext;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -43,7 +44,7 @@
* @version $Revision$
* @since 2.4 (May 30, 2006)
*/
-public class ProducerSessionInformation
+public class ProducerSessionInformation implements Serializable
{
private static Logger log = Logger.getLogger(ProducerSessionInformation.class);
@@ -63,7 +64,7 @@
private Cookie[] userCookie;
/** Parent SessionHandler so that session mappings can be updated */
- private SessionHandler parent;
+ private transient SessionHandler parent;
/** The identifier of the Session containing this ProducerSessionInformation */
private String parentSessionId;
@@ -464,7 +465,7 @@
}
}
- private class SessionInfo
+ private class SessionInfo implements Serializable
{
private SessionContext sessionContext;
private long lastInvocationTime;
15 years, 3 months
JBoss Portal SVN: r12725 - in modules/authorization/trunk: enforcement and 1 other directory.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 03:28:10 -0500 (Fri, 30 Jan 2009)
New Revision: 12725
Added:
modules/authorization/trunk/enforcement/
Removed:
modules/authorization/trunk/PEP/
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/enforcement/pom.xml
modules/authorization/trunk/pom.xml
Log:
renaming 'PEP' to 'enforcement'
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-01-30 08:22:30 UTC (rev 12724)
+++ modules/authorization/trunk/.classpath 2009-01-30 08:28:10 UTC (rev 12725)
@@ -7,15 +7,11 @@
<classpathentry kind="src" path="core-components/src/main/java"/>
<classpathentry kind="src" path="core-components/src/main/resources"/>
<classpathentry kind="src" path="core-components/src/test/java"/>
- <classpathentry kind="src" path="core-components/src/test/resources"/>
- <classpathentry kind="src" path="PEP/src/main/java"/>
- <classpathentry kind="src" path="PEP/src/main/resources"/>
- <classpathentry kind="src" path="PEP/src/test/java"/>
- <classpathentry kind="src" path="PEP/src/test/resources"/>
- <classpathentry kind="src" path="PAP/src/main/java"/>
- <classpathentry kind="src" path="PAP/src/main/resources"/>
- <classpathentry kind="src" path="PAP/src/test/java"/>
- <classpathentry kind="src" path="PAP/src/test/resources"/>
+ <classpathentry kind="src" path="core-components/src/test/resources"/>
+ <classpathentry kind="src" path="enforcement/src/main/java"/>
+ <classpathentry kind="src" path="enforcement/src/main/resources"/>
+ <classpathentry kind="src" path="enforcement/src/test/java"/>
+ <classpathentry kind="src" path="enforcement/src/test/resources"/>
<classpathentry kind="src" path="provisioning/src/main/java"/>
<classpathentry kind="src" path="provisioning/src/main/resources"/>
<classpathentry kind="src" path="provisioning/src/test/java"/>
Copied: modules/authorization/trunk/enforcement (from rev 12724, modules/authorization/trunk/PEP)
Property changes on: modules/authorization/trunk/enforcement
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/enforcement/pom.xml
===================================================================
--- modules/authorization/trunk/PEP/pom.xml 2009-01-30 08:22:30 UTC (rev 12724)
+++ modules/authorization/trunk/enforcement/pom.xml 2009-01-30 08:28:10 UTC (rev 12725)
@@ -7,11 +7,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-authz-pep</artifactId>
+ <artifactId>jboss-authz-enforcement</artifactId>
<packaging>jar</packaging>
- <name>JBoss Authorization PEP</name>
+ <name>JBoss Authorization Policy Enforcement Point</name>
<url>http://www.jboss.org</url>
- <description>A Generic PEP (Policy Enforcement Point) component</description>
+ <description>A Generic Policy Enforcement Point Component</description>
<dependencies>
<dependency>
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-01-30 08:22:30 UTC (rev 12724)
+++ modules/authorization/trunk/pom.xml 2009-01-30 08:28:10 UTC (rev 12725)
@@ -12,7 +12,7 @@
<modules>
<module>common</module>
<module>core-components</module>
- <module>PEP</module>
+ <module>enforcement</module>
<module>provisioning</module>
<module>http-authz</module>
<!--
15 years, 3 months
JBoss Portal SVN: r12724 - in modules/authorization/trunk: http-authz and 17 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 03:22:30 -0500 (Fri, 30 Jan 2009)
New Revision: 12724
Added:
modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/
modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/
modules/authorization/trunk/provisioning/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/
Removed:
modules/authorization/trunk/PAP/
modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/
modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/pap/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/pap/plugin/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/pap/policy/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/pap/server/
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/pap/spi/
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/pap/plugin/
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/http-authz/pom.xml
modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java
modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyStore.java
modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java
modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java
modules/authorization/trunk/http-authz/src/test/resources/META-INF/jboss-beans.xml
modules/authorization/trunk/pom.xml
modules/authorization/trunk/provisioning/pom.xml
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsFunction.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsRuleManager.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/EnterprisePolicyFinder.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/NoPermitMeansDeniedAlg.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/RuleCombiningAlgImplies.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/HierarchialPolicy.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/PolicyDeployer.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/EmbeddedBootstrap.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/Server.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyConfig.java
modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyStore.java
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsFunction.java
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRuleManager.java
modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRules.java
Log:
renaming 'PAP' to 'provisioning'
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/.classpath 2009-01-30 08:22:30 UTC (rev 12724)
@@ -16,6 +16,10 @@
<classpathentry kind="src" path="PAP/src/main/resources"/>
<classpathentry kind="src" path="PAP/src/test/java"/>
<classpathentry kind="src" path="PAP/src/test/resources"/>
+ <classpathentry kind="src" path="provisioning/src/main/java"/>
+ <classpathentry kind="src" path="provisioning/src/main/resources"/>
+ <classpathentry kind="src" path="provisioning/src/test/java"/>
+ <classpathentry kind="src" path="provisioning/src/test/resources"/>
<classpathentry kind="src" path="http-authz/src/main/java"/>
<classpathentry kind="src" path="http-authz/src/main/resources"/>
<classpathentry kind="src" path="http-authz/src/test/java"/>
Modified: modules/authorization/trunk/http-authz/pom.xml
===================================================================
--- modules/authorization/trunk/http-authz/pom.xml 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/pom.xml 2009-01-30 08:22:30 UTC (rev 12724)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.jboss.security.authz</groupId>
- <artifactId>jboss-authz-pap</artifactId>
+ <artifactId>jboss-authz-provisioning</artifactId>
<version>${project.version}</version>
</dependency>
Copied: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning (from rev 12723, modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap)
Property changes on: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java
===================================================================
--- modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyConfig.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.http.pap;
+package org.jboss.security.authz.http.provisioning;
import java.io.IOException;
import java.io.ByteArrayInputStream;
@@ -43,8 +43,8 @@
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.Rule;
import org.jboss.security.authz.model.Target;
-import org.jboss.security.authz.pap.policy.HierarchialPolicy;
-import org.jboss.security.authz.pap.spi.PolicyConfig;
+import org.jboss.security.authz.provisioning.policy.HierarchialPolicy;
+import org.jboss.security.authz.provisioning.spi.PolicyConfig;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
Modified: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyStore.java
===================================================================
--- modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyStore.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyStore.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,14 +20,14 @@
* 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.authz.http.pap;
+package org.jboss.security.authz.http.provisioning;
import java.util.Map;
import java.util.HashMap;
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyException;
-import org.jboss.security.authz.pap.spi.PolicyStore;
+import org.jboss.security.authz.provisioning.spi.PolicyStore;
/**
*
Copied: modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning (from rev 12723, modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/pap)
Property changes on: modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java
===================================================================
--- modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/pap/TestHttpPolicyConfig.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyConfig.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,14 +20,15 @@
* 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.authz.http.pap;
+package org.jboss.security.authz.http.provisioning;
import junit.framework.TestCase;
import org.apache.log4j.Logger;
+import org.jboss.security.authz.http.provisioning.HttpPolicyConfig;
import org.jboss.security.authz.model.Policy;
-import org.jboss.security.authz.pap.spi.PolicyConfig;
+import org.jboss.security.authz.provisioning.spi.PolicyConfig;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
Modified: modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java
===================================================================
--- modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/pap/TestHttpPolicyDeployer.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,15 +20,15 @@
* 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.authz.http.pap;
+package org.jboss.security.authz.http.provisioning;
import junit.framework.TestCase;
import org.apache.log4j.Logger;
import org.jboss.security.authz.model.Policy;
-import org.jboss.security.authz.pap.server.Server;
-import org.jboss.security.authz.pap.policy.PolicyDeployer;
+import org.jboss.security.authz.provisioning.policy.PolicyDeployer;
+import org.jboss.security.authz.provisioning.server.Server;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
Modified: modules/authorization/trunk/http-authz/src/test/resources/META-INF/jboss-beans.xml
===================================================================
--- modules/authorization/trunk/http-authz/src/test/resources/META-INF/jboss-beans.xml 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/http-authz/src/test/resources/META-INF/jboss-beans.xml 2009-01-30 08:22:30 UTC (rev 12724)
@@ -4,11 +4,11 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="http://PolicyDeployer" class="org.jboss.security.authz.pap.policy.PolicyDeployer">
+ <bean name="http://PolicyDeployer" class="org.jboss.security.authz.provisioning.policy.PolicyDeployer">
<property name="configuration"><inject bean="http://PolicyConfig"/></property>
<property name="store"><inject bean="http://PolicyStore"/></property>
</bean>
- <bean name="http://PolicyConfig" class="org.jboss.security.authz.http.pap.HttpPolicyConfig"/>
- <bean name="http://PolicyStore" class="org.jboss.security.authz.http.pap.HttpPolicyStore"/>
+ <bean name="http://PolicyConfig" class="org.jboss.security.authz.http.provisioning.HttpPolicyConfig"/>
+ <bean name="http://PolicyStore" class="org.jboss.security.authz.http.provisioning.HttpPolicyStore"/>
</deployment>
\ No newline at end of file
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/pom.xml 2009-01-30 08:22:30 UTC (rev 12724)
@@ -13,7 +13,7 @@
<module>common</module>
<module>core-components</module>
<module>PEP</module>
- <module>PAP</module>
+ <module>provisioning</module>
<module>http-authz</module>
<!--
<module>security-console</module>
Copied: modules/authorization/trunk/provisioning (from rev 12723, modules/authorization/trunk/PAP)
Property changes on: modules/authorization/trunk/provisioning
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/pom.xml
===================================================================
--- modules/authorization/trunk/PAP/pom.xml 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/pom.xml 2009-01-30 08:22:30 UTC (rev 12724)
@@ -7,11 +7,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-authz-pap</artifactId>
+ <artifactId>jboss-authz-provisioning</artifactId>
<packaging>jar</packaging>
- <name>JBoss Authorization PAP</name>
+ <name>JBoss Authorization Provisioning Component</name>
<url>http://www.jboss.org</url>
- <description>A Generic PAP (Policy Administration Point) component</description>
+ <description>A Generic Policy Provisioning Component</description>
<dependencies>
<dependency>
Copied: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin (from rev 12723, modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin)
Property changes on: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsFunction.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin/DroolsFunction.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsFunction.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import java.util.List;
import java.util.ArrayList;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsRuleManager.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin/DroolsRuleManager.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/DroolsRuleManager.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import java.io.InputStreamReader;
import java.io.Reader;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/EnterprisePolicyFinder.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin/EnterprisePolicyFinder.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/EnterprisePolicyFinder.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import org.jboss.security.xacml.sunxacml.finder.PolicyFinderModule;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/NoPermitMeansDeniedAlg.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin/NoPermitMeansDeniedAlg.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/NoPermitMeansDeniedAlg.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import java.util.List;
import java.util.Iterator;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/RuleCombiningAlgImplies.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/plugin/RuleCombiningAlgImplies.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/plugin/RuleCombiningAlgImplies.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import java.util.List;
import java.util.Iterator;
Copied: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy (from rev 12723, modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/policy)
Property changes on: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/HierarchialPolicy.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/policy/HierarchialPolicy.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/HierarchialPolicy.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.policy;
+package org.jboss.security.authz.provisioning.policy;
import java.util.List;
import java.util.Set;
@@ -40,7 +40,7 @@
import org.jboss.security.authz.model.Expression;
import org.jboss.security.authz.xacml.AttributeDesignatorUtil;
import org.jboss.security.authz.xacml.PolicyUtil;
-import org.jboss.security.authz.pap.plugin.NoPermitMeansDeniedAlg;
+import org.jboss.security.authz.provisioning.plugin.NoPermitMeansDeniedAlg;
import org.jboss.security.xacml.core.model.policy.ActionMatchType;
import org.jboss.security.xacml.core.model.policy.SubjectMatchType;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/PolicyDeployer.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/policy/PolicyDeployer.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/policy/PolicyDeployer.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.policy;
+package org.jboss.security.authz.provisioning.policy;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,8 +31,8 @@
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyException;
-import org.jboss.security.authz.pap.spi.PolicyConfig;
-import org.jboss.security.authz.pap.spi.PolicyStore;
+import org.jboss.security.authz.provisioning.spi.PolicyConfig;
+import org.jboss.security.authz.provisioning.spi.PolicyStore;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
Copied: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server (from rev 12723, modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/server)
Property changes on: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/EmbeddedBootstrap.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/server/EmbeddedBootstrap.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/EmbeddedBootstrap.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.server;
+package org.jboss.security.authz.provisioning.server;
import java.net.URL;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/Server.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/server/Server.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/Server.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.server;
+package org.jboss.security.authz.provisioning.server;
import java.net.URL;
Copied: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi (from rev 12723, modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/spi)
Property changes on: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyConfig.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/spi/PolicyConfig.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyConfig.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.spi;
+package org.jboss.security.authz.provisioning.spi;
import org.jboss.security.authz.model.Policy;
Modified: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyStore.java
===================================================================
--- modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/spi/PolicyStore.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/spi/PolicyStore.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.spi;
+package org.jboss.security.authz.provisioning.spi;
import org.jboss.security.authz.model.Policy;
import org.jboss.security.authz.model.PolicyException;
Copied: modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin (from rev 12723, modules/authorization/trunk/PAP/src/test/java/org/jboss/security/authz/pap/plugin)
Property changes on: modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsFunction.java
===================================================================
--- modules/authorization/trunk/PAP/src/test/java/org/jboss/security/authz/pap/plugin/TestDroolsFunction.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsFunction.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import java.io.File;
import java.io.FileOutputStream;
@@ -49,8 +49,8 @@
import org.jboss.security.xacml.sunxacml.ctx.ResponseCtx;
import org.jboss.security.authz.model.*;
-import org.jboss.security.authz.pap.plugin.DroolsFunction;
-import org.jboss.security.authz.pap.policy.HierarchialPolicy;
+import org.jboss.security.authz.provisioning.plugin.DroolsFunction;
+import org.jboss.security.authz.provisioning.policy.HierarchialPolicy;
/**
Modified: modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRuleManager.java
===================================================================
--- modules/authorization/trunk/PAP/src/test/java/org/jboss/security/authz/pap/plugin/TestDroolsRuleManager.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRuleManager.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import junit.framework.TestCase;
@@ -31,7 +31,7 @@
import org.jboss.security.xacml.interfaces.XACMLConstants;
import org.jboss.security.xacml.interfaces.XMLSchemaConstants;
import org.jboss.security.authz.model.*;
-import org.jboss.security.authz.pap.plugin.DroolsRuleManager;
+import org.jboss.security.authz.provisioning.plugin.DroolsRuleManager;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
Modified: modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRules.java
===================================================================
--- modules/authorization/trunk/PAP/src/test/java/org/jboss/security/authz/pap/plugin/TestDroolsRules.java 2009-01-30 08:08:59 UTC (rev 12723)
+++ modules/authorization/trunk/provisioning/src/test/java/org/jboss/security/authz/provisioning/plugin/TestDroolsRules.java 2009-01-30 08:22:30 UTC (rev 12724)
@@ -20,7 +20,7 @@
* 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.authz.pap.plugin;
+package org.jboss.security.authz.provisioning.plugin;
import junit.framework.TestCase;
@@ -31,6 +31,7 @@
import org.jboss.security.xacml.interfaces.XACMLConstants;
import org.jboss.security.xacml.interfaces.XMLSchemaConstants;
import org.jboss.security.authz.model.*;
+import org.jboss.security.authz.provisioning.plugin.DroolsRuleManager;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
15 years, 3 months
JBoss Portal SVN: r12723 - modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 03:08:59 -0500 (Fri, 30 Jan 2009)
New Revision: 12723
Modified:
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java
Log:
starting Policy Enforcement Point (PEP) component
Modified: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java 2009-01-30 07:10:30 UTC (rev 12722)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java 2009-01-30 08:08:59 UTC (rev 12723)
@@ -43,6 +43,7 @@
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------
public Response checkAccess(Request request) throws EnforcementException
{
- return null;
+ Response response = new Response();
+ return response;
}
}
Modified: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java 2009-01-30 07:10:30 UTC (rev 12722)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java 2009-01-30 08:08:59 UTC (rev 12723)
@@ -25,13 +25,74 @@
import java.util.Set;
import java.util.HashSet;
+import org.jboss.security.authz.model.Resource;
+import org.jboss.security.authz.model.Subject;
+import org.jboss.security.authz.model.Action;
+import org.jboss.security.authz.model.Environment;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class Request implements Serializable
{
+ private Set<Resource> resources;
+ private Set<Subject> subjects;
+ private Action action;
+ private Environment environment;
+
public Request()
{
-
+ this.resources = new HashSet<Resource>();
+ this.subjects = new HashSet<Subject>();
}
+
+ public Set<Resource> getResources()
+ {
+ return resources;
+ }
+
+ public void setResources(Set<Resource> resources)
+ {
+ this.resources = resources;
+ }
+
+ public Set<Subject> getSubjects()
+ {
+ return subjects;
+ }
+
+ public void setSubjects(Set<Subject> subjects)
+ {
+ this.subjects = subjects;
+ }
+
+ public Action getAction()
+ {
+ return action;
+ }
+
+ public void setAction(Action action)
+ {
+ this.action = action;
+ }
+
+ public Environment getEnvironment()
+ {
+ return environment;
+ }
+
+ public void setEnvironment(Environment environment)
+ {
+ this.environment = environment;
+ }
+
+ public void addResource(Resource resource)
+ {
+ this.resources.add(resource);
+ }
+
+ public void addSubject(Subject subject)
+ {
+ this.subjects.add(subject);
+ }
}
Modified: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java 2009-01-30 07:10:30 UTC (rev 12722)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java 2009-01-30 08:08:59 UTC (rev 12723)
@@ -22,16 +22,37 @@
package org.jboss.security.authz.enforcement;
import java.io.Serializable;
-import java.util.Set;
-import java.util.HashSet;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class Response implements Serializable
{
+ private boolean accessGranted;
+ private String message;
+
public Response()
{
}
+
+ public boolean isAccessGranted()
+ {
+ return accessGranted;
+ }
+
+ public void setAccessGranted(boolean accessGranted)
+ {
+ this.accessGranted = accessGranted;
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
}
15 years, 3 months
JBoss Portal SVN: r12722 - in modules/authorization/trunk: PEP/src/main/java/org and 8 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-30 02:10:30 -0500 (Fri, 30 Jan 2009)
New Revision: 12722
Added:
modules/authorization/trunk/PEP/src/main/java/org/
modules/authorization/trunk/PEP/src/main/java/org/jboss/
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/EnforcementException.java
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java
modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java
Modified:
modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Resource.java
modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Subject.java
modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java
modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/subject/Identity.java
modules/authorization/trunk/http-authz/pom.xml
Log:
starting Policy Enforcement Point (PEP) component
Added: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/EnforcementException.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/EnforcementException.java (rev 0)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/EnforcementException.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.authz.enforcement;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class EnforcementException extends Exception
+{
+ public EnforcementException()
+ {
+ super();
+ }
+
+ public EnforcementException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public EnforcementException(String message)
+ {
+ super(message);
+ }
+
+ public EnforcementException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Added: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java (rev 0)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/PolicyEnforcementPoint.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -0,0 +1,48 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.authz.enforcement;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class PolicyEnforcementPoint
+{
+ public PolicyEnforcementPoint()
+ {
+
+ }
+
+ public void start()
+ {
+
+ }
+
+ public void stop()
+ {
+
+ }
+ //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ public Response checkAccess(Request request) throws EnforcementException
+ {
+ return null;
+ }
+}
Added: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java (rev 0)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Request.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -0,0 +1,37 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.authz.enforcement;
+
+import java.io.Serializable;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class Request implements Serializable
+{
+ public Request()
+ {
+
+ }
+}
Added: modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java
===================================================================
--- modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java (rev 0)
+++ modules/authorization/trunk/PEP/src/main/java/org/jboss/security/authz/enforcement/Response.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -0,0 +1,37 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, 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.authz.enforcement;
+
+import java.io.Serializable;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class Response implements Serializable
+{
+ public Response()
+ {
+
+ }
+}
Modified: modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Resource.java
===================================================================
--- modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Resource.java 2009-01-30 02:03:58 UTC (rev 12721)
+++ modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Resource.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -23,6 +23,7 @@
package org.jboss.security.authz.model;
import java.util.Set;
+import java.util.HashSet;
/**
@@ -44,7 +45,7 @@
*/
public Resource()
{
-
+ this.attributes = new HashSet<Attribute>();
}
/**
@@ -63,5 +64,11 @@
public void setAttributes(Set<Attribute> attributes)
{
this.attributes = attributes;
- }
+ }
+
+ public void addAttribute(Attribute attribute)
+ {
+ this.attributes.add(attribute);
+ }
}
+
Modified: modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Subject.java
===================================================================
--- modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Subject.java 2009-01-30 02:03:58 UTC (rev 12721)
+++ modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Subject.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -49,7 +49,7 @@
*/
public Subject()
{
-
+ this.attributes = new HashSet<Attribute>();
}
/**
@@ -93,12 +93,7 @@
* @param attribute
*/
public void addAttribute(Attribute attribute)
- {
- if(this.attributes == null)
- {
- this.attributes = new HashSet<Attribute>();
- }
-
+ {
this.attributes.add(attribute);
}
}
Modified: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java
===================================================================
--- modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java 2009-01-30 02:03:58 UTC (rev 12721)
+++ modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -33,6 +33,7 @@
import org.jboss.security.authz.model.Rule;
import org.jboss.security.authz.model.Target;
import org.jboss.security.authz.model.Attribute;
+import org.jboss.security.authz.model.Resource;
import org.jboss.security.authz.tools.GeneralTool;
import org.jboss.security.xacml.interfaces.XACMLConstants;
@@ -165,7 +166,12 @@
}
this.allowedIps.add(allowedIp);
}
- //----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ //-------Services for Policy Creation---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ /**
+ * Creates a Policy Target suggesting that the Policy should apply to this HttpResource
+ *
+ * @param matchAllParameters 'true' = include matching of all the parameters, 'false' = only url matching, parameters are excluded
+ */
public Target getURLTarget(boolean matchAllParameters)
{
if(this.url == null || this.url.trim().length()==0)
@@ -279,4 +285,37 @@
return rule;
}
+ //---------Services for RequestContext Generation------------------------------------------------------------------------------------------------------------------------------
+ /**
+ * Represents the Resource that is currently being accessed
+ *
+ * @return the Resource
+ */
+ public Resource getURLResource()
+ {
+ Resource urlResource = new Resource();
+
+ Attribute attribute = new Attribute();
+ attribute.setUri(XACMLConstants.ATTRIBUTEID_RESOURCE_ID);
+ attribute.setDatatType(XMLSchemaConstants.DATATYPE_STRING);
+ attribute.setValue(this.url);
+ urlResource.addAttribute(attribute);
+
+ if(this.parameters != null && !this.parameters.isEmpty())
+ {
+ Set<String> names = this.parameters.keySet();
+ for(String name: names)
+ {
+ String value = this.parameters.get(name);
+
+ Attribute customAttribute = new Attribute();
+ customAttribute.setUri(name);
+ customAttribute.setDatatType(XMLSchemaConstants.DATATYPE_STRING);
+ customAttribute.setValue(value);
+ urlResource.addAttribute(customAttribute);
+ }
+ }
+
+ return urlResource;
+ }
}
Modified: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/subject/Identity.java
===================================================================
--- modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/subject/Identity.java 2009-01-30 02:03:58 UTC (rev 12721)
+++ modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/subject/Identity.java 2009-01-30 07:10:30 UTC (rev 12722)
@@ -28,6 +28,7 @@
import org.jboss.security.authz.model.ExpressionBuilder;
import org.jboss.security.authz.model.Rule;
import org.jboss.security.authz.model.Target;
+import org.jboss.security.authz.model.Subject;
import org.jboss.security.authz.tools.GeneralTool;
import org.jboss.security.xacml.interfaces.XACMLConstants;
@@ -79,7 +80,7 @@
{
this.authenticationMethod = authenticationMethod;
}
- //------------------------------------------------------------------------------------------------------------------------------------------------------------
+ //--------Services for Policy Generation----------------------------------------------------------------------------------------------------------------------------------------------------
/**
* Creates a Rule to Allow Access to this Identity
*
@@ -199,4 +200,11 @@
return rule;
}
+ //------------Services for RequestContext Generation--------------------------------------------------------------------------------------------------------------------
+ public Subject getIdentitySubject()
+ {
+ Subject subject = new Subject();
+
+ return subject;
+ }
}
Modified: modules/authorization/trunk/http-authz/pom.xml
===================================================================
--- modules/authorization/trunk/http-authz/pom.xml 2009-01-30 02:03:58 UTC (rev 12721)
+++ modules/authorization/trunk/http-authz/pom.xml 2009-01-30 07:10:30 UTC (rev 12722)
@@ -56,11 +56,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
<configuration>
- <includes>
- <!--
- <include>**/TestHttpResource.java</include>
- -->
- <include>**/TestHttpPolicyConfig.java</include>
+ <includes>
</includes>
</configuration>
</plugin>
15 years, 3 months
JBoss Portal SVN: r12721 - in modules/authorization/trunk: PAP/src/test/java/org/jboss/security/authz/pap and 2 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-29 21:03:58 -0500 (Thu, 29 Jan 2009)
New Revision: 12721
Removed:
modules/authorization/trunk/PAP/src/main/java/org/jboss/security/authz/pap/service/
modules/authorization/trunk/PAP/src/test/java/org/jboss/security/authz/pap/service/
Modified:
modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Target.java
modules/authorization/trunk/core-components/
Log:
cleaning up code that is not needed anymore
Modified: modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Target.java
===================================================================
--- modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Target.java 2009-01-29 23:57:48 UTC (rev 12720)
+++ modules/authorization/trunk/common/src/main/java/org/jboss/security/authz/model/Target.java 2009-01-30 02:03:58 UTC (rev 12721)
@@ -29,86 +29,20 @@
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class Target extends BaseObject
-{
- private List<Resource> resources = null;
- private List<Action> actions = null;
- private List<Subject> subjects = null;
- private List<Environment> environments = null;
-
+{
private List<AttributeExpression> resourceMatches = null;
private List<AttributeExpression> actionMatches = null;
private List<AttributeExpression> subjectMatches = null;
private List<AttributeExpression> environmentMatches = null;
public Target()
- {
- this.resources = new ArrayList<Resource>();
- this.actions = new ArrayList<Action>();
- this.subjects = new ArrayList<Subject>();
- this.environments = new ArrayList<Environment>();
-
+ {
this.resourceMatches = new ArrayList<AttributeExpression>();
this.actionMatches = new ArrayList<AttributeExpression>();
this.subjectMatches = new ArrayList<AttributeExpression>();
this.environmentMatches = new ArrayList<AttributeExpression>();
}
- public List<Action> getActions()
- {
- return actions;
- }
-
- public void setActions(List<Action> actions)
- {
- if(actions == null)
- {
- actions = new ArrayList<Action>();
- }
- this.actions = actions;
- }
-
- public List<Environment> getEnvironments()
- {
- return environments;
- }
-
- public void setEnvironments(List<Environment> environments)
- {
- if(environments == null)
- {
- environments = new ArrayList<Environment>();
- }
- this.environments = environments;
- }
-
- public List<Resource> getResources()
- {
- return resources;
- }
-
- public void setResources(List<Resource> resources)
- {
- if(resources == null)
- {
- resources = new ArrayList<Resource>();
- }
- this.resources = resources;
- }
-
- public List<Subject> getSubjects()
- {
- return subjects;
- }
-
- public void setSubjects(List<Subject> subjects)
- {
- if(subjects == null)
- {
- subjects = new ArrayList<Subject>();
- }
- this.subjects = subjects;
- }
-
public List<AttributeExpression> getActionMatches()
{
return actionMatches;
@@ -164,27 +98,7 @@
}
this.subjectMatches = subjectMatches;
}
- //--------------------------------------------------------------------------------------------------------------------------------------------------------
- public void addResource(Resource resource)
- {
- this.resources.add(resource);
- }
-
- public void addSubject(Subject subject)
- {
- this.subjects.add(subject);
- }
-
- public void addAction(Action action)
- {
- this.actions.add(action);
- }
-
- public void addEnvironment(Environment environment)
- {
- this.environments.add(environment);
- }
-
+ //--------------------------------------------------------------------------------------------------------------------------------------------------------
public void addResourceMatch(AttributeExpression resourceMatch)
{
this.resourceMatches.add(resourceMatch);
Property changes on: modules/authorization/trunk/core-components
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 3 months