[jboss-cvs] JBossAS SVN: r58753 - in projects/security/security-jboss-sx/trunk: . src/main/org/jboss/security src/main/org/jboss/security/audit src/main/org/jboss/security/auth/login src/main/org/jboss/security/authorization src/main/org/jboss/security/mapping src/main/org/jboss/security/plugins

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 29 15:04:56 EST 2006


Author: anil.saldhana at jboss.com
Date: 2006-11-29 15:04:53 -0500 (Wed, 29 Nov 2006)
New Revision: 58753

Removed:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthenticationManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthorizationManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/GeneralizedAuthenticationManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/RealmMapping.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityConstants.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityContext.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityDomain.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxy.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxyFactory.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SubjectSecurityManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AbstractAuditProvider.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditEvent.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditLevel.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/LoginConfigInterceptor.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationException.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/PolicyRegistration.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/Resource.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/ResourceKeys.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingContext.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingProvider.java
Modified:
   projects/security/security-jboss-sx/trunk/.classpath
   projects/security/security-jboss-sx/trunk/pom.xml
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditContext.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditManager.java
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java
Log:
SECURITY-25:subproject for jbosssx

Modified: projects/security/security-jboss-sx/trunk/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/.classpath	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/.classpath	2006-11-29 20:04:53 UTC (rev 58753)
@@ -4,11 +4,11 @@
 	<classpathentry kind="src" output="output/test-classes" path="src/tests"/>
 	<classpathentry kind="src" path="target/generated-sources/javacc"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/jboss-mbeans/5.0-SNAPSHOT/jboss-mbeans-5.0-SNAPSHOT.jar"/>
 	<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
 	<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-xacml/sun-xacml/2.0/sun-xacml-2.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jboss/jbossxb/jbossxb/1.0.1.TEST/jbossxb-1.0.1.TEST.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/jbossxb/1.0.0.CR8/jbossxb-1.0.0.CR8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jboss/jboss-security-spi/2.0.0.snapshot/jboss-security-spi-2.0.0.snapshot.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/SNAPSHOT/jboss-j2ee-SNAPSHOT.jar"/>
 	<classpathentry kind="var" path="M2_REPO/jboss/jnpserver/5.0-SNAPSHOT/jnpserver-5.0-SNAPSHOT.jar"/>
 	<classpathentry kind="var" path="M2_REPO/sun-xacml/sunxacml-support/2.0/sunxacml-support-2.0.jar"/>

Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/pom.xml	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,366 +1,344 @@
 <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">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>jboss</groupId>
-	<artifactId>jboss-security</artifactId>
-	<packaging>jar</packaging>
-	<version>2.0.0.snapshot</version>
-	<name>JBoss Security</name>
-	<url>http://labs.jboss.org/portal/jbosssecurity/</url>
-	<description>JBoss Security is a cross cutting project that handles security
-  for the JEMS projects</description>
-	<licenses>
-		<license>
-			<name>lgpl</name>
-			<url>http://repository.jboss.com/licenses/lgpl.txt</url>
-		</license>
-	</licenses>
-	<organization>
-		<name>JBoss Inc.</name>
-		<url>http://www.jboss.org</url>
-	</organization>
-	<repositories>
-		<repository>
-			<id>jboss</id>
-			<name>JBoss Inc. Repository</name>
-			<layout>default</layout>
-			<url>http://repository.jboss.com/maven2/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>jbosspluginrepo</id>
-			<name>jboss plugin repository</name>
-			<url>http://repository.jboss.com/maven2</url>
-			<layout>default</layout>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>Maven Snapshots</id>
-			<url>http://snapshots.maven.codehaus.org/maven2/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>LSU ibiblio</id>
-			<url>http://ibiblio.lsu.edu/main/pub/packages/maven2/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-	</pluginRepositories>
-	<build>
-		<sourceDirectory>src/main</sourceDirectory>
-		<finalName>${artifactId}</finalName>
-		<outputDirectory>output/classes</outputDirectory> 
-		<plugins>
-			<!-- define how we want compilation to take place
-           here, we accept most of the defaults but say that we want the
-           optimization flag set, and define the source and target to be 1.4,
-           these setting will be inherited by child projects -->
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0</version>
-				<configuration>
-					<optimize>true</optimize>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<!-- define that we wish to create src jars -->
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.0</version>
-				<inherited>true</inherited>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- generate java files from grammar -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>javacc-maven-plugin</artifactId>
-				<version>0.6.1.1</version>
-				<configuration>
-					<packageName>org/jboss/security/auth/login</packageName>
-					<sourceDirectory>src/main</sourceDirectory>
-					<isStatic>false</isStatic>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>javacc</goal>
-						</goals>
-						<id>javacc</id>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- handle the retrieval and unpacking of dependencies
-         required for the sar -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>dependency-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack-jboss</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>jboss</groupId>
-									<artifactId>jboss</artifactId>
-									<version>5.0-SNAPSHOT</version>
-									<type>jar</type>
-									<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<jarName>jbossx</jarName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.1</version>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
-			</plugin>  
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>jboss</groupId>
+   <artifactId>jbosssx</artifactId>
+   <packaging>jar</packaging>
+   <version>2.0.0.snapshot</version>
+   <name>JBoss Security Implementation for the JBAS</name>
+   <url>http://labs.jboss.org/portal/jbosssecurity/</url>
+   <description>JBoss Security is a cross cutting project that handles security for the JEMS projects</description>
+    <licenses>
+       <license>
+          <name>lgpl</name>
+          <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+       </license>
+    </licenses>
+    <organization>
+       <name>JBoss Inc.</name>
+       <url>http://www.jboss.org</url>
+    </organization>
+    <repositories>
+       <repository>
+          <id>jboss</id>
+          <name>JBoss Inc. Repository</name>
+          <layout>default</layout>
+          <url>http://repository.jboss.com/maven2/</url>
+          <snapshots>
+             <enabled>true</enabled>
+          </snapshots>
+       </repository>
+     </repositories>
+     <pluginRepositories>
+        <pluginRepository>
+           <id>jbosspluginrepo</id>
+           <name>jboss plugin repository</name>
+           <url>http://repository.jboss.com/maven2</url>
+           <layout>default</layout>
+           <snapshots>
+              <enabled>false</enabled>
+              <updatePolicy>never</updatePolicy>
+           </snapshots>
+         </pluginRepository>
+         <pluginRepository>
+            <id>Maven Snapshots</id>
+            <url>http://snapshots.maven.codehaus.org/maven2/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+          </pluginRepository>
+          <pluginRepository>
+             <id>LSU ibiblio</id>
+             <url>http://ibiblio.lsu.edu/main/pub/packages/maven2/</url>
+             <snapshots>
+                <enabled>true</enabled>
+             </snapshots>
+             <releases>
+                <enabled>false</enabled>
+             </releases>
+          </pluginRepository>
+       </pluginRepositories>
+       <build>
+           <sourceDirectory>src/main</sourceDirectory>
+           <finalName>${artifactId}</finalName>
+           <outputDirectory>output/classes</outputDirectory> 
+           <plugins>
+           <!-- define how we want compilation to take place here, we accept most of the defaults but say that we want the optimization flag set, and define the source and target to be 1.4, these setting will be inherited by child projects -->
+              <plugin>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <version>2.0</version>
+                 <configuration>
+                     <optimize>true</optimize>
+                     <source>1.5</source>
+                     <target>1.5</target>
+                 </configuration>
+               </plugin>
+
+               <!-- define that we wish to create src jars -->
+               <plugin>
+                   <artifactId>maven-source-plugin</artifactId>
+                   <version>2.0</version>
+                   <inherited>true</inherited>
+                   <executions>
+                       <execution>
+                           <goals>
+                               <goal>jar</goal>
+                            </goals>
+                       </execution>
+                   </executions>
+                </plugin>
+
+                <!-- generate java files from grammar -->
+                <plugin>
+                   <groupId>org.codehaus.mojo</groupId>
+                   <artifactId>javacc-maven-plugin</artifactId>
+                   <version>0.6.1.1</version>
+                   <configuration>
+                       <packageName>org/jboss/security/auth/login</packageName>
+                       <sourceDirectory>src/main</sourceDirectory>
+                       <isStatic>false</isStatic>
+                   </configuration>
+                   <executions>
+                      <execution>
+                         <goals>
+                            <goal>javacc</goal>
+                         </goals>
+                         <id>javacc</id>
+                      </execution>
+                   </executions>
+                </plugin>
+         
+                <!-- handle the retrieval and unpacking of dependencies required for the sar -->
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>dependency-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                           <id>unpack-jboss</id>
+                           <phase>process-classes</phase>
+                           <goals>
+                              <goal>unpack</goal>
+                           </goals>
+                           <configuration>
+                               <artifactItems>
+                                 <artifactItem>
+                                    <groupId>jboss</groupId>
+                                    <artifactId>jboss</artifactId>
+                                    <version>5.0-SNAPSHOT</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+                                </artifactItem>
+                              </artifactItems>
+                              <outputDirectory>${project.build.directory}</outputDirectory>
+                              <overWriteReleases>false</overWriteReleases>
+                              <overWriteSnapshots>true</overWriteSnapshots>
+                           </configuration>
+                        </execution>
+                  </executions>
+               </plugin>
+
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-jar-plugin</artifactId>
+                  <executions>
+                      <execution>
+                        <goals>
+                          <goal>jar</goal>
+                        </goals>
+                      </execution>
+                 </executions>
+                 <configuration>
+                   <jarName>jbossx</jarName>
+                 </configuration>
+              </plugin>
+
+              <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+                 <version>2.1</version>
+                 <configuration>
+                    <archive>
+                       <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                 </configuration>
+              </plugin>  
            
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.1</version>
-				<inherited>true</inherited>
-				<executions>
-					<execution>
-						<id>buildjar</id>
-						<phase>package</phase>
-						<configuration>
-							<tasks>
-								<mkdir dir="${basedir}/output/lib"/>
-                                                                     <copy todir="${basedir}/output/classes">
-      <fileset dir="${basedir}/src/main">
-        <include name="org/jboss/security/jacc/*.xml"/>
-      </fileset>
-    </copy>
-								<!-- Define the pattern sets for the spi and the jbosssx impl -->
-								<patternset id="spi-includes">
-									<include name="org/jboss/security/**"/>
-									<exclude name="org/jboss/crypto/**"/>
-									<exclude name="org/jboss/security/audit/providers/**"/>
-									<exclude name="org/jboss/security/auth/**"/>
-									<exclude name="org/jboss/security/authorization/config/**"/>
-									<exclude name="org/jboss/security/authorization/modules/**"/>
-									<exclude name="org/jboss/security/authorization/sunxacml/**"/>
-									<exclude name="org/jboss/security/config/**"/>
-									<exclude name="org/jboss/security/jce/**"/>
-									<exclude name="org/jboss/security/jndi/**"/>
-									<exclude name="org/jboss/security/mapping/config/**"/>
-									<exclude name="org/jboss/security/mapping/providers/**"/>
-									<exclude name="org/jboss/security/jacc/**"/>
-									<exclude name="org/jboss/security/plugins/**"/>
-									<exclude name="org/jboss/security/propertyeditor/**"/>
-									<exclude name="org/jboss/security/ssl/**"/>
-								</patternset>
-								<patternset id="jbosssx-includes">
-									<include name="org/jboss/crypto/**"/>
-									<include name="org/jboss/security/audit/providers/**"/>
-									<include name="org/jboss/security/auth/**"/>
-									<include name="org/jboss/security/authorization/config/**"/>
-									<include name="org/jboss/security/authorization/modules/**"/>
-									<include name="org/jboss/security/authorization/sunxacml/**"/>
-									<include name="org/jboss/security/config/**"/>
-									<include name="org/jboss/security/jce/**"/>
-									<include name="org/jboss/security/jndi/**"/>
-									<include name="org/jboss/security/mapping/config/**"/>
-									<include name="org/jboss/security/mapping/providers/**"/>
-									<include name="org/jboss/security/jacc/**"/>
-									<include name="org/jboss/security/plugins/**"/>
-									<include name="org/jboss/security/propertyeditor/**"/>
-									<include name="org/jboss/security/ssl/**"/>
-								</patternset>
-								<!-- Build the Security SPI -->
-								<jar jarfile="${basedir}/output/lib/jboss-security-spi.jar" manifest="${basedir}/src/etc/default.mf">
-									<fileset dir="${basedir}/output/classes">
-										<patternset refid="spi-includes"/>
-									</fileset>
-                                                      <fileset file="${basedir}/JBossORG-EULA.txt"/>
-								</jar>
-								<!-- Build jbosssx.jar -->
-								<jar jarfile="${basedir}/output/lib/jbosssx.jar" manifest="${basedir}/src/etc/default.mf">
-									<fileset dir="${basedir}/output/classes">
-										<patternset refid="jbosssx-includes"/>
-									</fileset>
-									<fileset dir="${basedir}/src/resources">
-										<include name="dtd/security-policy.dtd"/>
-									</fileset>
-                                                      <fileset file="${basedir}/JBossORG-EULA.txt"/> 
-								</jar>
-								<!-- Build jbosssx-client.jar -->
-								<jar jarfile="${basedir}/output/lib/jbosssx-client.jar" manifest="${basedir}/src/etc/default.mf">
-									<fileset dir="${basedir}/output/classes">
-										<exclude name="META-INF/MANIFEST.MF"/>
-										<!-- HACK -->
-										<include name="org/jboss/crypto/JBossSXProvider.class"/>
-										<include name="org/jboss/crypto/digest/*"/>
-										<include name="org/jboss/security/*"/>
-										<include name="org/jboss/security/auth/callback/*"/>
-										<include name="org/jboss/security/auth/login/*"/>
-										<exclude name="org/jboss/security/auth/login/XMLLoginConfig.class"/>
-										<exclude name="org/jboss/security/auth/login/XMLLoginConfigMBean.class"/>
-										<include name="org/jboss/security/jndi/LoginInitialContextFactory.class"/>
-										<include name="org/jboss/security/jndi/JndiLoginInitialContextFactory.class"/>
-										<include name="org/jboss/security/plugins/PBEUtils.class"/>
-										<include name="org/jboss/security/ssl/ClientSocketFactory.class"/>
-										<include name="org/jboss/security/ssl/RMISSLClientSocketFactory.class"/>
-									</fileset>
-                                                      <fileset file="${basedir}/JBossORG-EULA.txt"/> 
-								</jar>
-								<!-- Build jbosssx-tests.jar -->
-								<mkdir dir="${basedir}/output/test/lib"/>
-								<jar jarfile="${basedir}/output/test/lib/jbosssx-tests.jar" manifest="${basedir}/src/etc/default.mf">
-									<fileset dir="${basedir}/output/classes">
-										<include name="org/jboss/test/TestLoginModule.class"/>
-									</fileset>
-                                                      <fileset file="${basedir}/JBossORG-EULA.txt"/> 
-								</jar>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-j2ee</artifactId>
-			<version>SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-common-core</artifactId>
-			<version>2.0.2.GA</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-logging-spi</artifactId>
-			<version>2.0.2.GA</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-logging-log4j</artifactId>
-			<version>2.0.2.GA</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-j2se</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-system</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-transaction</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jnpserver</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jboss-mbeans</artifactId>
-			<version>5.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jbossxb</artifactId>
-			<version>1.0.0.CR8</version>
-		</dependency>
-		<dependency>
-			<groupId>javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>3.4.GA</version>
-		</dependency>
-            <dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-		</dependency> 
-		<dependency>
-			<groupId>oswego-concurrent</groupId>
-			<artifactId>concurrent</artifactId>
-			<version>1.3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>sun-xacml</groupId>
-			<artifactId>sun-xacml</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>sun-xacml</groupId>
-			<artifactId>sunxacml-support</artifactId>
-			<version>2.0</version>
-		</dependency>
-            <dependency>
-			<groupId>sun-javamail</groupId>
-			<artifactId>mail</artifactId>
-			<version>1.3.1</version>
-		</dependency>
+              <plugin>
+                  <artifactId>maven-antrun-plugin</artifactId>
+                  <version>1.1</version>
+                  <inherited>true</inherited>
+                  <executions>
+                     <execution>
+                        <id>buildjar</id>
+                        <phase>package</phase>
+                        <configuration>
+                          <tasks>
+                            <mkdir dir="${basedir}/output/lib"/>
+                            <copy todir="${basedir}/output/classes">
+                              <fileset dir="${basedir}/src/main">
+                                <include name="org/jboss/security/jacc/*.xml"/>
+                             </fileset>
+                            </copy>
 
-	</dependencies>
+                            <!-- Define the pattern sets for the jbosssx impl -->
+                            <patternset id="jbosssx-includes">
+                               <include name="org/jboss/crypto/**"/>
+                               <include name="org/jboss/security/audit/providers/**"/>
+                               <include name="org/jboss/security/auth/**"/>
+                               <include name="org/jboss/security/authorization/config/**"/>
+                               <include name="org/jboss/security/authorization/modules/**"/>
+                               <include name="org/jboss/security/authorization/sunxacml/**"/>
+                               <include name="org/jboss/security/config/**"/>
+                              <include name="org/jboss/security/jce/**"/>
+                              <include name="org/jboss/security/jndi/**"/>
+                              <include name="org/jboss/security/mapping/config/**"/>
+                              <include name="org/jboss/security/mapping/providers/**"/>
+                              <include name="org/jboss/security/jacc/**"/>
+                              <include name="org/jboss/security/plugins/**"/>
+                              <include name="org/jboss/security/propertyeditor/**"/>
+                             <include name="org/jboss/security/ssl/**"/>
+                           </patternset>
+
+                        <!-- Build jbosssx.jar -->
+                        <jar jarfile="${basedir}/output/lib/jbosssx.jar" manifest="${basedir}/src/etc/default.mf">
+                           <fileset dir="${basedir}/output/classes">
+                              <patternset refid="jbosssx-includes"/>
+                           </fileset>
+                           <fileset dir="${basedir}/src/resources">
+                              <include name="dtd/security-policy.dtd"/>
+                           </fileset>
+                           <fileset file="${basedir}/JBossORG-EULA.txt"/> 
+                        </jar>
+
+                        <!-- Build jbosssx-client.jar -->
+                        <jar jarfile="${basedir}/output/lib/jbosssx-client.jar" manifest="${basedir}/src/etc/default.mf">
+                           <fileset dir="${basedir}/output/classes">
+                              <exclude name="META-INF/MANIFEST.MF"/>
+                              <!-- HACK -->
+                              <include name="org/jboss/crypto/JBossSXProvider.class"/>
+                              <include name="org/jboss/crypto/digest/*"/>
+                              <include name="org/jboss/security/*"/>
+                              <include name="org/jboss/security/auth/callback/*"/>
+                              <include name="org/jboss/security/auth/login/*"/>
+                              <exclude name="org/jboss/security/auth/login/XMLLoginConfig.class"/>
+                              <exclude name="org/jboss/security/auth/login/XMLLoginConfigMBean.class"/>
+                              <include name="org/jboss/security/jndi/LoginInitialContextFactory.class"/>
+                              <include name="org/jboss/security/jndi/JndiLoginInitialContextFactory.class"/>
+                              <include name="org/jboss/security/plugins/PBEUtils.class"/>
+                              <include name="org/jboss/security/ssl/ClientSocketFactory.class"/>
+                              <include name="org/jboss/security/ssl/RMISSLClientSocketFactory.class"/>
+                           </fileset>
+                           <fileset file="${basedir}/JBossORG-EULA.txt"/> 
+                        </jar>
+
+                        <!-- Build jbosssx-tests.jar -->
+                        <mkdir dir="${basedir}/output/test/lib"/>
+                        <jar jarfile="${basedir}/output/test/lib/jbosssx-tests.jar" manifest="${basedir}/src/etc/default.mf">
+                           <fileset dir="${basedir}/output/classes">
+                              <include name="org/jboss/test/TestLoginModule.class"/>
+                           </fileset>
+                           <fileset file="${basedir}/JBossORG-EULA.txt"/> 
+                        </jar>
+                     </tasks>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+   <dependencies>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-j2ee</artifactId>
+         <version>SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-common-core</artifactId>
+         <version>2.0.2.GA</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-logging-spi</artifactId>
+         <version>2.0.2.GA</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-logging-log4j</artifactId>
+         <version>2.0.2.GA</version>
+         <scope>runtime</scope>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-j2se</artifactId>
+         <version>5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-system</artifactId>
+         <version>5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-transaction</artifactId>
+         <version>5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss</artifactId>
+         <version>5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jnpserver</artifactId>
+         <version>5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jboss-security-spi</artifactId>
+         <version>2.0.0.snapshot</version>
+      </dependency>
+      <dependency>
+         <groupId>jboss</groupId>
+         <artifactId>jbossxb</artifactId>
+         <version>1.0.0.CR8</version>
+      </dependency>
+      <dependency>
+         <groupId>javassist</groupId>
+         <artifactId>javassist</artifactId>
+         <version>3.4.GA</version>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>3.8.1</version>
+      </dependency> 
+      <dependency>
+         <groupId>oswego-concurrent</groupId>
+         <artifactId>concurrent</artifactId>
+         <version>1.3.4</version>
+      </dependency>
+      <dependency>
+         <groupId>sun-xacml</groupId>
+         <artifactId>sun-xacml</artifactId>
+         <version>2.0</version>
+      </dependency>
+      <dependency>
+         <groupId>sun-xacml</groupId>
+         <artifactId>sunxacml-support</artifactId>
+         <version>2.0</version>
+      </dependency>
+      <dependency>
+         <groupId>sun-javamail</groupId>
+         <artifactId>mail</artifactId>
+         <version>1.3.1</version>
+      </dependency> 
+   </dependencies>
 </project>

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthenticationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthenticationManager.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthenticationManager.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,105 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-import java.security.Principal;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-
-/** The AuthenticationManager is responsible for validating credentials
- * associated with principals.
- *      
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface AuthenticationManager
-{
-   /** Get the security domain from which the security manager is from. Every
-       security manager belongs to a named domain. The meaning of the security
-       domain name depends on the implementation. Examples range from as fine
-       grained as the name of EJBs to J2EE application names to DNS domain names.
-   @return the security domain name. May be null in which case the security
-       manager belongs to the logical default domain.
-   */
-   String getSecurityDomain();
-
-   /** The isValid method is invoked to see if a user identity and associated
-    credentials as known in the operational environment are valid proof of the
-    user identity. Typically this is implemented as a call to isValid with a
-    null Subject.
-
-    @see #isValid(Principal, Object, Subject)
-
-    @param principal - the user identity in the operation environment 
-    @param credential - the proof of user identity as known in the
-    operation environment 
-    @return true if the principal, credential pair is valid, false otherwise.
-   */
-   public boolean isValid(Principal principal, Object credential);
-
-   /** The isValid method is invoked to see if a user identity and associated
-       credentials as known in the operational environment are valid proof of the
-       user identity. This extends AuthenticationManager version to provide a
-       copy of the resulting authenticated Subject. This allows a caller to
-       authenticate a user and obtain a Subject whose state cannot be modified
-       by other threads associated with the same principal.
-    @param principal - the user identity in the operation environment 
-    @param credential - the proof of user identity as known in the
-    operation environment
-    @param activeSubject - the Subject which should be populated with the
-      validated Subject contents. A JAAS based implementation would typically
-      populate the activeSubject with the LoginContext.login result.
-    @return true if the principal, credential pair is valid, false otherwise.
-   */
-   boolean isValid(Principal principal, Object credential,
-      Subject activeSubject);
-
-   /** Get the currently authenticated subject. Historically implementations of
-    AuthenticationManager isValid methods had the side-effect of setting the
-    active Subject. This caused problems with multi-threaded usecases where the
-    Subject instance was being shared by multiple threads. This is now deprecated
-    in favor of the JACC PolicyContextHandler getContext(key, data) method.
-
-    @deprecated Use the JACC PolicyContextHandler using key "javax.security.auth.Subject.container"
-    @see javax.security.jacc.PolicyContextHandler#getContext(String, Object)
-
-    @return The previously authenticated Subject if isValid succeeded, null if
-        isValid failed or has not been called for the active thread.
-    */
-   Subject getActiveSubject();
-   
-   /**
-    * Trust related usecases may require translation of a principal from another domain
-    * to the current domain
-    * An implementation of this interface may need to do a backdoor contact of the external
-    * trust provider in deriving the target principal 
-    * @param anotherDomainPrincipal Principal that is applicable in the other domain 
-    *                              (Can be null - in which case the contextMap is used
-    *                               solely to derive the target principal)
-    * @param contextMap Any context information (including information on the other domain 
-    *                   that may be relevant in deriving the target principal). Any SAML 
-    *                   assertions that may be relevant can be passed here.
-    * @return
-    */
-   Principal getTargetPrincipal(Principal anotherDomainPrincipal, Map contextMap);
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthorizationManager.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/AuthorizationManager.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., 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; 
-
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.security.authorization.AuthorizationException;
-import org.jboss.security.authorization.Resource;
-
-//$Id$
-
-/**
- *  Generalized Authorization Manager Interface.
- *  <br/><br/>
- *  <b>Replaces the legacy RealmMapping interface</b>
- *  @see org.jboss.security.RealmMapping
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Jan 2, 2006 
- *  @version $Revision$
- */
-public interface AuthorizationManager 
-{ 
-   
-   /**
-    * Authorize a resource
-    * @param resource
-    * @return
-    * @throws AuthorizationException
-    */
-   public int authorize(Resource resource) throws AuthorizationException; 
-  
-   
-   /** Validates the application domain roles to which the operational
-   environment Principal belongs.
-   @param principal the caller principal as known in the operation environment.
-   @param roles The Set<Principal> for the application domain roles that the
-    principal is to be validated against.
-   @return true if the principal has at least one of the roles in the roles set,
-       false otherwise.
-    */
-   public boolean doesUserHaveRole(Principal principal, Set roles); 
-   
-   
-   /** Return the set of domain roles the principal has been assigned.
-   @return The Set<Principal> for the application domain roles that the
-    principal has been assigned.
-    */
-   public Set getUserRoles(Principal principal); 
-   
-   /**
-    * Trust usecases may have a need to determine the roles of the target
-    * principal which has been derived via a principal from another domain
-    * by the Authentication Manager
-    * An implementation of this interface may have to contact a trust provider
-    * for additional information about the principal
-    * @param targetPrincipal Principal applicable in current domain
-    * @param contextMap Read-Only Contextual Information that may be useful for the
-    *             implementation in determining the roles. 
-    * @return
-    */
-   public Group getTargetRoles(Principal targetPrincipal, Map contextMap);
- }

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/GeneralizedAuthenticationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/GeneralizedAuthenticationManager.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/GeneralizedAuthenticationManager.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,38 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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;
- 
-import javax.security.auth.message.config.ServerAuthContext;
- 
-//$Id$
-
-/**
- *  Marker interface that combines the legacy AuthenticationManager 
- *  and the new JASPI (JSR-196) ServerAuthContext interfaces
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Dec 30, 2005 
- *  @version $Revision$
- */
-public interface GeneralizedAuthenticationManager 
-extends SubjectSecurityManager, ServerAuthContext 
-{ 
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/RealmMapping.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/RealmMapping.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/RealmMapping.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,63 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-import java.security.Principal;
-import java.util.Set;
-
-/** The interface for Principal mapping. It defines the mapping from the
-operational environment Principal to the application domain principal via
-the {@link #getPrincipal(Principal) getPrincipal} method. It also defines
-the method for validating the application domain roles to which the operational
-environment Principal belongs via the {@link #getPrincipal(Principal) getPrincipal}
-method.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface RealmMapping
-{
-    /** Map from the operational environment Principal to the application
-     domain principal. This is used by the EJBContext.getCallerPrincipal implentation
-     to map from the authenticated principal to a principal in the application
-     domain.
-    @param principal the caller principal as known in the operation environment.
-    @return the principal 
-    */
-    public Principal getPrincipal(Principal principal);
-
-    /** Validates the application domain roles to which the operational
-    environment Principal belongs.
-    @param principal the caller principal as known in the operation environment.
-    @param roles The Set<Principal> for the application domain roles that the
-     principal is to be validated against.
-    @return true if the principal has at least one of the roles in the roles set,
-        false otherwise.
-     */
-    public boolean doesUserHaveRole(Principal principal, Set roles);
-
-    /** Return the set of domain roles the principal has been assigned.
-    @return The Set<Principal> for the application domain roles that the
-     principal has been assigned.
-     */
-    public Set getUserRoles(Principal principal);
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityConstants.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityConstants.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityConstants.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,104 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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;
-
-//$Id$
-
-/**
- *  Defines Constants for usage in the Security Layer
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Dec 30, 2005 
- *  @version $Revision$
- */
-public interface SecurityConstants
-{
-   /**
-    * Default Application Policy 
-    */
-   String DEFAULT_APPLICATION_POLICY = "other";
-   
-   /**
-    * Default JAAS based Security Domain Context
-    */
-   String JAAS_CONTEXT_ROOT = "java:/jaas";
-   
-   /**
-    * Default JASPI based Security Domain Context
-    */
-   String JASPI_CONTEXT_ROOT = "java:/jbsx";
-   
-   /**
-    * The String option name used to pass in the security-domain 
-    * name the LoginModule was configured in.
-    */
-   String SECURITY_DOMAIN_OPTION = "jboss.security.security_domain";
-
-   /**
-    * Default Authorization Manager context
-    */
-   String AUTHORIZATION_PATH = "java:/authorizationMgr";
-   
-   /**
-    * Default ServerAuthModule that delegates to a Login Module Stack
-    */
-   String JASPI_DELEGATING_MODULE = "org.jboss.security.auth.container.modules.DelegatingServerAuthModule";
-   
-   /**
-    * Default JASPI based secutity manager
-    */
-   String JASPI_AUTHENTICATION_MANAGER = "org.jboss.security.plugins.JASPISecurityManager";
-   
-   /**
-    * Default AuthorizationManager implementation, the AuthorizationManager service uses
-    * 
-    */
-   String DEFAULT_AUTHORIZATION_CLASS = "org.jboss.security.plugins.JBossAuthorizationManager";
-   
-   /**
-    * Message Layers
-    */
-   String SERVLET_LAYER = "HttpServlet";
-   
-   String CONTEXT_ID = "jboss.contextid";
-   
-   /**
-    * Application Policy driving the web authorization layer
-    */
-   String DEFAULT_WEB_APPLICATION_POLICY = "jboss-web-policy";
-   
-   /**
-    * Application Policy driving the ejb authorization layer
-    */
-   String DEFAULT_EJB_APPLICATION_POLICY = "jboss-ejb-policy";
-   
-   
-   /** Policy Context Constants **/
-   String SUBJECT_CONTEXT_KEY = "javax.security.auth.Subject.container";
-   String WEB_REQUEST_KEY = "javax.servlet.http.HttpServletRequest";
-   
-   String ROLES_IDENTIFIER = "Roles";
-   String PRINCIPAL_IDENTIFIER = "Principal";
-   String PRINCIPALS_SET_IDENTIFIER = "PrincipalsSet"; 
-   String DEPLOYMENT_PRINCIPAL_ROLES_MAP = "deploymentPrincipalRolesMap";
-   
-   String SECURITY_CONTEXT = "SecurityContext";
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityContext.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityContext.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,101 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security;
-
-import java.security.Principal;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-
-import org.jboss.security.audit.AuditContext;
-import org.jboss.security.mapping.MappingContext;
- 
-
-/**
- *  Encapsulation of Authentication, Authorization and Role information
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 24, 2006
- */
-public abstract class SecurityContext
-{/*
-   protected static final Logger log = Logger.getLogger(SecurityContext.class);
-   
-   protected boolean trace = log.isTraceEnabled(); 
-   */
-   /**
-    * A map of roles (as a Group) keyed in by securityDomain
-    */
-  /* private ConcurrentHashMap rolesMap = new ConcurrentHashMap();*/
-   
-   public class SubjectInfo
-   {
-      private Principal authenticationPrincipal;
-      private Object authenticationCredential;
-      private Subject authenticatedSubject;
-      
-      public Principal getAuthenticationPrincipal()
-      {
-         return authenticationPrincipal;
-      }
-      
-      public void setAuthenticationPrincipal(Principal authenticationPrincipal)
-      {
-         this.authenticationPrincipal = authenticationPrincipal;
-      }
-      
-      public Object getAuthenticationCredential()
-      {
-         return authenticationCredential;
-      }
-      
-      public void setAuthenticationCredential(Object authenticationCredential)
-      {
-         this.authenticationCredential = authenticationCredential;
-      }
-      
-      public Subject getAuthenticatedSubject()
-      {
-         return authenticatedSubject;
-      }
-      
-      public void setAuthenticatedSubject(Subject authenticatedSubject)
-      {
-         this.authenticatedSubject = authenticatedSubject;
-      } 
-   } 
-   
-   public interface MappingKeyInfo
-   {
-      public final static String ROLE_MAPPING = "RoleMapping";
-      public final static String IDENTITY_MAPPING = "IdentityMapping";
-      public final static String CERTIFICATE_MAPPING = "CertMapping";
-   }
-   
-   public abstract AuthenticationManager getAuthenticationManager();
-    
-   public abstract AuthorizationManager getAuthorizationManager();
-   
-   public abstract Map getData();
-   
-   /**
-    * @see MappingKeyInfo
-    * @param Key Key of the form MappingKeyInfo
-    * @return A Mapping Context configured with providers
-    */
-   public abstract MappingContext getMappingContext(String Key);
-   
-   /**
-    * Return the AuditContext configured for the security domain
-    * @return
-    */
-   public abstract AuditContext getAuditContext();
-   
-   public abstract String getSecurityDomain();
-   
-   public abstract SubjectInfo getSubjectInfo(); 
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityDomain.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityDomain.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityDomain.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-import java.lang.SecurityException;
-import java.security.KeyStore;
-// JSSE key and trust managers
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-
-/** The SecurityDomain interface combines the SubjectSecurityManager and
- RealmMapping interfaces and adds a keyStore and trustStore as well as
- JSSE KeyManagerFactory and TrustManagerFactory accessors for use with SSL/JSSE.
-
- at see java.security.KeyStore
- at see javax.net.ssl.KeyManagerFactory
- at see javax.net.ssl.TrustManagerFactory
-
- * @author  Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface SecurityDomain extends SubjectSecurityManager, RealmMapping
-{
-   /** Get the keystore associated with the security domain */
-   public KeyStore getKeyStore() throws SecurityException;
-   /** Get the KeyManagerFactory associated with the security domain */
-   public KeyManagerFactory getKeyManagerFactory() throws SecurityException;
-
-   /** Get the truststore associated with the security domain. This may be
-    the same as the keystore. */
-   public KeyStore getTrustStore() throws SecurityException;
-   /** Get the TrustManagerFactory associated with the security domain */
-   public TrustManagerFactory getTrustManagerFactory() throws SecurityException;
-   
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxy.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxy.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,73 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-import java.lang.reflect.Method;
-import javax.ejb.EJBContext;
-
-/** An interface describing the requirements for a SecurityInterceptor proxy.
-A SecurityProxy allows for the externalization of custom security checks 
-on a per-method basis for both the EJB home and remote interface methods.
-Custom security checks are those that cannot be described using the
-standard EJB deployment time declarative role based security.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface SecurityProxy
-{
-   /** Inform a proxy of the context in which it is operating.
-    * @param beanHome The EJB remote home interface class
-    * @param beanRemote The EJB remote interface class
-    * @param securityMgr The security manager from the security domain
-    * @throws InstantiationException
-    */
-   public void init(Class beanHome, Class beanRemote, Object securityMgr)
-      throws InstantiationException;
-   /** Inform a proxy of the context in which it is operating.
-    * @param beanHome The EJB remote home interface class
-    * @param beanRemote The EJB remote interface class
-    * @param beanLocalHome The EJB local home interface class, may be null
-    * @param beanLocal The EJB local interface class, may be null
-    * @param securityMgr The security manager from the security domain
-    * @throws InstantiationException
-    */
-   public void init(Class beanHome, Class beanRemote,
-      Class beanLocalHome, Class beanLocal, Object securityMgr)
-      throws InstantiationException;
-    /** Called prior to any method invocation to set the current EJB context.
-    */
-    public void setEJBContext(EJBContext ctx);
-    /** Called to allow the security proxy to perform any custom security
-        checks required for the EJB remote or local home interface method.
-    @param m , the EJB home or local home interface method
-    @param args , the invocation args
-    */
-    public void invokeHome(Method m, Object[] args) throws Exception;
-    /** Called to allow the security proxy to perform any custom security
-        checks required for the EJB remote or local interface method.
-    @param m , the EJB remote or local interface method
-    @param args , the invocation args
-    @param bean, the EJB implementation class instance
-    */
-    public void invoke(Method m, Object[] args, Object bean) throws Exception;
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxyFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxyFactory.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SecurityProxyFactory.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-/** An interface for factories of SecurityProxy objects. It is used
-to create a SecurityProxy from a security delegate object that is
-not a SecurityProxy instance.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface SecurityProxyFactory
-{
-    public SecurityProxy create(Object proxyDelegate);
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SubjectSecurityManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SubjectSecurityManager.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/SubjectSecurityManager.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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;
-
-/** All functionality in this interface is now in the base AuthenticationManager
- interface. This exists only for compatibility.
-
- at author Scott.Stark at jboss.org
- at version $Revision$
-*/
-public interface SubjectSecurityManager extends AuthenticationManager
-{
-
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AbstractAuditProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AbstractAuditProvider.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AbstractAuditProvider.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,23 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security.audit;
-
-/**
- *  Abstract class of Audit Providers.
- *  <p>An audit provider is one that can be used to log audit events in 
- *  a file, a database or any external sink of choice</p>
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 21, 2006
- */
-public abstract class AbstractAuditProvider implements AuditProvider
-{
-   /** 
-    * @see AuditProvider#audit(AuditEvent)
-    */
-   public abstract void audit(AuditEvent auditEvent);
-}

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditContext.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditContext.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -19,7 +19,7 @@
  *  @version $Revision$
  *  @since  Aug 21, 2006
  */
-public class AuditContext
+public class AuditContext implements SecurityAuditManager
 {
    private String securityDomain = null;
    

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditEvent.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditEvent.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditEvent.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,63 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security.audit;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *  Holder of audit information
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 21, 2006
- */
-public class AuditEvent
-{
-   private String auditLevel = AuditLevel.INFO;
-   
-   private Map contextMap = new HashMap();
-   
-   private Exception underlyingException = null;
-   
-   public AuditEvent(String level)
-   {
-      this.auditLevel = level;
-   }
-   
-   public String getAuditLevel()
-   {
-      return this.auditLevel;
-   }
-   
-   public Map getContextMap()
-   {
-      return contextMap;
-   }
-   
-   public void setContextMap(final Map cmap)
-   {
-      this.contextMap = cmap;
-   }
-   
-   public Exception getUnderlyingException()
-   {
-      return underlyingException;
-   }
-
-   public void setUnderlyingException(Exception underlyingException)
-   {
-      this.underlyingException = underlyingException;
-   }
-
-   public String toString()
-   {
-      StringBuilder sbu  = new StringBuilder();
-      sbu.append("[").append(auditLevel).append("]");
-      sbu.append(contextMap);
-      return sbu.toString();
-   }
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditLevel.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditLevel.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditLevel.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,27 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security.audit;
-
-/**
- *  Define the Audit Levels of Severity
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 21, 2006
- */
-public interface AuditLevel
-{
-   /** Denotes situations where there has been a server exception */
-  String ERROR = "Error";
-  
-  /** Denotes situations when there has been a failed attempt */
-  String FAILURE = "Failure";
-  
-  String SUCCESS = "Success";
-  
-  /** Just some info being passed into the audit logs */
-  String INFO = "Info";
-}

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditManager.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/audit/AuditManager.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -16,7 +16,7 @@
  *  @version $Revision$
  *  @since  Aug 22, 2006
  */
-public class AuditManager
+public class AuditManager 
 {
    private static ConcurrentHashMap contexts = new ConcurrentHashMap();
    
@@ -39,5 +39,5 @@
    public static void addAuditContext(String securityDomain, AuditContext ac)
    {
       contexts.put(securityDomain, ac);
-   }
+   } 
 }

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/LoginConfigInterceptor.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/LoginConfigInterceptor.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/auth/login/LoginConfigInterceptor.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,314 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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.auth.login;
-
-import java.net.URL;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.SubDeployerInterceptor;
-import org.jboss.mx.server.Invocation;
-import org.jboss.mx.server.MBeanInvoker;
-
-/** An Interceptor that loads/unloads security domain login configuration
- * using the XMLLoginConfig.loadConfig(URL config) operation.
- * 
- * Based on org.jboss.security.auth.login.DynamicLoginConfig
- * 
- * @see org.jboss.security.auth.login.XMLLoginConfig
- * @see org.jboss.security.auth.login.DynamicLoginConfig
- * 
- * @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
- * @version $Revision$
- */
-public class LoginConfigInterceptor
-   extends SubDeployerInterceptor
-{
-   // Constants -----------------------------------------------------
-   
-   /** The key to use when storing login module configs in DeploymentInfo.context map */
-   public static final String DEPLOYMENT_INFO_CONTEXT_KEY = LoginConfigInterceptor.class.getName();
-   
-   // Private Data --------------------------------------------------
-   
-   /** The JAAS login config file resource to load */
-   private String authConf = "META-INF/login-config.xml";
-   /** The name of the XMLLoginConfig to use to load the login configs */
-   private ObjectName loginConfigService = XMLLoginConfigMBean.OBJECT_NAME;
-   /** The name of the SecurityMgrService to use for cache flushes */
-   private ObjectName securityMgrService;
-   
-   // Constructors --------------------------------------------------
-   
-   /** CTOR
-    * @param invoker - the MBeanInvoker where this interceptor is registered
-    */
-   public LoginConfigInterceptor(MBeanInvoker invoker)
-   {
-      super(LoginConfigInterceptor.class.getName());
-      
-      log.debug("Constructed");
-   }
-
-   // Attributes ----------------------------------------------------
-   
-   /** Set the resource path to the JAAS login configuration file to use.
-    */
-   public void setAuthConfig(String authConf)
-   {
-      this.authConf = authConf;
-      
-      log.debug("setAuthConfig('" + authConf + "')");
-   }
-
-   /** Get the resource path to the JAAS login configuration file to use.
-    */
-   public String getAuthConfig()
-   {
-      return authConf;
-   }
-  
-   /** Set the XMLLoginConfig service to use for loading. This service must
-    * support a String[] loadConfig(URL) operation to load the configurations. 
-    * 
-    * @param serviceName - the XMLLoginConfig service name.
-    */ 
-   public void setLoginConfigService(ObjectName serviceName)
-   {
-      this.loginConfigService = serviceName;
-      
-      log.debug("setLoginConfigService('" + serviceName + "')");      
-   }
-   
-   /** Get the XMLLoginConfig service used for loading.
-    */
-   public ObjectName getLoginConfigService()
-   {
-      return loginConfigService;
-   }
-
-   /** Set the SecurityManagerService used to flush the registered security
-    * domains. This service must support an flushAuthenticationCache(String)
-    * operation to flush the case for the argument security domain. Setting
-    * this triggers the flush of the authentication caches when the service
-    * is stopped.
-    * @param serviceName - the SecurityManagerService service name.
-    */
-   public void setSecurityManagerService(ObjectName serviceName)
-   {
-      this.securityMgrService = serviceName;
-      
-      log.debug("setSecurityManagerService('" + serviceName + "')");            
-   }
-
-   /** Get the SecurityManagerService used to flush the registered security domains.
-    */
-   public ObjectName getSecurityManagerService()
-   {
-      return securityMgrService;
-   }
-
-   // SubDeployerInterceptor overrides ------------------------------
-
-   protected Object create(Invocation invocation, DeploymentInfo di)
-      throws Throwable
-   {
-      // create the security domains, if login-config present
-      try 
-      {
-         createDomains(di);
-      }
-      catch (Exception e)
-      {
-         log.warn("Ignoring exception", e);
-      }
-      
-      // proceed with the call
-      try 
-      {
-         return invokeNext(invocation);
-      }
-      catch (Throwable t)
-      {
-         // if create() fails in the SubDeployer, remove any added domains too!
-         try
-         {   
-            destroyDomains(di);
-         }
-         catch (Exception e)
-         {
-            log.warn("Ignoring exception", e);            
-         }
-         throw t;
-      }
-   }
-
-   protected Object start(Invocation invocation, DeploymentInfo di)
-      throws Throwable
-   {
-      // proceed with the call
-      try 
-      {
-         return invokeNext(invocation);
-      }
-      catch (Throwable t)
-      {
-         // if start() fails in the SubDeployer, remove any added domains too!
-         try
-         {   
-            destroyDomains(di);
-         }
-         catch (Exception e)
-         {
-            log.warn("Ignoring exception", e);            
-         }
-         throw t;
-      }      
-   }
-
-   protected Object stop(Invocation invocation, DeploymentInfo di)
-      throws Throwable
-   {
-      // proceed with the call
-      try 
-      {
-         return invokeNext(invocation);
-      }
-      catch (Throwable t)
-      {
-         // if stop() fails in the SubDeployer, remove any added domains too!
-         try
-         {   
-            destroyDomains(di);
-         }
-         catch (Exception e)
-         {
-            log.warn("Ignoring exception", e);            
-         }
-         throw t;
-      }    
-   }
-   
-   protected Object destroy(Invocation invocation, DeploymentInfo di)
-      throws Throwable
-   {
-      try
-      {
-         // forward the call
-         return invokeNext(invocation);
-      }
-      finally
-      {
-         // remove any added security domains (if any)
-         try
-         {   
-            destroyDomains(di);
-         }
-         catch (Exception e)
-         {
-            log.warn("Ignoring exception", e);            
-         }
-      }
-   }
-   
-   // Private -------------------------------------------------------
-   
-   /**
-    * Creates the security domains, if login-config present
-    */
-   private void createDomains(DeploymentInfo di)
-      throws Exception
-   {
-      // Look for the authConf as resource
-      ClassLoader loader = di.localCl;
-      
-      // can localCl be null?
-      if (loader != null)
-      {
-         URL loginConfig = loader.getResource(authConf);
-         if(loginConfig != null)
-         {
-            // login-config.xml found
-            log.debug("Using JAAS AuthConfig: " + loginConfig.toExternalForm());
-            MBeanServer server = di.getServer();
-            Object[] args = { loginConfig };
-            String[] sig =  { URL.class.getName() };
-            String[] configNames = (String[]) server.invoke(loginConfigService, "loadConfig", args, sig);
-
-            // store the loaded configs in the DeploymentInfo.context map
-            di.context.put(DEPLOYMENT_INFO_CONTEXT_KEY, configNames);
-               
-            int count = configNames == null ? 0 : configNames.length;
-            for(int n = 0; n < count; n ++)
-            {
-               log.debug("Loaded config: "+configNames[n]);
-            }
-         }
-      }
-   }
-   
-   /**
-    * Remove the security domains, if login-config was present
-    * This entails unloading the AuthConf file contents using
-    * the LoginConfigService.
-    */
-   private void destroyDomains(DeploymentInfo di)
-      throws Exception
-   {
-      String[] configNames = (String[]) di.context.get(DEPLOYMENT_INFO_CONTEXT_KEY);
-      
-      if (configNames != null && configNames.length > 0)
-      {
-         di.context.remove(DEPLOYMENT_INFO_CONTEXT_KEY);
-         MBeanServer server = di.getServer();
-         flushAuthenticationCaches(server, configNames);            
-         Object[] args = { configNames };
-         String[] sig =  { configNames.getClass().getName() };
-         server.invoke(loginConfigService, "removeConfigs", args, sig);
-      }
-   }
-   
-
-   /** 
-    * Go through the registered login config names and flush the auth
-    * caches if there is a registered SecurityManagerService.
-    * 
-    * @throws Exception
-    */ 
-   private void flushAuthenticationCaches(MBeanServer server, String[] configNames)
-      throws Exception
-   {
-      if( this.securityMgrService != null && server.isRegistered(securityMgrService))
-      {
-         int count = configNames == null ? 0 : configNames.length;
-         String[] sig = { String.class.getName() };
-         for(int n = 0; n < count; n++)
-         {
-            Object[] args = { configNames[n] };
-            server.invoke(securityMgrService, "flushAuthenticationCache", args, sig);         
-            log.debug("Flushed domain: " + configNames[n]);
-         }
-      }
-   }
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationException.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationException.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/AuthorizationException.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,48 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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.authorization;
-
-import java.security.GeneralSecurityException;
-
-//$Id$
-
-/**
- *  Exception for the Authorization Framework
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Jun 11, 2006 
- *  @version $Revision$
- */
-public class AuthorizationException extends GeneralSecurityException
-{ 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1345277261367748064L;
-
-   public AuthorizationException()
-   {
-      super(); 
-   }
-
-   public AuthorizationException(String msg)
-   {
-      super(msg); 
-   } 
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/PolicyRegistration.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/PolicyRegistration.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/PolicyRegistration.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,69 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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.authorization;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Map;
-
-import org.jboss.security.AuthorizationManager;
-
-//$Id$
-
-/**
- *  Interface to register policies
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Jun 18, 2006 
- *  @version $Revision$
- */
-public interface PolicyRegistration extends AuthorizationManager
-{
-   /**
-    * Register a policy given the location and a context id
-    * @param contextID
-    * @param location location of the Policy File
-    */
-   void registerPolicy(String contextID, URL location);
-   
-   /**
-    * 
-    * Register a policy given a xml based stream and a context id
-    * 
-    * @param contextID
-    * @param stream InputStream that is an XML stream
-    */
-   void registerPolicy(String contextID, InputStream stream);
-   
-   /**
-    * Unregister a policy  
-    * @param contextID Context ID
-    */
-   void deRegisterPolicy(String contextID); 
-   
-   /**
-    * Obtain the registered policy for the context id
-    * @param contextID Context ID
-    * @param contextMap A map that can be used by the implementation
-    *           to determine the policy choice (typically null)
-    */
-   Object getPolicy(String contextID, Map contextMap);
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/Resource.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/Resource.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/Resource.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,46 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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.authorization;
-
-import java.util.Map;
-
-//$Id$
-
-/**
- *  Resource that is subject to Authorization Decisions
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Jun 11, 2006 
- *  @version $Revision$
- */
-public interface Resource
-{
-   // Web Resource
-   String WEB = "web";
-   //EJB Resource
-   String EJB = "ejb";
-   
-   //Get the Layer (Web/EJB etc)
-   public String getLayer();
-   
-   //Return the contextual map
-   public Map getMap(); 
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/ResourceKeys.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/ResourceKeys.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/authorization/ResourceKeys.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,62 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., 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.authorization;
-
-//$Id$
-
-/**
- *  Defines the keys for the Context Map in the Resource
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @since  Jul 17, 2006 
- *  @version $Revision$
- */
-public interface ResourceKeys
-{
-   //Constants for the WEB Layer
-   String WEB_CONTEXT = "web.context"; 
-   String WEB_REQUEST = "web.request";
-   String WEB_RESPONSE = "web.response";
-   String WEB_SECURITY_CONSTRAINTS = "web.constraints"; 
-
-   String HASROLE_PRINCIPAL = "hasRole.Principal";
-   String PRINCIPAL_ROLES = "principal.roles";
-   String SERVLET_NAME = "servletName";
-   String RESOURCE_PERM_CHECK = "resourcePermissionCheck";
-   String USERDATA_PERM_CHECK = "userDataPermissionCheck";
-   
-   //Constants for the EJB Layer
-   String EJB_NAME = "ejb.name";
-   String EJB_METHOD = "ejb.method";
-   String EJB_PRINCIPAL = "ejb.principal";
-   String EJB_METHODINTERFACE = "ejb.methodInterface";
-   String EJB_CODESOURCE = "ejb.codeSource";  
-   String EJB_METHODROLES = "ejb.methodRoles"; 
-   
-   //General Constants
-   String CALLER_SUBJECT = "caller.subject";
-   String AUTHORIZATION_MANAGER = "authorizationManager";
-   String ROLENAME = "roleName";
-   String ROLEREF_PERM_CHECK = "roleRefPermissionCheck";
-   String RUNASIDENTITY = "runAsIdentity"; 
-   String SECURITY_ROLE_REFERENCES = "securityRoleReferences";
-   String SECURITY_CONTEXT_ROLES = "securityContextRoles";
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingContext.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingContext.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,43 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security.mapping;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- *  Generic Context used by the Mapping Framework
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 24, 2006
- */
-public class MappingContext
-{ 
-   private List modules = new ArrayList();
-   
-   public MappingContext(List mod)
-   { 
-      this.modules = mod;
-   }
-   
-   /**
-    * Apply mapping semantics on the passed object
-    * @param obj Read-only Contextual Map
-    * @param mappedObject an object on which mapping will be applied 
-    */
-   public void performMapping(Map obj, Object mappedObject)
-   {
-      int len = modules.size(); 
-      
-      for(int i = 0 ; i < len; i++)
-      {
-         MappingProvider mp = (MappingProvider)modules.get(i);
-         mp.performMapping(obj, mappedObject);
-      } 
-   } 
-}

Deleted: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingProvider.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/MappingProvider.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -1,33 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */ 
-package org.jboss.security.mapping;
-
-import java.util.Map;
-
-/**
- *  A provider with mapping functionality
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Aug 24, 2006
- */
-public interface MappingProvider
-{
-   /**
-    * Initialize the provider with the configured module options
-    * @param options
-    */
-   void init(Map options);
-   
-   /**
-    * Map the passed object
-    * @param map A read-only contextual map that can provide information to the provider
-    * @param mappedObject an Object on which the mapping will be applied 
-    * @throws IllegalArgumentException if the mappedObject is not understood by the 
-    * provider.
-    */
-   void performMapping(Map map, Object mappedObject);
-}

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java	2006-11-29 19:54:45 UTC (rev 58752)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/plugins/JBossSecurityContext.java	2006-11-29 20:04:53 UTC (rev 58753)
@@ -18,9 +18,9 @@
 import org.jboss.security.AuthorizationManager;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;  
-import org.jboss.security.Util;
-import org.jboss.security.audit.AuditContext;
+import org.jboss.security.Util; 
 import org.jboss.security.audit.AuditManager;
+import org.jboss.security.audit.SecurityAuditManager;
 import org.jboss.security.config.ApplicationPolicy;
 import org.jboss.security.config.MappingInfo;
 import org.jboss.security.mapping.MappingContext;
@@ -92,7 +92,7 @@
    /**
     * @see SecurityContext#getAuditContext()
     */
-   public AuditContext getAuditContext()
+   public SecurityAuditManager getAuditManager()
    {
       return AuditManager.getAuditContext(securityDomain);
    }




More information about the jboss-cvs-commits mailing list