Author: sohil.shah(a)jboss.com Date: 2009-01-30 17:44:56 -0500 (Fri, 30 Jan 2009) New Revision: 12739 Added: modules/authorization/trunk/policy-server/ modules/authorization/trunk/policy-server/pom.xml modules/authorization/trunk/policy-server/src/ modules/authorization/trunk/policy-server/src/main/ modules/authorization/trunk/policy-server/src/main/java/ modules/authorization/trunk/policy-server/src/main/java/org/ modules/authorization/trunk/policy-server/src/main/java/org/jboss/ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/ modules/authorization/trunk/policy-server/src/main/resources/ modules/authorization/trunk/policy-server/src/test/ modules/authorization/trunk/policy-server/src/test/java/ modules/authorization/trunk/policy-server/src/test/resources/ Removed: modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/pap/ modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/ Modified: modules/authorization/trunk/.classpath modules/authorization/trunk/decision-point/pom.xml modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java modules/authorization/trunk/http-profile/pom.xml modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/EmbeddedBootstrap.java modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java modules/authorization/trunk/pom.xml Log: refactoring/creating the 'policy-server' component Modified: modules/authorization/trunk/.classpath =================================================================== --- modules/authorization/trunk/.classpath 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/.classpath 2009-01-30 22:44:56 UTC (rev 12739) @@ -24,6 +24,10 @@ <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="src" path="policy-server/src/main/java"/> + <classpathentry kind="src" path="policy-server/src/main/resources"/> + <classpathentry kind="src" path="policy-server/src/test/java"/> + <classpathentry kind="src" path="policy-server/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"/> Modified: modules/authorization/trunk/decision-point/pom.xml =================================================================== --- modules/authorization/trunk/decision-point/pom.xml 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/decision-point/pom.xml 2009-01-30 22:44:56 UTC (rev 12739) @@ -19,6 +19,11 @@ <artifactId>jboss-authz-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-enforcement</artifactId> + <version>${project.version}</version> + </dependency> <!-- jboss xacml --> <dependency> Modified: 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 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/decision-point/src/main/java/org/jboss/security/authz/decision/PolicyDecisionPoint.java 2009-01-30 22:44:56 UTC (rev 12739) @@ -21,6 +21,9 @@ */ package org.jboss.security.authz.decision; +import org.jboss.security.authz.enforcement.Request; +import org.jboss.security.authz.enforcement.Response; + /** * This component processes all incoming Authorization requests and responds with a response * @@ -47,4 +50,32 @@ } //------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + /** + * Makes an Authorization Decision + * + * This method is used when the PolicyDecisionPoint runs in-memory with the Application from which the native Enforcement components issue Authorization requests + * + * @param request Authorization Request + * @return response which contains the Authorization Decision + */ + public Response evaluate(Request request) + { + Response response = new Response(); + return response; + } + + /** + * Makes an Authorization Decision + * + * This method is used when the PolicyDecisionPoint is accessed over the network by sending it the appropriate request in XML format + * The XML format used is compliant with the XACML spec + * + * @param xml + * @return response in xml format confirming to the XACML spec + */ + public String evaluate(String xml) + { + String responseXml = null; + return responseXml; + } } Modified: modules/authorization/trunk/http-profile/pom.xml =================================================================== --- modules/authorization/trunk/http-profile/pom.xml 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/http-profile/pom.xml 2009-01-30 22:44:56 UTC (rev 12739) @@ -42,11 +42,18 @@ <artifactId>junit</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <scope>test</scope> - </dependency> + </dependency> + + <dependency> + <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-policy-server</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java =================================================================== --- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/provisioning/TestHttpPolicyDeployer.java 2009-01-30 22:44:56 UTC (rev 12739) @@ -27,8 +27,8 @@ import org.apache.log4j.Logger; import org.jboss.security.authz.model.Policy; +import org.jboss.security.authz.policy.server.Server; 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> Added: modules/authorization/trunk/policy-server/pom.xml =================================================================== --- modules/authorization/trunk/policy-server/pom.xml (rev 0) +++ modules/authorization/trunk/policy-server/pom.xml 2009-01-30 22:44:56 UTC (rev 12739) @@ -0,0 +1,83 @@ +<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-policy-server</artifactId> + <packaging>jar</packaging> + <name>JBoss Authorization Policy Server</name> + <url>http://www.jboss.org</url> + <description>The Central Authorization Policy Server</description> + + <dependencies> + <dependency> + <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-provisioning</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-decision-point</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> + + <!-- jboss microcontainer --> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</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> Copied: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server (from rev 12729, modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server) Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/EmbeddedBootstrap.java =================================================================== --- modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/EmbeddedBootstrap.java 2009-01-30 17:46:15 UTC (rev 12729) +++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/EmbeddedBootstrap.java 2009-01-30 22:44:56 UTC (rev 12739) @@ -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.provisioning.server; +package org.jboss.security.authz.policy.server; import java.net.URL; Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java =================================================================== --- modules/authorization/trunk/provisioning/src/main/java/org/jboss/security/authz/provisioning/server/Server.java 2009-01-30 17:46:15 UTC (rev 12729) +++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java 2009-01-30 22:44:56 UTC (rev 12739) @@ -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.provisioning.server; +package org.jboss.security.authz.policy.server; import java.net.URL; Modified: modules/authorization/trunk/pom.xml =================================================================== --- modules/authorization/trunk/pom.xml 2009-01-30 22:08:26 UTC (rev 12738) +++ modules/authorization/trunk/pom.xml 2009-01-30 22:44:56 UTC (rev 12739) @@ -15,6 +15,7 @@ <module>decision-point</module> <module>enforcement</module> <module>provisioning</module> + <module>policy-server</module> <module>http-profile</module> <!-- <module>security-console</module>