Author: sohil.shah(a)jboss.com Date: 2009-01-29 18:57:48 -0500 (Thu, 29 Jan 2009) New Revision: 12720 Added: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/ modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/ Removed: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/components/ modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/components/ Modified: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java modules/authorization/trunk/http-authz/pom.xml modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyConfig.java Log: moving httpresource to core-components Copied: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http (from rev 12719, modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/components) Modified: modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java =================================================================== --- modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/components/HttpResource.java 2009-01-29 23:12:31 UTC (rev 12719) +++ modules/authorization/trunk/core-components/src/main/java/org/jboss/security/authz/components/http/HttpResource.java 2009-01-29 23:57:48 UTC (rev 12720) @@ -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.components; +package org.jboss.security.authz.components.http; import java.util.Map; import java.util.HashMap; Copied: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http (from rev 12719, modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/components) Property changes on: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http ___________________________________________________________________ Name: svn:mergeinfo + Modified: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java =================================================================== --- modules/authorization/trunk/http-authz/src/test/java/org/jboss/security/authz/http/components/TestHttpResource.java 2009-01-29 23:12:31 UTC (rev 12719) +++ modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java 2009-01-29 23:57:48 UTC (rev 12720) @@ -19,7 +19,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.components; +package org.jboss.security.authz.components.http; import java.util.HashSet; import java.util.Set; @@ -28,11 +28,11 @@ import org.apache.log4j.Logger; -import org.jboss.security.authz.http.components.HttpResource; +import org.jboss.security.authz.components.http.HttpResource; import org.jboss.security.authz.model.Target; import org.jboss.security.authz.model.Policy; import org.jboss.security.authz.model.Rule; -import org.jboss.security.authz.pap.policy.HierarchialPolicy; +import org.jboss.security.authz.test.MockPolicy; /** @@ -49,7 +49,7 @@ Target target = httpResource.getURLTarget(false); - Policy policy = new HierarchialPolicy("testGetURLTargetNoParameters", target, new HashSet<Rule>()); + Policy policy = new MockPolicy("testGetURLTargetNoParameters", target, new HashSet<Rule>()); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -64,7 +64,7 @@ Target target = httpResource.getURLTarget(true); - Policy policy = new HierarchialPolicy("testGetURLTargetWithParameters", target, new HashSet<Rule>()); + Policy policy = new MockPolicy("testGetURLTargetWithParameters", target, new HashSet<Rule>()); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -84,7 +84,7 @@ rules.add(httpResource.getPermittedRolesRule()); rules.add(httpResource.getDeniedRolesRule()); - Policy policy = new HierarchialPolicy("testRoleRules", target, rules); + Policy policy = new MockPolicy("testRoleRules", target, rules); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -106,7 +106,7 @@ rules.add(httpResource.getDeniedRolesRule()); rules.add(httpResource.getAllowedIpsRule()); - Policy policy = new HierarchialPolicy("testIPRules", target, rules); + Policy policy = new MockPolicy("testIPRules", target, rules); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); Modified: modules/authorization/trunk/http-authz/pom.xml =================================================================== --- modules/authorization/trunk/http-authz/pom.xml 2009-01-29 23:12:31 UTC (rev 12719) +++ modules/authorization/trunk/http-authz/pom.xml 2009-01-29 23:57:48 UTC (rev 12720) @@ -21,6 +21,11 @@ </dependency> <dependency> <groupId>org.jboss.security.authz</groupId> + <artifactId>jboss-authz-core-components</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security.authz</groupId> <artifactId>jboss-authz-pap</artifactId> <version>${project.version}</version> </dependency> Modified: modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyConfig.java =================================================================== --- modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyConfig.java 2009-01-29 23:12:31 UTC (rev 12719) +++ modules/authorization/trunk/http-authz/src/main/java/org/jboss/security/authz/http/pap/HttpPolicyConfig.java 2009-01-29 23:57:48 UTC (rev 12720) @@ -39,7 +39,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import org.jboss.security.authz.http.components.HttpResource; +import org.jboss.security.authz.components.http.HttpResource; import org.jboss.security.authz.model.Policy; import org.jboss.security.authz.model.Rule; import org.jboss.security.authz.model.Target;