[jboss-cvs] JBossAS SVN: r79647 - in projects/security/security-jboss-sx/trunk: jbosssx and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 17 11:28:20 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-10-17 11:28:20 -0400 (Fri, 17 Oct 2008)
New Revision: 79647
Added:
projects/security/security-jboss-sx/trunk/jbosssx/src/test/
projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/
projects/security/security-jboss-sx/trunk/jbosssx/src/test/resources/
Removed:
projects/security/security-jboss-sx/trunk/jbosssx/src/test/org/
projects/security/security-jboss-sx/trunk/jbosssx/src/test/resources/
projects/security/security-jboss-sx/trunk/jbosssx/src/tests/
Modified:
projects/security/security-jboss-sx/trunk/.classpath
projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/config/ApplicationPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingConfigEntryHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingModuleEntry.java
projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/ldap/OpenDSUnitTestCase.java
Log:
fix project structure and mapping
Modified: projects/security/security-jboss-sx/trunk/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/.classpath 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/.classpath 2008-10-17 15:28:20 UTC (rev 79647)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="jbosssx/src/main"/>
- <classpathentry excluding="resources/" kind="src" path="jbosssx/src/tests"/>
- <classpathentry kind="src" path="jbosssx/src/tests/resources"/>
- <classpathentry kind="src" path="identity/src/tests"/>
+ <classpathentry kind="src" path="identity/src/main/java"/>
+ <classpathentry kind="src" path="jbosssx/src/test/resources"/>
+ <classpathentry kind="src" path="jbosssx/src/test/java"/>
+ <classpathentry kind="src" path="identity/src/test/java"/>
+ <classpathentry kind="src" path="jbosssx/src/main/java"/>
<classpathentry kind="src" path="acl/src/main/resources"/>
<classpathentry kind="src" path="acl/src/tests/java"/>
<classpathentry kind="src" path="jbosssx/target/generated-sources/javacc"/>
- <classpathentry kind="src" path="identity/src/main"/>
<classpathentry kind="src" path="acl/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
Modified: projects/security/security-jboss-sx/trunk/jbosssx/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/pom.xml 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/pom.xml 2008-10-17 15:28:20 UTC (rev 79647)
@@ -48,14 +48,10 @@
</profile>
</profiles>
<build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
<finalName>${artifactId}</finalName>
- <outputDirectory>target/classes</outputDirectory>
<resources>
<resource>
- <directory>src/main</directory>
+ <directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
@@ -80,14 +76,6 @@
</includes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/tests/resources/</directory>
- </testResource>
- <testResource>
- <directory>src/main</directory>
- </testResource>
- </testResources>
<plugins>
<!-- generate java files from grammar -->
<plugin>
@@ -96,7 +84,7 @@
<version>2.3-jboss-1</version>
<configuration>
<packageName>org/jboss/security/auth/login</packageName>
- <sourceDirectory>src/main</sourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
<isStatic>false</isStatic>
</configuration>
<executions>
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/config/ApplicationPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/config/ApplicationPolicy.java 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/config/ApplicationPolicy.java 2008-10-17 15:28:20 UTC (rev 79647)
@@ -250,6 +250,7 @@
*/
public MappingInfo getMappingInfo(String mappingType)
{
+ mappingType = mappingType.toLowerCase();
MappingInfo bai = null;
ApplicationPolicy ap = this.getBaseApplicationPolicy();
if (ap != null)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingConfigEntryHolder.java 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingConfigEntryHolder.java 2008-10-17 15:28:20 UTC (rev 79647)
@@ -42,7 +42,7 @@
{
private final Map<String,Object> moduleOptions = new HashMap<String,Object>();
String moduleName = null;
- String type = MappingType.ROLE.name();
+ String type = MappingType.ROLE.toString();
public void addChild(QName name, Object value)
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingModuleEntry.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingModuleEntry.java 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/config/MappingModuleEntry.java 2008-10-17 15:28:20 UTC (rev 79647)
@@ -62,7 +62,7 @@
*/
public MappingModuleEntry(String name, Map<String, Object> options)
{
- this(name, options, MappingType.ROLE.name());
+ this(name, options, MappingType.ROLE.toString());
}
/**
Copied: projects/security/security-jboss-sx/trunk/jbosssx/src/test (from rev 79640, projects/security/security-jboss-sx/trunk/jbosssx/src/tests)
Copied: projects/security/security-jboss-sx/trunk/jbosssx/src/test/java (from rev 79646, projects/security/security-jboss-sx/trunk/jbosssx/src/tests/java)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/java/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/config/SecurityConfigurationUnitTestCase.java 2008-10-17 15:28:20 UTC (rev 79647)
@@ -234,7 +234,7 @@
Assert.assertEquals("value4", options.get("aclOption4"));
// Mapping
- MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.name());
+ MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.toString());
assertNotNull("MappingInfo is not null", mappingInfo);
MappingModuleEntry[] mappingEntries = mappingInfo.getMappingModuleEntry();
assertEquals("Invalid number of entries", 1, mappingEntries.length);
@@ -246,7 +246,7 @@
assertEquals("value1", mappingOptions.get("option1"));
// Role Mapping
- mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
+ mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.toString());
assertNotNull("MappingInfo is not null", mappingInfo);
MappingModuleEntry[] mmearr = mappingInfo.getMappingModuleEntry();
assertEquals("Mapping entry length=1", 1, mmearr.length);
@@ -302,20 +302,20 @@
assertEquals("Unexpected number of acl modules", 3, aclInfo.getModuleEntries().size());
// Role Mapping
- MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
+ MappingInfo mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.toString());
assertNotNull("MappingInfo is not null", mappingInfo);
// we expect 2 modules because one has been configured as a mapping of type "role"
assertEquals("2 map modules", 2, mappingInfo.getModuleEntries().size());
// Mapping
- mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.name());
+ mappingInfo = completeConfig.getMappingInfo(MappingType.PRINCIPAL.toString());
assertNotNull("MappingInfo is not null", mappingInfo);
MappingModuleEntry[] mappingEntries = mappingInfo.getMappingModuleEntry();
assertEquals("Invalid number of entries", 2, mappingEntries.length);
assertEquals("org.jboss.test.mapping.MappingModule1", mappingEntries[0].getMappingModuleName());
assertEquals("org.jboss.test.mapping.MappingModule3", mappingEntries[1].getMappingModuleName());
// same test as above: we expect 2 role-mapping modules: 1 from rolemapping and 1 from mapping with type "role".
- mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.name());
+ mappingInfo = completeConfig.getMappingInfo(MappingType.ROLE.toString());
assertNotNull("MappingInfo is not null", mappingInfo);
mappingEntries = mappingInfo.getMappingModuleEntry();
assertEquals("Invalid number of entries", 2, mappingEntries.length);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/ldap/OpenDSUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/java/org/jboss/test/security/ldap/OpenDSUnitTestCase.java 2008-10-17 15:11:42 UTC (rev 79646)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/security/ldap/OpenDSUnitTestCase.java 2008-10-17 15:28:20 UTC (rev 79647)
@@ -35,8 +35,6 @@
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.util.EmbeddedUtils;
-//$Id$
-
/**
* Test Basic OpenDS functionality
* @author Anil.Saldhana at redhat.com
@@ -54,7 +52,7 @@
String baseDir = System.getProperty("user.dir");
String fs = System.getProperty("file.separator");
- String openDSDir = fs + "src" + fs + "tests" + fs + "resources" + fs + "opends" ;
+ String openDSDir = fs + "src" + fs + "test" + fs + "resources" + fs + "opends" ;
public OpenDSUnitTestCase(String name)
{
Copied: projects/security/security-jboss-sx/trunk/jbosssx/src/test/resources (from rev 79646, projects/security/security-jboss-sx/trunk/jbosssx/src/tests/resources)
More information about the jboss-cvs-commits
mailing list