[jboss-cvs] JBossAS SVN: r80225 - in projects/security/security-xacml/trunk: jboss-sunxacml and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 29 16:50:59 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-10-29 16:50:59 -0400 (Wed, 29 Oct 2008)
New Revision: 80225
Modified:
projects/security/security-xacml/trunk/jboss-sunxacml/pom.xml
projects/security/security-xacml/trunk/jboss-xacml-saml/.classpath
projects/security/security-xacml/trunk/jboss-xacml-saml/pom.xml
projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLRequestUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLResponseUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLUnitTestCase.java
projects/security/security-xacml/trunk/jboss-xacml/.classpath
projects/security/security-xacml/trunk/jboss-xacml/pom.xml
projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/interop/rsaconf/InteropUseCasesUnitTestCase.java
projects/security/security-xacml/trunk/parent/pom.xml
projects/security/security-xacml/trunk/pom.xml
Log:
pom changes
Modified: projects/security/security-xacml/trunk/jboss-sunxacml/pom.xml
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/pom.xml 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/pom.xml 2008-10-29 20:50:59 UTC (rev 80225)
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/security/security-xacml/trunk/jboss-xacml/.classpath
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/.classpath 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml/.classpath 2008-10-29 20:50:59 UTC (rev 80225)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/resources"/>
- <classpathentry kind="src" path="src/tests/resources"/>
+ <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/tests/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.4/jaxb-impl-2.1.4.jar"/>
@@ -11,7 +11,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jboss-sunxacml"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.CR2/jboss-javaee-5.0.0.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaxs-api/1.2.0.20070913080910/jboss-jaxs-api-1.2.0.20070913080910.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: projects/security/security-xacml/trunk/jboss-xacml/pom.xml
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/pom.xml 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml/pom.xml 2008-10-29 20:50:59 UTC (rev 80225)
@@ -12,22 +12,16 @@
<url>http://www.jboss.org</url>
<description>JBoss XACML Library</description>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- </plugins>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
-
<dependencies>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -53,31 +47,36 @@
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.1.4</version>
+ <scope>test</scope>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>sun-jaf</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>codehaus-stax</groupId>
<artifactId>stax</artifactId>
<version>1.1.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java 2008-10-29 20:50:59 UTC (rev 80225)
@@ -332,4 +332,4 @@
ClassLoader tcl = SecurityActions.getContextClassLoader();
return tcl.loadClass(fqn);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/interop/rsaconf/InteropUseCasesUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/interop/rsaconf/InteropUseCasesUnitTestCase.java 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/interop/rsaconf/InteropUseCasesUnitTestCase.java 2008-10-29 20:50:59 UTC (rev 80225)
@@ -245,9 +245,9 @@
public void testEmergencyAccess() throws Exception
{
/**
- * The request contains the “pea-001” attribute, which, combined with the
- * absence of the “env:locality” turns on emergency override.
- * If you remove the “pea” from the request, it should turn into a “deny”.
+ * The request contains the �pea-001� attribute, which, combined with the
+ * absence of the �env:locality� turns on emergency override.
+ * If you remove the �pea� from the request, it should turn into a �deny�.
*/
validateCase(getResponse("emergency_access.xml"),
XACMLConstants.DECISION_PERMIT);
@@ -256,9 +256,9 @@
public void testEmergencyAccessDeny() throws Exception
{
/**
- * The request contains the “pea-001” attribute, which, combined with the
- * absence of the “env:locality” turns on emergency override.
- * If you remove the “pea” from the request, it should turn into a “deny”.
+ * The request contains the �pea-001� attribute, which, combined with the
+ * absence of the �env:locality� turns on emergency override.
+ * If you remove the �pea� from the request, it should turn into a �deny�.
*/
validateCase(getResponse("emergency_access_deny.xml"),
XACMLConstants.DECISION_DENY);
Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/.classpath
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/.classpath 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/.classpath 2008-10-29 20:50:59 UTC (rev 80225)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/tests/resources"/>
+ <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/resources"/>
- <classpathentry excluding="resources/" kind="src" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/opensaml/opensaml/2.2.0/opensaml-2.2.0.jar" sourcepath="/M2_REPO/opensaml/opensaml/2.0/opensaml-2.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/opensaml/openws/1.2.0/openws-1.2.0.jar" sourcepath="/M2_REPO/opensaml/openws/1.0/openws-1.0-sources.jar"/>
Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/pom.xml
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/pom.xml 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/pom.xml 2008-10-29 20:50:59 UTC (rev 80225)
@@ -23,7 +23,7 @@
<include>**/**TestCase.java</include>
</includes>
<forkMode>pertest</forkMode>
- <argLine>-Djava.endorsed.dirs=${basedir}/src/tests/resources/endorsed</argLine>
+ <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
</configuration>
@@ -72,11 +72,6 @@
<version>4.1.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
@@ -130,6 +125,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLRequestUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLRequestUnitTestCase.java 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLRequestUnitTestCase.java 2008-10-29 20:50:59 UTC (rev 80225)
@@ -52,7 +52,7 @@
public void testSAMLRequest01_01() throws Exception
{
JBossSAMLRequest samlRequest = new JBossSAMLRequest();
- String loc = "src/tests/resources/test/requests/interop/rsaconf08/XacmlRequest-01-01.xml";
+ String loc = "src/test/resources/test/requests/interop/rsaconf08/XacmlRequest-01-01.xml";
SAMLObject samlObject = samlRequest.getSAMLRequest(loc);
XACMLAuthzDecisionQueryType xacmlRequest = (XACMLAuthzDecisionQueryType)samlObject;
RequestContext requestContext = xacmlRequest.getRequest();
Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLResponseUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLResponseUnitTestCase.java 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLResponseUnitTestCase.java 2008-10-29 20:50:59 UTC (rev 80225)
@@ -49,7 +49,7 @@
public void testSAMLXACMLResponseRead() throws Exception
{
JBossSAMLResponse response = new JBossSAMLResponse();
- SAMLObject samlObject = response.getSAMLResponse("src/tests/resources/saml/samlxacmlresponse.xml");
+ SAMLObject samlObject = response.getSAMLResponse("src/test/resources/saml/samlxacmlresponse.xml");
assertNotNull(samlObject);
//Verify that the xacml response does exist
@@ -64,7 +64,7 @@
public void testRHPDPResponseRead() throws Exception
{
JBossSAMLResponse response = new JBossSAMLResponse();
- SAMLObject samlObject = response.getSAMLResponse("src/tests/resources/saml/rhpdpsamlresponse.xml");
+ SAMLObject samlObject = response.getSAMLResponse("src/test/resources/saml/rhpdpsamlresponse.xml");
assertNotNull(samlObject);
//Verify that the xacml response does exist
Modified: projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLUnitTestCase.java 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/jboss-xacml-saml/src/test/java/org/jboss/test/security/xacml/saml/SAMLXACMLUnitTestCase.java 2008-10-29 20:50:59 UTC (rev 80225)
@@ -49,7 +49,7 @@
PDPConfiguration.installSingleValueAttribute("urn:va:names:xacml:2.0:subject:ien");
JBossSAMLRequest request = new JBossSAMLRequest();
- SAMLObject samlObject = request.getSAMLRequest("src/tests/resources/saml/xacmlrequest.xml");
+ SAMLObject samlObject = request.getSAMLRequest("src/test/resources/saml/xacmlrequest.xml");
assertNotNull(samlObject);
assertTrue(samlObject instanceof XACMLAuthzDecisionQueryType);
XACMLAuthzDecisionQueryType xacmlRequest = (XACMLAuthzDecisionQueryType)samlObject;
@@ -60,7 +60,7 @@
public void testSAMLRequestRead() throws Exception
{
JBossSAMLRequest request = new JBossSAMLRequest();
- SAMLObject samlObject = request.getSAMLRequest("src/tests/resources/saml/samlrequest.xml");
+ SAMLObject samlObject = request.getSAMLRequest("src/test/resources/saml/samlrequest.xml");
assertNotNull(samlObject);
}
}
\ No newline at end of file
Modified: projects/security/security-xacml/trunk/parent/pom.xml
===================================================================
--- projects/security/security-xacml/trunk/parent/pom.xml 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/parent/pom.xml 2008-10-29 20:50:59 UTC (rev 80225)
@@ -19,55 +19,13 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-xacml/trunk</developerConnection>
</scm>
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <directory>src/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/tests/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </testResource>
- </testResources>
<plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- <phase>deploy</phase>
- </execution>
- </executions>
- <configuration>
- <groupId>jboss</groupId>
- <license>lgpl</license>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- <removeArtifactVersion>true</removeArtifactVersion>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/security/security-xacml/tags</tagBase>
+ </configuration>
+ </plugin>
</plugins>
</build>
<repositories>
Modified: projects/security/security-xacml/trunk/pom.xml
===================================================================
--- projects/security/security-xacml/trunk/pom.xml 2008-10-29 20:37:16 UTC (rev 80224)
+++ projects/security/security-xacml/trunk/pom.xml 2008-10-29 20:50:59 UTC (rev 80225)
@@ -19,7 +19,7 @@
<module>jboss-xacml-saml</module>
</modules>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-xacml/tags/2.0.2.GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-xacml/tags/2.0.2.GA</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-xacml/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-xacml/trunk</developerConnection>
</scm>
</project>
More information about the jboss-cvs-commits
mailing list