Bump antora from 3.2.0-alpha.11 to 3.2.0-alpha.12

--- updated-dependencies: - dependency-name: antora dependency-version: 3.2.0-alpha.12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bump @springio/antora-extensions from 1.14.11 to 1.14.12
2026-07-11 22:00:04 +00:00 · 2026-06-09 05:34:22 -04:00 · 2026-06-09 05:28:41 -04:00 · 2026-05-22 22:17:31 -06:00 · 2026-05-21 13:29:05 -06:00 · 2026-04-17 11:58:12 -06:00
1093 changed files with 1103 additions and 108864 deletions
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="core/src/main/java"/>
-	<classpathentry kind="src" path="core/src/main/resources"/>
-	<classpathentry kind="src" path="core/src/test/java"/>
-	<classpathentry kind="src" path="core/src/test/resources"/>
-	<classpathentry kind="src" path="samples/dms/src/test/java"/>
-	<classpathentry kind="src" path="samples/dms/src/main/resources"/>
-	<classpathentry kind="src" path="samples/dms/src/main/java"/>
-	<classpathentry kind="src" path="samples/dms/src/test/resources"/>
-	<classpathentry kind="src" path="samples/contacts/src/main/java"/>
-	<classpathentry kind="src" path="samples/contacts/src/main/resources"/>
-	<classpathentry kind="src" path="samples/contacts/src/test/java"/>
-	<classpathentry kind="src" path="samples/contacts/src/test/resources"/>
-	<classpathentry kind="src" path="samples/attributes/src/main/java"/>
-	<classpathentry kind="src" path="samples/attributes/src/main/resources"/>
-	<classpathentry kind="src" path="samples/attributes/src/test/java"/>
-	<classpathentry kind="src" path="adapters/cas/src/test/resources"/>
-	<classpathentry kind="src" path="adapters/cas/src/main/resources"/>
-	<classpathentry kind="src" path="adapters/cas/src/main/java"/>
-	<classpathentry kind="src" path="adapters/cas/src/test/java"/>
-	<classpathentry kind="src" path="adapters/catalina/src/main/java"/>
-	<classpathentry kind="src" path="adapters/catalina/src/main/resources"/>
-	<classpathentry kind="src" path="adapters/catalina/src/test/java"/>
-	<classpathentry kind="src" path="adapters/jboss/src/main/java"/>
-	<classpathentry kind="src" path="adapters/jboss/src/test/java"/>
-	<classpathentry kind="src" path="adapters/jetty/src/main/java"/>
-	<classpathentry kind="src" path="adapters/jetty/src/test/java"/>
-	<classpathentry kind="src" path="adapters/resin/src/main/java"/>
-	<classpathentry kind="src" path="adapters/resin/src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="MAVEN_REPO/com.caucho/jars/resin-3.0.9.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-1.2.9.jar" sourcepath="/MAVEN_REPO/org.springframework/src/spring-1.2.9-sources.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-mock-1.2.9.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/aspectj/jars/aspectjrt-1.2.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/casclient-2.0.11.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/cas-2.0.12.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.3.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.8.0.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.8.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/javax.servlet/jars/servlet-api-2.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/tomcat/jars/catalina-4.1.9.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/jetty/jars/org.mortbay.jetty-4.2.22.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-common-3.2.3.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jbosssx-3.2.3.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/net.sf.ehcache/jars/ehcache-1.2.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/javax.servlet/jars/jsp-api-2.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-3.0.3.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar" sourcepath="DIST_BASE/commons-beanutils-1.6.1-src/src/java"/>
-	<classpathentry kind="src" path="samples/contacts-tiger/src/main/java"/>
-	<classpathentry kind="src" path="core-tiger/src/main/java"/>
-	<classpathentry kind="src" path="core-tiger/src/main/resources"/>
-	<classpathentry kind="src" path="core-tiger/src/test/java"/>
-	<classpathentry kind="src" path="core-tiger/src/test/resources"/>
-	<classpathentry kind="src" path="samples/annotations/src/main/java"/>
-	<classpathentry kind="src" path="samples/annotations/src/main/resources"/>
-	<classpathentry kind="src" path="samples/annotations/src/test/java"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.samba.jcifs/jars/jcifs-1.2.6.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.6.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-1.0.1.jar" sourcepath="MAVEN_REPO/jmock/distributions/jmock-1.0.1-src.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/jdbm/jars/jdbm-1.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-log4j12-1.0-rc5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.directory.server/jars/apacheds-core-1.0.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.directory.server/jars/apacheds-core-shared-1.0.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.directory.shared/jars/shared-asn1-0.9.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.apache.directory.shared/jars/shared-ldap-0.9.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/antlr/jars/antlr-2.7.2.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ldapsdk/jars/ldapsdk-4.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/cas-server-3.0.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/net.sourceforge.retroweaver/jars/retroweaver-1.0fcs.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/taglibs/jars/standard-1.0.6.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/commons-attributes/jars/commons-attributes-api-2.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-ldap/1.1.2/spring-ldap-1.1.2.jar"/>
-	<classpathentry kind="output" path="target/eclipseclasses"/>
-</classpath>
@@ -1,7 +0,0 @@
-dist
-target
-build.properties
-*.log
-.clover
-*.keystore
-server-work
@@ -0,0 +1,22 @@
+# EditorConfig for Spring Security
+# see https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.adoc#mind-the-whitespace
+
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[*.{java,xml}]
+indent_style = tab
+indent_size = 4
+charset = utf-8
+continuation_indent_size = 8
+
+ij_smart_tabs = false
+ij_java_align_multiline_parameters = false
+
+[*.gradle]
+indent_style = tab
@@ -0,0 +1,80 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push: # run if we update the workflow
+  workflow_dispatch:
+  schedule:
+    - cron: '39 13 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ubuntu-latest
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: actions
+            build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      # Add any setup steps before running the `github/codeql-action/init` action.
+      # This includes steps like installing compilers or runtimes (`actions/setup-node`
+      # or others). This is typically only required for manual builds.
+      # - name: Setup runtime (example)
+      #   uses: actions/setup-example@v1
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          queries: security-extended,security-and-quality
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:${{matrix.language}}"
@@ -0,0 +1,51 @@
+name: Deploy Docs
+run-name: ${{ format('{0} ({1})', github.workflow, github.event.inputs.build-refname || 'all') }}
+on:
+  workflow_dispatch:
+    inputs:
+      build-refname:
+        description: Enter git refname to build (e.g., 5.7.x).
+        required: false
+  push:
+    branches: docs-build
+env:
+  GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+permissions: read-all
+jobs:
+  build:
+    if: github.repository_owner == 'spring-projects'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 5
+    - name: Set Up Gradle
+      uses: spring-io/spring-gradle-build-action@v2
+      with:
+        # Use JDK 17 since 6.5.x Kotlin version does not support JDK 25 and thus will fail
+        java-version: '17'
+        distribution: temurin
+    - name: Set up refname build
+      if: github.event.inputs.build-refname
+      run: |
+        git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY ${{ github.event.inputs.build-refname }}
+        echo BUILD_REFNAME=${{ github.event.inputs.build-refname }} >> $GITHUB_ENV
+        echo BUILD_VERSION=$(git cat-file --textconv FETCH_HEAD:gradle.properties | sed -n '/^version=/ { s/^version=//;p }') >> $GITHUB_ENV
+    - name: Run Antora
+      run: ./gradlew antora
+    - name: Copy the cache to be included in the site
+      run: cp -rf build/antora/inject-collector-cache-config-extension/.cache build/site/
+    - name: Publish Docs
+      uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.22
+      with:
+        docs-username: ${{ secrets.DOCS_USERNAME }}
+        docs-host: ${{ secrets.DOCS_HOST }}
+        docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }}
+        docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}
+    - name: Bust Clouflare Cache
+      uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.22
+      with:
+        context-root: spring-security
+        cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
+        cloudflare-cache-token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
@@ -0,0 +1,30 @@
+name: Merge Dependabot PR
+
+on: pull_request_target
+
+run-name: Merge Dependabot PR ${{ github.ref_name }}
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  merge-dependabot-pr:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
+    steps:
+
+      - uses: actions/checkout@v6
+        with:
+          show-progress: false
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Merge Dependabot pull request
+        run: gh pr merge ${{ github.event.pull_request.number }} --auto --rebase
+        env:
+          GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
@@ -0,0 +1,13 @@
+/.gradle/
+/.idea/*
+/.settings/
+/.classpath
+/.project
+/build/
+/node_modules/
+/package-lock.json
+/*.iml
+/*.ipr
+/*.iws
+!/.idea/checkstyle-idea.xml
+!/.idea/externalDependencies.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="checkstyle-version" value="8.14" />
+        <entry key="copy-libs" value="false" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnlyWithTests" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalDependencies">
+    <plugin id="CheckStyle-IDEA" />
+    <plugin id="org.jetbrains.plugins.gradle" />
+  </component>
+</project>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>acegisecurity</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
@@ -0,0 +1,6 @@
+# Use sdkman to run "sdk env" to initialize with correct JDK version
+# Enable auto-env through the sdkman_auto_env config
+# See https://sdkman.io/usage#config
+# A summary is to add the following to ~/.sdkman/etc/config
+# sdkman_auto_env=true
+java=17.0.3-tem
@@ -1,57 +0,0 @@
-#Mon Nov 07 22:01:53 EST 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
@@ -1,3 +0,0 @@
-#Mon Nov 07 21:58:48 EST 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
@@ -0,0 +1,478 @@
+= Spring Security Docs Home
+ifndef::env-github[:toc:]
+ifdef::env-github[]
+:important-caption: :exclamation:
+:note-caption: :paperclip:
+endif::[]
+
+This README describes the processes and tools used to build the documentation for production as well as how to generate a local preview of the documentation.
+
+== Overview
+
+The Spring Security reference docs are generated using Antora.
+The Gradle Antora Plugin is used as the primary interface to Antora.
+
+You're viewing the playbook branch for the Spring Security project.
+The playbook branch hosts the docs build used to build and publish the production docs site, and is thus the documentation home base.
+If you're a docs developer, you'll mostly work in this branch.
+If you're a writer, you'll mostly work in software branches.
+
+=== Layout
+
+The playbook branch, named *docs-build*, hosts the primary documentation build.
+The documentation itself is located in a dedicated subproject in each software branch (i.e., the docs are stored alongside the code).
+Software branches, also referred to as release line branches or content branches, follow the pattern `major.minor.x` (e.g., 6.0.x), or `main` for the latest release line.
+Software tags follow the pattern `major.minor.patch` (e.g., 6.0.1).
+The latest version of the docs for each release line is always sourced from a tag.
+The release line branches host the prerelease materials for the next version.
+
+=== Builds
+
+The build for the production site is stored at the root of the playbook branch.
+This branch also holds the search crawler configuration and runner for the production site.
+This build is only needed for building the production site (or for developing and testing the docs build itself).
+The build for each content branch is located in a subproject, typically the folder named _docs_.
+This is the build that authors use to preview the docs for a single version when writing content.
+
+Regardless of how the docs site is built, Antora is configured to run a separate command to compute the version of the docs per git reference.
+This command is run by an Antora extension named Antora Collector.
+Using Collector allows the version of the docs to be maintained centrally in the _gradle.properties_ file in each git reference.
+The command also populates a collection of AsciiDoc attributes that provide access to software versions and resource URLs.
+_The docs build will not work without Collector._
+
+=== UI
+
+The UI is developed in a separate project named https://github.com/spring-io/antora-ui-spring[antora-ui-spring].
+That project generates and publishes a UI bundle, which the docs build refers to using its public bundle URL.
+There is one UI for all versions of the documentation.
+
+The UI only shows the latest version in each release line.
+In order to access other versions that are published, the URL must be known in advance.
+
+[#usage]
+== Usage
+
+To prepare your system for building the documentation, <<prerequisites,install the prerequisites>>, then <<prepare-workspace,prepare your workspace>>.
+Then you can build the documentation in either the main branch or 6.0.x branch.
+
+.Branch checkout instead of worktrees
+[NOTE]
+====
+If you prefer to set up your workspace without worktrees, complete the steps in <<prerequisites,Prerequisites>> and clone the project repository onto your computer.
+Then, check out the desired branch and follow the instructions in each section starting from the `sdk env || sdk env install` step.
+====
+
+[#prerequisites]
+=== Prerequisites (everyone)
+
+These instructions assume you already have basic tools on your system, including bash, zip, unzip, git, and curl.
+In addition to these basic tools, you need https://sdkman.io/install[SDKMAN!] installed so that the correct JDK is set for each branch.
+
+. Open your terminal and enter the following command:
+
+--
+ $ curl -s "https://get.sdkman.io" | bash
+
+This command downloads and installs SDKMAN!
+Once installation is complete, you should see a command displayed in your terminal that will initiate SDKMAN!.
+--
+
+. Copy the command displayed in your terminal and run it.
+In the following command, `$HOME` is the path unique to your computer (e.g., _home/username/.sdkman/bin/sdkman-init.sh_).
+
+ $ source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+You'll use SDKMAN! in the following sections to install and switch to the JDK required for each branch.
+Now you're ready to prepare your workspace.
+
+[#prepare-workspace]
+=== Prepare your workspace (everyone)
+
+Your workspace will be the folder that contains the git worktrees of the project.
+
+. In your terminal, create a directory for the project and then change into that directory.
+
+ $ mkdir spring-security
+ $ cd spring-security
+
+. Clone the project repository and create the worktree for the main branch.
+Then change into the new *main* worktree.
+
+ $ git clone https://github.com/spring-projects/spring-security main
+ $ cd main
+
+. Set up a worktree for the 6.0.x branch by running the following commands:
+
+ $ git worktree add ../6.0.x 6.0.x --track
+
+. Repeat the last step for all release line branches (e.g., 5.8.x, 5.7.x, etc) you intend to work with.
+
+Now you're ready to build the docs in the main or 6.0.x branches.
+
+=== Build the documentation in the main branch (writers)
+
+NOTE: The instructions in this section assume you've completed the steps in <<prepare-workspace>>.
+
+. First, make sure you're in the *main* worktree.
+. Switch to the required JDK using SDKMAN! by running the following command:
+
+--
+ $ sdk env || sdk env install
+
+SDKMAN! will switch to the required JDK, provisioning it first if it isn't already available on your machine.
+--
+
+. Generate the documentation with Antora using the following command:
+
+--
+ $ ./gradlew -PbuildSrc.skipTests=true :spring-security-docs:antora
+
+You can also run this command directly from the _docs_ folder:
+
+ $ cd docs
+ $ ../gradlew -PbuildSrc.skipTests=true antora
+
+This command will build the documentation for the *main* branch.
+The Antora playbook is retrieved by the playbook provider from the *docs-build* branch.
+The retrieved playbook file will be cached as _cached-antora-playbook.yml_.
+--
+
+. Navigate to the local file URI shown in the terminal to view the generated documentation.
+
+=== Build the documentation in the 6.0.x branch (writers)
+
+NOTE: The instructions in this section assume you've completed the steps in <<prepare-workspace>>.
+
+. First, change to the *6.0.x* worktree.
+
+ $ cd ../6.0.x
+
+. Switch to the required JDK using SDKMAN! by running the following command:
+
+--
+ $ sdk env || sdk env install
+
+SDKMAN! will switch to the required JDK, provisioning it first if it isn't already available on your machine.
+--
+
+. Generate the documentation with the following command:
+
+--
+ $ ./gradlew -PbuildSrc.skipTests=true :spring-security-docs:antora
+
+This command will build the documentation for the *6.0.x* branch.
+The Antora playbook is retrieved by the playbook provider from the *docs-build* branch.
+The retrieved playbook file will be cached as _cached-antora-playbook.yml_.
+--
+
+. Navigate to the local file URI shown in the terminal to view the generated documentation.
+
+=== Build the documentation for production (docs developer)
+
+NOTE: The instructions in this section assume you've completed the steps in <<prepare-workspace>>.
+
+To build the project's production site, you'll set up a worktree for the *docs-build* branch of the repository.
+
+. To add a worktree, you have to be in the main worktree.
+In your terminal, change to the *main* worktree if you aren't already in it.
+
+ $ cd ../main
+
+. Run the following command to set up the worktree for the *docs-build* branch.
+Then change into the new _docs-build_ directory.
+
+ $ git worktree add ../docs-build docs-build --track
+ $ cd ../docs-build
+
+. Switch to the required JDK or install it.
+
+ $ sdk env || sdk env install
+
+. Generate the documentation for the project's production site using the following command:
+
+--
+ $ ./gradlew antora
+
+This command will build all of the documentation for the production site from the git repository on GitHub.
+
+(Optional) To build the documentation using the current clone, using any available worktrees, run the following command instead:
+
+ $ ./gradlew antora --playbook local-antora-playbook.yml
+--
+
+. Navigate to the local file URI shown in the terminal to view the generated documentation.
+
+=== Content authoring
+
+We highly recommend relying on the https://intellij-asciidoc-plugin.ahus1.de/docs/users-guide/index.html[IntelliJ AsciiDoc Plugin] while writing.
+It provides assistance and autocompletion for the AsciiDoc syntax, Antora resource IDs, attributes and keys set in the playbook, component version descriptor, etc.
+It also provides single page preview.
+
+Once you've completed your edits, you'll build the branch locally to review and validate the changes.
+*You don't need to build the entire site!*
+*You don't need to create or edit the playbook or gradle.properties file either.*
+Rather, you'll interface with the docs build, and it will automatically set up a playbook for your branch and manage any required extensions, right from the docs subproject in your software (content) branch.
+See <<usage>> to learn how to build the docs.
+
+If the branch you modified has any AsciiDoc or Antora errors, they'll be printed to your terminal.
+Once you've fixed any errors and reviewed your changes, submit a pull request to the relevant software branch.
+If the change applies to multiple versions of the docs, you'll want to submit the pull request to the oldest active software branch.
+The maintainer will then apply that change to each of the release line branches.
+
+== CI workflows
+
+CI workflows are run by GitHub Actions.
+CI workflows are defined in YAML files in the _.github/workflows_ directory.
+The CI workflows in the default (i.e., _main_) branch serve as the primary entry.
+Corresponding CI workflows in a non-default branch may specialize the workflow for that branch.
+However, the CI workflows in non-default branches do not receive all events and often have to be triggered.
+A CI workflow must also be present in the default branch in order for it to appear in the list of workflows in the GitHub Actions web UI.
+
+CI workflows are triggered either by activity, on schedule, by the `gh workflow` call, or manually through the GitHub Actions web UI.
+Scheduled workflows only run on the default branch (i.e., *main*).
+However, a scheduled workflow may trigger a workflow in another branch using the `gh workflow` call.
+Activity on a branch or tag is only picked up by workflows in that reference.
+However, a workflow running in a branch or tag may trigger a workflow in another branch using the `gh workflow` call.
+
+There are two key CI workflows that pertain to the docs:
+
+* Deploy Docs (_.github/workflows/deploy-docs.yml_)
+* Rebuild Search Index (_.github/workflows/rebuild-search-index.yml_)
+
+In both cases, the concrete steps are located in the CI workflow in the *docs-build* branch.
+The CI workflows in the *main* branch only trigger the workflows in the *docs-build* branch.
+
+The production site is only deployed from the CI workflow in the *docs-build* branch.
+Often times, activity in a git reference or a scheduled workflow will trigger the CI workflow in the *docs-build* branch.
+Thus, this workflow is also present in each software branch to pick up on that activity.
+
+The production search index is built from the CI workflow in the *docs-build* branch.
+This CI workflow is triggered once per day by the scheduler on the same workflow in the *main* branch.
+This CI workflow must reside in the *main* branch in order to appear in the list of workflows in the CI branch so it can be triggered manually.
+
+Here's a list of activity that does and does not trigger the Deploy Docs workflow:
+
+pull request:: Does not trigger the Deploy Docs workflow.
+
+push to software branch:: Triggers the Deploy Docs workflow in that branch, which in turn triggers the Deploy Docs workflow in the *docs-build* branch.
+Attempts to run the docs build as partial build, if applicable.
+
+push to docs-build branch:: Triggers the Deploy Docs workflow in that branch.
+Runs the docs build as a full build.
+
+push tag:: Triggers the Deploy Docs workflow in that tag, which in turn triggers the Deploy Docs workflow in the *docs-build* branch.
+Always runs the docs build as a full build.
+
+schedule:: Not configured for the Deploy Docs workflow.
+
+It's possible to trigger the Deploy Docs manually from the GitHub Actions web UI.
+Be sure to select docs-build as the branch so that it will run a full build.
+See <<trigger>> for details.
+
+Note that updating the UI bundle does not currently trigger the Deploy Docs workflow, though it could be configured to do so.
+
+The Rebuild Search Index workflow is only triggered on a schedule, currently once per day.
+
+== Publishing
+
+The project in the *docs-build* branch supports publishing both full and partial builds of the production docs site.
+The project uses a Gradle build to run Antora on the playbook file _antora-playbook.yml_ (i.e., `./gradlew antora`).
+The production docs site is hosted on Linux server running Apache httpd.
+Files are published over SSH to the server by the .github/actions/publish-docs.sh script.
+A CDN (CloudFlare) caches URLs for a brief window of time.
+The publish script attempts to invalidate the cache after publishing the files so new content is available immediately.
+
+=== Full build
+
+In a full build, the entire site is rebuilt from the content sources matched by the patterns listed in the playbook file.
+The UI assets are also published when a full build is run.
+
+[#partial-builds]
+=== Partial builds
+
+A partial build is a single version sources from a single git reference.
+A partial build requested by git reference using the CI workflow variable *build-refname*.
+Here's an example of how to trigger the CI workflow for a partial build:
+
+ $ gh workflow run deploy-docs.yml --repo spring-projects/spring-security --ref docs-build -f build-refname=5.7.x
+
+The partial build is coordinated by the Antora Atlas extension and set up by the @springio/antora-extensions/partial-build-extension extension.
+See https://github.com/spring-io/antora-extensions#partial-build[Partial Build] for a detailed explanation of the partial build extension and how to configure it.
+
+During a partial build, Atlas runs in same site mode, which means it creates relative links (rather than absolute links) to files imported from the site manifest.
+This feature assumes that the built files will be reunited with the previously built files in the published site.
+The @springio/antora-extensions/partial-build-extension reconfigures the playbook to run a partial build if the BUILD_REFNAME environment variable is set, reverting to a full build if it determines a partial build is not appropriate.
+
+During a partial build, only the version folder that was built is published to the web server.
+Files in other folders are untouched.
+The UI assets are not published when a partial build is run.
+
+[#trigger]
+=== Trigger the documentation build workflow (docs developer)
+
+You can trigger the production document build using the Deploy Docs entry in the GitHub Actions web UI or using the https://cli.github.com/[GitHub CLI].
+
+==== GitHub Actions web UI
+
+. In the GitHub Actions web UI, click the Deploy Docs entry.
+. Click on the "Run workflow" menu.
+.. *To trigger full build*, select the *docs-build* branch and click "Run workflow".
+.. *To trigger a partial build*, specify a release line branch name in the input field labeled "Enter git refname to build" and click "Run workflow".
+
+==== GitHub CLI
+
+*To trigger full build*, start from within the cloned repository (ideally the playbook branch) and enter the `gh` command and options in the GitHub CLI:
+
+ $ gh workflow run deploy-docs.yml --ref docs-build
+
+*To trigger a partial build*, enter the `gh` command and options to build a single version (based on the release line branch name):
+
+ $ gh workflow run deploy-docs.yml --ref docs-build -f build-refname=5.7.x
+
+Run `gh help workflow run` to show the docs for this command and other examples of how to use it.
+
+If you're not running the `gh` command from within the cloned repository, you can specify the repository using the `--repo` CLI option (e.g., `--repo spring-projects/spring-security`).
+
+== Extensions
+
+The Spring Security docs have additional requirements above what Antora provides by default.
+To fulfill these requirements, the docs build employs a handful of Antora and Asciidoctor extensions to build successfully.
+You can't build the Spring Security docs using the base distribution of Antora.
+Fortunately, this extra complexity is encapsulated in the Antora playbook and several distributed extensions.
+
+IMPORTANT: The order of Antora extensions in the playbook matters.
+If the order is changed, it could result in files or metadata that an extension relies on not being available at the time it runs.
+
+For the most part, the extensions are retrieved from the npm package registry (npmjs.com).
+There are also several local extensions in _lib/antora/extensions_.
+The local extensions handle logic specific to this project and are only used for the production build.
+
+Below is a summary of the Antora and Asciidoctor extensions used in the docs build.
+
+=== Antora extensions
+
+@springio/antora-extensions/partial-build-extension (prod only):: Configures a partial build, when requested, by setting the `primary-site-url` and `primary-site-manifest-url` AsciiDoc attributes.
+See <<partial-builds>> for more information.
+./lib/antora/extensions/inject-collector-config.js (prod only):: Injects configuration for Antora Collector into tags that predated Antora Collector being introduced.
+See the next extension for details.
+@antora/collector-extension:: Invokes a command (a Gradle task) to set the docs version from _gradle.properties_ and numerous AsciiDoc attributes that provide access to software versions and resource URLs.
+The command that Antora Collector runs is essential for Antora to classify the docs properly.
+./lib/antora/extensions/version-fix.js (prod only):: Fixes invalid metadata in _antora.yml_ and/or _gradle.properties_ in tags.
+@antora/atlas-extension (prod only):: Generates the site manifest (_site-manifest.json_) and publishes it with the site.
+Also coordinates the partial build when requested.
+See <<partial-builds>> for details.
+@opendevise/antora-release-line-extension:: Abbreviates the version segment (in the URL) of the latest version in each release line from major.minor.patch to major.minor.
+The version segment of the latest overall version is still abbreviated to empty string by Antora.
+@springio/antora-extensions/tabs-migration-extension:: Migrates the tabs syntax from Spring Tabs to Asciidoctor Tabs.
+See <<tabs-migration>> for details.
+./lib/antora/extensions/publish-docsearch-config.js (prod only):: Publishes the docsearch config file to the production site so the indexer can use it.
+See <<search>> for details.
+
+=== Asciidoctor extensions
+
+@asciidoctor/tabs:: Enables the tabs block in AsciiDoc.
+See <<tabs-migration>> and the https://github.com/asciidoctor/asciidoctor-tabs[Asciidoctor Tabs README] for details.
+@springio/asciidoctor-extensions (prod only):: Provides various enhancements to the output generated by Asciidoctor, mostly around code blocks.
+See https://github.com/spring-io/asciidoctor-extensions[Spring.io Asciidoctor Extensions] for an inventory of extensions and how to activate and configure them.
+
+[#tabs-migration]
+== Tabs migration
+
+The Spring Security docs contain two variations of the tabs syntax, https://github.com/spring-io/spring-asciidoctor-backends#tabs[Spring Tabs] and https://github.com/asciidoctor/asciidoctor-tabs[Asciidoctor Tabs].
+Moving forward, Asciidoctor Tabs is the syntax that should be used.
+However, since the Spring Security docs include content from tags that were written before Asciidoctor Tabs was introduced, the docs build must still be able to process the Spring Tabs syntax where it is used.
+
+When the docs build runs, the Spring Tabs are automatically converted to Asciidoctor Tabs by the @springio/antora-extensions/tabs-migration-extension extension.
+Spring Tabs are never in the final output (unless the tabs migration extension is switched off).
+This extension also has the ability to unwrap the example block that encloses adjacent tabs, when possible, so only the tabs block remains.
+If Spring Tabs are not detected in a document, the migration will not run on that document.
+See https://github.com/spring-io/antora-extensions#tabs-migration[Tabs Migration] for a detailed explanation of this extension and how to configure it.
+
+For the Spring Security docs, the tabs migration will always have to be used as long as there are tags in the build that contain Spring Tabs.
+However, to reduce the amount of work the tabs migration extension has to do, the migration should be made permanent where possible.
+Thus, we recommend making the migration permanent in release line branches that are active, and thus all future tags.
+
+Saving the result of the tabs migration is done one software branch at a time.
+To start, switch to a branch and run the docs build in that branch (this will retrieve the Antora playbook).
+Next, edit the _cached-antora-playbook.yml_ file and add `save: true` underneath the key `unwrap_example_block`.
+This setting will save the migrated files back to their original location under the _docs_ folder.
+Run the docs build in that branch again to apply the tabs migration.
+Now commit the changed files.
+Once that's done, the tabs migration won't have to run on any documents in that branch.
+
+[#search]
+== Search
+
+The search component in the docs site is powered by Algolia DocSearch (specifically 2.6).
+DocSearch is a documentation-oriented toolchain for using Algolia's search solution.
+It provides both a crawler (aka scraper or indexer) and a search interface.
+The search index is hosted on the Algolia platform and queried from the search interface via a web API.
+
+=== Client
+
+The search interface is integrated into the UI bundle and initialized when the page loads.
+The search interface is configured using a collection of environment variables: `ALGOLIA_API_KEY`, `ALGOLIA_APP_ID`, and `ALGOLIA_INDEX_NAME`.
+For now, these environment variables are defined in _build.gradle_ for the production build.
+The search interface is only activated when all of these values are set.
+
+NOTE: The docsearch.js 2.6 package is marked as deprecated in npmjs.com.
+However, the new client (@docsearch/js 3.x) has a completely different interaction model and search result display that's not compatible with customized client adapter currently in use.
+In other words, switching to it means developing the customizations from scratch.
+Even if that were to be done, the way the new client displays search results is over simplified.
+The search results provided by docsearch.js 2.6 have proven to be clearer and easier to comprehend.
+
+=== Crawler
+
+The search index is created by the crawler component of DocSearch.
+There are two steps involved.
+First, the crawler must be configured.
+Second, the crawler must be run with that configuration.
+
+==== Configure
+
+The behavior of the crawler is configured by a file name _docsearch-config.json_.
+However, this file is not stored directly in the playbook branch.
+Rather, it's generated from a template to account for the versions in the published site.
+
+The generation of the _docsearch-config.js_ file happens during the production build.
+This file is generated by the Antora extension _lib/antora/extensions/publish-docsearch-config.js_.
+The extension generates a docsearch config so that docsearch indexes the latest version in each release line.
+To do so, the extension configures Handlebars to run using a model derived from information in Antora's content catalog.
+It then evaluates the template at _.github/actions/docsearch-config.json.hbs_ to produce a file at the root of the generated site named _docsearch-config.js_.
+That file is published as part of the site.
+
+==== Run
+
+The crawler is periodically run on the production site by the *Rebuild Search Index* workflow.
+The crawler creates a fresh search index and replaces the previous one.
+The name of the index is *spring-security-docs*.
+
+When the crawler runs, it downloads the _docsearch-config.json_ file from the production site and runs the docsearch action on it.
+
+NOTE: The crawler only needs to be run on files that are publicly accessible, so it makes sense that the configuration be located there too.
+
+In order to publish the search records (and thus create the index), the crawler must be configured using a collection of variables: `ALGOLIA_APPLICATION_ID` and `ALGOLIA_WRITE_KEY`.
+These variables must be configured as secrets in GitHub Actions.
+The index name is not required here as it is stored in the docsearch config file.
+
+
+
+== Maintenance
+
+The docs build requires regular maintenance.
+Here's an inventory of the files or software versions to check and keep up to date.
+
+.Playbook branch (i.e., *docs-build*)
+* Gradle Antora Plugin (_build.gradle_)
+* GitHub Actions libraries (_.github/workflows/deploy-docs.yml_, _.github/workflows/rebuild-search-index.yml_)
+* Java version (_.sdkmanrc_)
+* Node.js packages (_build.gradle_ and _lib/antora/templates/per-branch-antora-playbook.yml_)
+* Gradle Wrapper (_gradle/wrapper/gradle-wrapper.properties_)
+* Content sources in playbook (_antora-playbook.yml_ and _local-antora-playbook.yml_; ideally use patterns to minimize maintenance)
+* List of registered extensions (_antora-playbook.yml_, _local-antora-playbook.yml_, and _lib/antora/templates/per-branch-antora-playbook.yml_)
+
+.Content branches (e.g., *6.0.x*)
+* Gradle Antora Plugin (_docs/spring-security-docs.gradle_)
+* GitHub Actions libraries (_.github/workflows/deploy-docs.yml_, _.github/workflows/rebuild-search-index.yml_)
+
+Recall that the playbook used for the local docs preview in content branches is maintained in the *docs-build* branch in _lib/antora/templates/per-branch-antora-playbook.yml_.
@@ -1,205 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
-->
-
-<module name="Checker">
-
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <!-- module name="PackageHtml"/ -->
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-
-    <module name="TreeWalker">
-
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-<!--
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-->
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName">
-            <!-- logger variables break normal constant syntax. We need to allow lower case too -->
-            <property name="format" value="^[a-zA-Z][a-zA-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Checks for Headers                                -->
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
-        <!-- <module name="Header">                            -->
-            <!-- The follow property value demonstrates the ability     -->
-            <!-- to have access to ANT properties. In this case it uses -->
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
-            <!-- from any directory within a project. See property      -->
-            <!-- expansion,                                             -->
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
-            <!-- <property                                              -->
-            <!--     name="headerFile"                                  -->
-            <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_imports.html -->
-        <module name="AvoidStarImport">
-            <property name="excludes" value="javax.servlet,java.util"/>
-        </module>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <!--module name="UnusedImports"/ -->
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
-        <module name="LineLength">
-            <property name="max" value="125"/>
-        </module>
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
-        <module name="WhitespaceAfter"/>
-      <!--
-        <module name="WhitespaceAround">
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyConstructors" value="true"/>
-        </module>
-        -->
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <!-- module name="EmptyBlock"/ -->
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- module name="AvoidInlineConditionals"/ -->
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
-        <module name="EmptyStatement"/>
-        <!-- module name="EqualsHashCode"/ -->
-      <!--
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module>
-        -->
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <!-- module name="MagicNumber"/ -->
-        <module name="MissingSwitchDefault"/>
-      <!--
-        <module name="RedundantThrows">
-            <property name="allowUnchecked" value="true"/>
-        </module>
-       -->
-      <!--
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-      -->
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- module name="DesignForExtension"/ -->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier">
-            <!-- logger variables are often protected -->
-            <property name="protectedAllowed" value="true"/>
-        </module>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <!-- module name="FinalParameters"/ -->
-        <!--
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        -->
-        <!-- module name="TrailingComment"/ -->
-        <!-- module name="TodoComment"/ -->
-        <module name="UpperEll"/>
-
-    </module>
-
-</module>
@@ -1 +0,0 @@
-target
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,26 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-adapters</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-cas</artifactId>
-  <name>Acegi Security System for Spring - CAS adapter</name>
-  <dependencies>
-    <dependency>
-      <groupId>cas</groupId>
-      <artifactId>cas-server</artifactId>
-      <version>3.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>cas</groupId>
-      <artifactId>cas</artifactId>
-      <version>2.0.12</version>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,102 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.InitializingBean;
-
-import javax.servlet.ServletRequest;
-
-
-/**
- * Provides actual CAS authentication by delegation to an <code>AuthenticationManager</code>.<P>Do not use this
- * class directly. Instead configure CAS to use the {@link CasPasswordHandlerProxy}.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public final class CasPasswordHandler implements InitializingBean {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(CasPasswordHandler.class);
-
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-
-    //~ Methods ========================================================================================================
-
-    public void afterPropertiesSet() throws Exception {
-        if (this.authenticationManager == null) {
-            throw new IllegalArgumentException("An AuthenticationManager is required");
-        }
-    }
-
-    /**
-     * Called by <code>CasPasswordHandlerProxy</code> for individual authentication requests.<P>Delegates to
-     * the configured <code>AuthenticationManager</code>.</p>
-     *
-     * @param servletRequest as provided by CAS
-     * @param username provided to CAS
-     * @param password provided to CAS
-     *
-     * @return whether authentication was successful or not
-     */
-    public boolean authenticate(ServletRequest servletRequest, String username, String password) {
-        if ((username == null) || "".equals(username)) {
-            return false;
-        }
-
-        if (password == null) {
-            password = "";
-        }
-
-        Authentication request = new UsernamePasswordAuthenticationToken(username.toString(), password.toString());
-        Authentication response = null;
-
-        try {
-            response = authenticationManager.authenticate(request);
-        } catch (AuthenticationException failed) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Authentication request for user: " + username + " failed: " + failed.toString());
-            }
-
-            return false;
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication request for user: " + username + " successful");
-        }
-
-        return true;
-    }
-
-    public AuthenticationManager getAuthenticationManager() {
-        return authenticationManager;
-    }
-
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
-}
@@ -1,113 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas;
-
-import edu.yale.its.tp.cas.auth.PasswordHandler;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.context.ApplicationContext;
-
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import java.util.Map;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * Enables CAS to use the Acegi Security System for authentication.<P>This class works along with {@link
- * CasPasswordHandler} to enable users to easily migrate from stand-alone Acegi Security System deployments to
- * enterprise-wide CAS deployments.</p>
- *  <p>It should be noted that the Acegi Security System will operate as a CAS client irrespective of the
- * <code>PasswordHandler</code> used on the CAS server. In other words, this class need <B>not</B> be used on the CAS
- * server if not desired. It exists solely for the convenience of users wishing have CAS delegate to an Acegi Security
- * System-based <code>AuthenticationManager</code>.</p>
- *  <p>This class works requires a properly configured <code>CasPasswordHandler</code>. On the first authentication
- * request, the class will use Spring's {@link WebApplicationContextUtils#getWebApplicationContext(ServletContext sc)}
- * method to obtain an <code>ApplicationContext</code> instance, inside which must be a configured
- * <code>CasPasswordHandler</code> instance. The <code>CasPasswordHandlerProxy</code> will then delegate
- * authentication requests to that instance.</p>
- *  <p>To configure CAS to use this class, edit CAS' <code>web.xml</code> and define the
- * <code>edu.yale.its.tp.cas.authHandler</code> context parameter with the value
- * <code>org.acegisecurity.adapters.cas.CasPasswordHandlerProxy</code>.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CasPasswordHandlerProxy implements PasswordHandler {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(CasPasswordHandlerProxy.class);
-
-    //~ Instance fields ================================================================================================
-
-    private ApplicationContext ctx;
-    private CasPasswordHandler handler;
-
-    //~ Methods ========================================================================================================
-
-    /**
-     * Called by CAS when authentication is required.<P>Delegates to the <code>CasPasswordHandler</code>.</p>
-     *
-     * @param request as provided by CAS
-     * @param username provided to CAS
-     * @param password provided to CAS
-     *
-     * @return whether authentication was successful or not
-     *
-     * @throws IllegalArgumentException if the application context does not contain a <code>CasPasswordHandler</code>
-     *         or the <code>ServletRequest</code> was not of type <code>HttpServletRequest</code>
-     */
-    public boolean authenticate(ServletRequest request, String username, String password) {
-        if (ctx == null) {
-            if (!(request instanceof HttpServletRequest)) {
-                throw new IllegalArgumentException("Can only process HttpServletRequest");
-            }
-
-            HttpServletRequest httpRequest = (HttpServletRequest) request;
-
-            ctx = this.getContext(httpRequest);
-        }
-
-        if (handler == null) {
-            Map beans = ctx.getBeansOfType(CasPasswordHandler.class, true, true);
-
-            if (beans.size() == 0) {
-                throw new IllegalArgumentException(
-                    "Bean context must contain at least one bean of type CasPasswordHandler");
-            }
-
-            String beanName = (String) beans.keySet().iterator().next();
-            handler = (CasPasswordHandler) beans.get(beanName);
-        }
-
-        return handler.authenticate(request, username, password);
-    }
-
-    /**
-     * Allows test cases to override where application context obtained from.
-     *
-     * @param httpRequest which can be used to find the <code>ServletContext</code>
-     *
-     * @return the Spring application context
-     */
-    protected ApplicationContext getContext(HttpServletRequest httpRequest) {
-        return WebApplicationContextUtils.getRequiredWebApplicationContext(httpRequest.getSession().getServletContext());
-    }
-}
@@ -1,7 +0,0 @@
-<html>
-<body>
-Adapter to Yale Central Authentication Service (CAS).
-<p>
-</body>
-</html>
-
@@ -1,91 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas3;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationManager;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jasig.cas.authentication.handler.AuthenticationException;
-import org.jasig.cas.authentication.handler.AuthenticationHandler;
-import org.jasig.cas.authentication.handler.support.AbstractUsernamePasswordAuthenticationHandler;
-import org.jasig.cas.authentication.principal.UsernamePasswordCredentials;
-
-import org.springframework.util.Assert;
-
-
-/**
- * <p>Provides JA-SIG CAS 3 authentication by delegating to the Acegi <code>AuthenticationManager</code>.</p>
- *  <p>This class would be configured in the <code>webapp/WEB-INF/deployerConfigContext.xml</code> file in the CAS
- * distribution.</p>
- *
- * @author Scott Battaglia
- * @version $Id$
- *
- * @see AuthenticationHandler
- * @see AuthenticationManager
- */
-public final class CasAuthenticationHandler extends AbstractUsernamePasswordAuthenticationHandler {
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private Log log = LogFactory.getLog(this.getClass());
-
-    //~ Methods ========================================================================================================
-
-    protected void afterPropertiesSetInternal() throws Exception {
-        Assert.notNull(this.authenticationManager, "authenticationManager cannot be null.");
-    }
-
-    protected boolean authenticateUsernamePasswordInternal(final UsernamePasswordCredentials credentials)
-        throws AuthenticationException {
-        final Authentication authenticationRequest = new UsernamePasswordAuthenticationToken(credentials.getUsername(),
-                credentials.getPassword());
-
-        if (log.isDebugEnabled()) {
-            log.debug("Attempting to authenticate for user: " + credentials.getUsername());
-        }
-
-        try {
-            this.authenticationManager.authenticate(authenticationRequest);
-        } catch (final org.acegisecurity.AuthenticationException e) {
-            if (log.isDebugEnabled()) {
-                log.debug("Authentication request for " + credentials.getUsername() + " failed: " + e.toString(), e);
-            }
-
-            return false;
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("Authentication request for " + credentials.getUsername() + " successful.");
-        }
-
-        return true;
-    }
-
-    /**
-     * Method to set the Acegi <code>AuthenticationManager</code> to delegate to.
-     *
-     * @param authenticationManager the Acegi AuthenticationManager that knows how to authenticate users.
-     */
-    public void setAuthenticationManager(final AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
-}
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Demonstration of the applicationContext.xml that should be placed in
- * CAS' WEB-INF directory. Note the CasPasswordHandler bean.
- * 
- * $Id$
-->
-
-<beans>
-
-	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLES_IGNORED_BY_CAS
-				dianne=emu,ROLES_IGNORED_BY_CAS
-				scott=wombat,ROLES_IGNORED_BY_CAS
-				peter=opal,disabled,ROLES_IGNORED_BY_CAS
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
-	</bean>
-
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-	<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler">
-		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
-	</bean>
-</beans>
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Demonstration of the applicationContext.xml that should be copied into
- * JA-SIG CAS's webapp/WEB-INF/deployerConfigContext.xml
- * The example CAS AuthenticationHandler should be placed within CAS's
- * AuthenticationManager's authenticationHandler list property.
- *
- * The Acegi-specific beans can just be placed in the context file.
- * 
- * $Id$
-->
-<beans>
-
-	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLES_IGNORED_BY_CAS
-				dianne=emu,ROLES_IGNORED_BY_CAS
-				scott=wombat,ROLES_IGNORED_BY_CAS
-				peter=opal,disabled,ROLES_IGNORED_BY_CAS
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
-	</bean>
-
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-	
-	<bean id="casAuthenticationHandler" class="org.acegisecurity.adapters.cas3.CasAuthenticationHandler">
-		<property name="authenticationManager" ref="authenticationManager" />
-	</bean>
-</beans>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project name="Acegi Security CAS Adapter">
-    <body>
-        <menu ref="parent"/>
-        <menu ref="reports"/>
-    </body>
-
-</project>
-
-
@@ -1,107 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas;
-
-import junit.framework.TestCase;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * Tests {@link CasPasswordHandlerProxy}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CasPasswordHandlerProxyTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public CasPasswordHandlerProxyTests() {
-        super();
-    }
-
-    public CasPasswordHandlerProxyTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CasPasswordHandlerProxyTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testDetectsIfHttpServletRequestNotPassed() {
-        CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-valid.xml");
-
-        try {
-            proxy.authenticate(null, "x", "y");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Can only process HttpServletRequest", expected.getMessage());
-        }
-    }
-
-    public void testDetectsMissingDelegate() {
-        CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-invalid.xml");
-
-        try {
-            proxy.authenticate(new MockHttpServletRequest(), "x", "y");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Bean context must contain at least one bean of type CasPasswordHandler", expected.getMessage());
-        }
-    }
-
-    public void testNormalOperation() {
-        CasPasswordHandlerProxy proxy = new MockCasPasswordHandlerProxy(
-                "org/acegisecurity/adapters/cas/applicationContext-valid.xml");
-        assertTrue(proxy.authenticate(new MockHttpServletRequest(), "marissa", "koala"));
-        assertFalse(proxy.authenticate(new MockHttpServletRequest(), "marissa", "WRONG_PASSWORD"));
-        assertFalse(proxy.authenticate(new MockHttpServletRequest(), "INVALID_USER_NAME", "WRONG_PASSWORD"));
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    /**
-     * Mock object so that application context source can be specified.
-     */
-    private class MockCasPasswordHandlerProxy extends CasPasswordHandlerProxy {
-        private ApplicationContext ctx;
-
-        public MockCasPasswordHandlerProxy(String appContextLocation) {
-            ctx = new ClassPathXmlApplicationContext(appContextLocation);
-        }
-
-        private MockCasPasswordHandlerProxy() {
-            super();
-        }
-
-        protected ApplicationContext getContext(HttpServletRequest httpRequest) {
-            return ctx;
-        }
-    }
-}
@@ -1,101 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.MockAuthenticationManager;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-
-
-/**
- * Tests {@link CasPasswordHandler}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CasPasswordHandlerTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public CasPasswordHandlerTests() {
-        super();
-    }
-
-    public CasPasswordHandlerTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CasPasswordHandlerTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testDeniesAccessWhenAuthenticationManagerThrowsException()
-        throws Exception {
-        CasPasswordHandler handler = new CasPasswordHandler();
-        handler.setAuthenticationManager(new MockAuthenticationManager(false));
-        handler.afterPropertiesSet();
-
-        assertFalse(handler.authenticate(new MockHttpServletRequest(), "username", "password"));
-    }
-
-    public void testDetectsEmptyAuthenticationManager()
-        throws Exception {
-        CasPasswordHandler handler = new CasPasswordHandler();
-
-        try {
-            handler.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("An AuthenticationManager is required", expected.getMessage());
-        }
-    }
-
-    public void testGettersSetters() {
-        CasPasswordHandler handler = new CasPasswordHandler();
-        handler.setAuthenticationManager(new MockAuthenticationManager(false));
-        assertTrue(handler.getAuthenticationManager() != null);
-    }
-
-    public void testGracefullyHandlesEmptyUsernamesAndPassword()
-        throws Exception {
-        CasPasswordHandler handler = new CasPasswordHandler();
-        handler.setAuthenticationManager(new MockAuthenticationManager(true));
-        handler.afterPropertiesSet();
-
-        // If empty or null username we return false
-        assertFalse(handler.authenticate(new MockHttpServletRequest(), "", "password"));
-        assertFalse(handler.authenticate(new MockHttpServletRequest(), null, "password"));
-
-        // We authenticate with null passwords (they might not have one)
-        assertTrue(handler.authenticate(new MockHttpServletRequest(), "user", null));
-        assertTrue(handler.authenticate(new MockHttpServletRequest(), "user", ""));
-    }
-
-    public void testNormalOperation() throws Exception {
-        CasPasswordHandler handler = new CasPasswordHandler();
-        handler.setAuthenticationManager(new MockAuthenticationManager(true));
-        handler.afterPropertiesSet();
-
-        assertTrue(handler.authenticate(new MockHttpServletRequest(), "username", "password"));
-    }
-}
@@ -1,97 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.cas3;
-
-import org.acegisecurity.AuthenticationManager;
-
-import org.jasig.cas.authentication.handler.AuthenticationException;
-import org.jasig.cas.authentication.principal.UsernamePasswordCredentials;
-
-import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
-
-
-/**
- * Tests {@link CasAuthenticationHandler}
- *
- * @author Scott Battaglia
- * @version $Id$
- */
-public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSpringContextTests {
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private CasAuthenticationHandler casAuthenticationHandler;
-
-    //~ Methods ========================================================================================================
-
-    protected String[] getConfigLocations() {
-        return new String[] {"/org/acegisecurity/adapters/cas/applicationContext-valid.xml"};
-    }
-
-    private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) {
-        final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials();
-        credentials.setUsername(username);
-        credentials.setPassword(password);
-
-        return credentials;
-    }
-
-    protected void onSetUp() throws Exception {
-        this.casAuthenticationHandler = new CasAuthenticationHandler();
-        this.casAuthenticationHandler.setAuthenticationManager(authenticationManager);
-        this.casAuthenticationHandler.afterPropertiesSet();
-    }
-
-    public void setAuthenticationManager(final AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
-
-    public void testAfterPropertiesSet() throws Exception {
-        this.casAuthenticationHandler.setAuthenticationManager(null);
-
-        try {
-            this.casAuthenticationHandler.afterPropertiesSet();
-            fail("IllegalArgumenException expected when no AuthenticationManager is set.");
-        } catch (final IllegalArgumentException e) {
-            // this is okay
-        }
-    }
-
-    public void testGracefullyHandlesInvalidInput() {
-        try {
-            assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor("", "")));
-            assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor(null, null)));
-        } catch (final AuthenticationException e) {
-            fail("AuthenticationException not expected.");
-        }
-    }
-
-    public void testInvalidUsernamePasswordCombination() {
-        try {
-            assertFalse(this.casAuthenticationHandler.authenticate(getCredentialsFor("scott", "scott")));
-        } catch (final AuthenticationException e) {
-            fail("AuthenticationException not expected.");
-        }
-    }
-
-    public void testValidUsernamePasswordCombination() {
-        try {
-            assertTrue(this.casAuthenticationHandler.authenticate(getCredentialsFor("scott", "wombat")));
-        } catch (final AuthenticationException e) {
-            fail("AuthenticationException not expected.");
-        }
-    }
-}
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
-->
-
-<beans>
-
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
-				dianne=emu,ROLE_TELLER
-				scott=wombat,ROLE_TELLER
-				peter=opal,disabled,ROLE_TELLER
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
- 	</bean>
-
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-	<!-- No CasPasswordHandler -->
-</beans>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
-->
-
-<beans>
-
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
-				dianne=emu,ROLE_TELLER
-				scott=wombat,ROLE_TELLER
-				peter=opal,disabled,ROLE_TELLER
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
-	</bean>
-
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-	<bean id="casPasswordHandler" class="org.acegisecurity.adapters.cas.CasPasswordHandler">
-		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
-	</bean>
-</beans>
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,17 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-adapters</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-catalina</artifactId>
-  <name>Acegi Security System for Spring - Catalina adapter</name>
-  <dependencies>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>catalina</artifactId>
-      <version>4.1.9</version>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,236 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.catalina;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.realm.RealmBase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.context.support.FileSystemXmlApplicationContext;
-
-import java.io.File;
-
-import java.security.Principal;
-import java.security.cert.X509Certificate;
-
-import java.util.Map;
-
-
-/**
- * Adapter to enable Catalina (Tomcat) to authenticate via the Acegi Security System for Spring.<p>Returns a {@link
- * PrincipalAcegiUserToken} to Catalina's authentication system, which is subsequently available via
- * <code>HttpServletRequest.getUserPrincipal()</code>.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CatalinaAcegiUserRealm extends RealmBase {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(CatalinaAcegiUserRealm.class);
-
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private Container container;
-    private String appContextLocation;
-    private String key;
-    protected final String name = "CatalinaSpringUserRealm / $Id$";
-
-    //~ Methods ========================================================================================================
-
-    public Principal authenticate(String username, String credentials) {
-        if (username == null) {
-            return null;
-        }
-
-        if (credentials == null) {
-            credentials = "";
-        }
-
-        Authentication request = new UsernamePasswordAuthenticationToken(username, credentials);
-        Authentication response = null;
-
-        try {
-            response = authenticationManager.authenticate(request);
-        } catch (AuthenticationException failed) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Authentication request for user: " + username + " failed: " + failed.toString());
-            }
-
-            return null;
-        }
-
-        return new PrincipalAcegiUserToken(this.key, response.getPrincipal().toString(),
-            response.getCredentials().toString(), response.getAuthorities(), response.getPrincipal());
-    }
-
-    public Principal authenticate(String username, byte[] credentials) {
-        return authenticate(username, new String(credentials));
-    }
-
-    /**
-     * Not supported, returns null
-     *
-     * @param username DOCUMENT ME!
-     * @param digest DOCUMENT ME!
-     * @param nonce DOCUMENT ME!
-     * @param nc DOCUMENT ME!
-     * @param cnonce DOCUMENT ME!
-     * @param qop DOCUMENT ME!
-     * @param realm DOCUMENT ME!
-     * @param md5a2 DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public java.security.Principal authenticate(java.lang.String username, java.lang.String digest,
-        java.lang.String nonce, java.lang.String nc, java.lang.String cnonce, java.lang.String qop,
-        java.lang.String realm, java.lang.String md5a2) {
-        return null;
-    }
-
-    /**
-     * Not supported, returns null
-     *
-     * @param x509Certificates DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Principal authenticate(X509Certificate[] x509Certificates) {
-        return null;
-    }
-
-    public String getAppContextLocation() {
-        return appContextLocation;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    protected String getName() {
-        return this.name;
-    }
-
-    /**
-     * Always returns null (we override authenticate methods)
-     *
-     * @param arg0 DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    protected String getPassword(String arg0) {
-        return null;
-    }
-
-    /**
-     * Always returns null (we override authenticate methods)
-     *
-     * @param arg0 DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    protected Principal getPrincipal(String arg0) {
-        return null;
-    }
-
-    public boolean hasRole(Principal principal, String role) {
-        if ((principal == null) || (role == null)) {
-            return false;
-        }
-
-        if (!(principal instanceof PrincipalAcegiUserToken)) {
-            logger.warn("Expected passed principal to be of type PrincipalAcegiUserToken but was "
-                + principal.getClass().getName());
-
-            return false;
-        }
-
-        PrincipalAcegiUserToken test = (PrincipalAcegiUserToken) principal;
-
-        return test.isUserInRole(role);
-    }
-
-    public void setAppContextLocation(String appContextLocation) {
-        this.appContextLocation = appContextLocation;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    /**
-     * Provides the method that Catalina will use to start the container.
-     *
-     * @throws LifecycleException if a problem is detected
-     */
-    public void start() throws LifecycleException {
-        this.start(true);
-    }
-
-    private void start(boolean startParent) throws LifecycleException {
-        if (startParent) {
-            super.start();
-        }
-
-        if ((appContextLocation == null) || "".equals(appContextLocation)) {
-            throw new LifecycleException("appContextLocation must be defined");
-        }
-
-        if ((key == null) || "".equals(key)) {
-            throw new LifecycleException("key must be defined");
-        }
-
-        File xml = new File(System.getProperty("catalina.base"), appContextLocation);
-
-        if (!xml.exists()) {
-            throw new LifecycleException("appContextLocation does not seem to exist in " + xml.toString());
-        }
-
-        FileSystemXmlApplicationContext ctx = new FileSystemXmlApplicationContext("file:" + xml.getAbsolutePath());
-        Map beans = ctx.getBeansOfType(AuthenticationManager.class, true, true);
-
-        if (beans.size() == 0) {
-            throw new IllegalArgumentException(
-                "Bean context must contain at least one bean of type AuthenticationManager");
-        }
-
-        String beanName = (String) beans.keySet().iterator().next();
-        authenticationManager = (AuthenticationManager) beans.get(beanName);
-        logger.info("CatalinaAcegiUserRealm Started");
-    }
-
-    /**
-     * Provides a method to load the container adapter without delegating to the superclass, which cannot
-     * operate outside the Catalina container.
-     *
-     * @throws LifecycleException if a problem is detected
-     */
-    protected void startForTest() throws LifecycleException {
-        this.start(false);
-    }
-}
@@ -1,7 +0,0 @@
-<html>
-<body>
-Adapter to Catalina web container (Tomcat).
-<p>
-</body>
-</html>
-
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * $Id$
-->
-
-<beans>
-
-	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
-				dianne=emu,ROLE_TELLER
-				scott=wombat,ROLE_TELLER
-				peter=opal,disabled,ROLE_TELLER
-			</value>
-		</property>
-	</bean>
-	
-	<!-- The authentication manager is deliberately missing in order to test error detection -->
-
-</beans>
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * $Id$
-->
-
-<beans>
-
-	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.acegisecurity.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
-				dianne=emu,ROLE_TELLER
-				scott=wombat,ROLE_TELLER
-				peter=opal,disabled,ROLE_TELLER
-			</value>
-		</property>
-	</bean>
-	
-	<!-- Authentication provider that queries our data access object  -->
-	<bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
-     	<property name="forcePrincipalAsString"><value>true</value></property>
-	</bean>
-
-	<!-- The authentication manager that iterates through our only authentication provider -->
-	<bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-</beans>
@@ -1,275 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.catalina;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.apache.catalina.LifecycleException;
-
-import java.io.File;
-
-import java.net.URL;
-
-import java.security.Principal;
-
-
-/**
- * Tests {@link CatalinaAcegiUserRealm}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class CatalinaAcegiUserRealmTests extends TestCase {
-    //~ Instance fields ================================================================================================
-
-    private final String ADAPTER_KEY = "my_key";
-
-    //~ Constructors ===================================================================================================
-
-    public CatalinaAcegiUserRealmTests() {
-        super();
-    }
-
-    public CatalinaAcegiUserRealmTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CatalinaAcegiUserRealmTests.class);
-    }
-
-    private CatalinaAcegiUserRealm makeAdapter(String fileName)
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-
-        URL url = Thread.currentThread().getContextClassLoader().getResource("org/acegisecurity/adapters/" + fileName);
-
-        if (url == null) {
-            throw new Exception("Could not find " + fileName + " - cannot continue");
-        }
-
-        File file = new File(url.getFile());
-
-        System.setProperty("catalina.base", file.getParentFile().getAbsolutePath());
-        System.out.println("catalina.base set to: " + System.getProperty("catalina.base"));
-        adapter.setAppContextLocation(fileName);
-        adapter.setKey(ADAPTER_KEY);
-        adapter.startForTest();
-
-        return adapter;
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
-        throws Exception {
-        try {
-            CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-invalid.xml");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAdapterAbortsIfNoAppContextSpecified()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-
-        adapter.setKey("KEY");
-
-        try {
-            adapter.startForTest();
-            fail("Should have thrown LifecycleException");
-        } catch (LifecycleException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-
-        adapter.setAppContextLocation("");
-
-        try {
-            adapter.startForTest();
-            fail("Should have thrown LifecycleException");
-        } catch (LifecycleException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoKeySpecified() throws Exception {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-
-        adapter.setAppContextLocation("SOMETHING");
-
-        try {
-            adapter.startForTest();
-            fail("Should have thrown LifecycleException");
-        } catch (LifecycleException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-
-        adapter.setKey("");
-
-        try {
-            adapter.startForTest();
-            fail("Should have thrown LifecycleException");
-        } catch (LifecycleException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsWithIncorrectApplicationContextLocation()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        adapter.setAppContextLocation("SOME_INVALID_PATH");
-        adapter.setKey("KEY");
-
-        try {
-            adapter.startForTest();
-            fail("Should have thrown LifecycleException");
-        } catch (LifecycleException expected) {
-            assertTrue(expected.getMessage().startsWith("appContextLocation does not seem to exist in"));
-        }
-    }
-
-    public void testAdapterIdentifiesItself() throws Exception {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertTrue(adapter.getName().lastIndexOf("CatalinaSpringUserRealm") != -1);
-    }
-
-    public void testAdapterStartsUpSuccess() throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        assertTrue(true);
-    }
-
-    public void testAuthenticateManyParamsReturnsNull() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertEquals(null, adapter.authenticate(null, null, null, null, null, null, null, null));
-    }
-
-    public void testAuthenticateX509ReturnsNull() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertEquals(null, adapter.authenticate(null));
-    }
-
-    public void testAuthenticationFailsForIncorrectPassword()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        assertEquals(null, adapter.authenticate("marissa", "kangaroo"));
-    }
-
-    public void testAuthenticationFailsForIncorrectUserName()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        assertEquals(null, adapter.authenticate("melissa", "koala"));
-    }
-
-    public void testAuthenticationUsingByteArrayForCredentials()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        byte[] credentials = {'k', 'o', 'a', 'l', 'a'};
-        Principal result = adapter.authenticate("marissa", credentials);
-
-        if (!(result instanceof PrincipalAcegiUserToken)) {
-            fail("Should have returned PrincipalAcegiUserToken");
-        }
-
-        PrincipalAcegiUserToken castResult = (PrincipalAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationUsingStringForCredentials()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        Principal result = adapter.authenticate("marissa", "koala");
-
-        if (!(result instanceof PrincipalAcegiUserToken)) {
-            fail("Should have returned PrincipalAcegiUserToken");
-        }
-
-        PrincipalAcegiUserToken castResult = (PrincipalAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationWithNullPasswordHandledGracefully()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        assertEquals(null, adapter.authenticate("marissa", (String) null));
-    }
-
-    public void testAuthenticationWithNullUserNameHandledGracefully()
-        throws Exception {
-        CatalinaAcegiUserRealm adapter = makeAdapter("catalinaAdapterTest-valid.xml");
-        assertEquals(null, adapter.authenticate(null, "koala"));
-    }
-
-    public void testGetPasswordReturnsNull() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertEquals(null, adapter.getPassword(null));
-    }
-
-    public void testGetPrincipalReturnsNull() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertEquals(null, adapter.getPrincipal(null));
-    }
-
-    public void testGetters() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        adapter.setKey("KEY");
-        assertEquals("KEY", adapter.getKey());
-        adapter.setAppContextLocation("SOME_LOCATION");
-        assertEquals("SOME_LOCATION", adapter.getAppContextLocation());
-    }
-
-    public void testHasRoleWithANullPrincipalFails() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertTrue(!adapter.hasRole(null, "ROLE_ONE"));
-    }
-
-    public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails() {
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertTrue(!adapter.hasRole(new Principal() {
-                public String getName() {
-                    return "MockPrincipal";
-                }
-            }, "ROLE_ONE"));
-    }
-
-    public void testHasRoleWithPrincipalAcegiUserToken() {
-        PrincipalAcegiUserToken token = new PrincipalAcegiUserToken("KEY", "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
-                null);
-        CatalinaAcegiUserRealm adapter = new CatalinaAcegiUserRealm();
-        assertTrue(adapter.hasRole(token, "ROLE_ONE"));
-        assertTrue(adapter.hasRole(token, "ROLE_TWO"));
-        assertTrue(!adapter.hasRole(token, "ROLE_WE_DO_NOT_HAVE"));
-    }
-}
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,23 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-adapters</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-jboss</artifactId>
-  <name>Acegi Security System for Spring - JBoss adapter</name>
-  <dependencies>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jbosssx</artifactId>
-      <version>3.2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,302 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import org.acegisecurity.AccountExpiredException;
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-import org.acegisecurity.CredentialsExpiredException;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.jboss.security.SimpleGroup;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.spi.AbstractServerLoginModule;
-
-import org.springframework.beans.factory.access.BeanFactoryLocator;
-import org.springframework.beans.factory.access.BeanFactoryReference;
-import org.springframework.beans.factory.access.SingletonBeanFactoryLocator;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.security.Principal;
-import java.security.acl.Group;
-
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginException;
-
-
-/**
- * Adapter to enable JBoss to authenticate via the Acegi Security System for Spring.<p>Returns a {@link
- * PrincipalAcegiUserToken} to JBoss' authentication system, which is subsequently available from
- * <code>java:comp/env/security/subject</code>.</p>
- *
- * @author Ben Alex
- * @author Sergio Bern�
- * @version $Id$
- */
-public class JbossAcegiLoginModule extends AbstractServerLoginModule {
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private Principal identity;
-    private String key;
-    private char[] credential;
-
-    //~ Methods ========================================================================================================
-
-    protected Principal getIdentity() {
-        return this.identity;
-    }
-
-    protected Group[] getRoleSets() throws LoginException {
-        SimpleGroup roles = new SimpleGroup("Roles");
-        Group[] roleSets = {roles};
-
-        if (this.identity instanceof Authentication) {
-            Authentication user = (Authentication) this.identity;
-
-            for (int i = 0; i < user.getAuthorities().length; i++) {
-                roles.addMember(new SimplePrincipal(user.getAuthorities()[i].getAuthority()));
-            }
-        }
-
-        return roleSets;
-    }
-
-    protected String[] getUsernameAndPassword() throws LoginException {
-        String[] info = {null, null};
-
-        // prompt for a username and password
-        if (callbackHandler == null) {
-            throw new LoginException("Error: no CallbackHandler available " + "to collect authentication information");
-        }
-
-        NameCallback nc = new NameCallback("User name: ", "guest");
-        PasswordCallback pc = new PasswordCallback("Password: ", false);
-        Callback[] callbacks = {nc, pc};
-        String username = null;
-        String password = null;
-
-        try {
-            callbackHandler.handle(callbacks);
-            username = nc.getName();
-
-            char[] tmpPassword = pc.getPassword();
-
-            if (tmpPassword != null) {
-                credential = new char[tmpPassword.length];
-                System.arraycopy(tmpPassword, 0, credential, 0, tmpPassword.length);
-                pc.clearPassword();
-                password = new String(credential);
-            }
-        } catch (java.io.IOException ioe) {
-            throw new LoginException(ioe.toString());
-        } catch (UnsupportedCallbackException uce) {
-            throw new LoginException("CallbackHandler does not support: " + uce.getCallback());
-        }
-
-        info[0] = username;
-        info[1] = password;
-
-        return info;
-    }
-
-    public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
-        super.initialize(subject, callbackHandler, sharedState, options);
-
-        if (super.log.isInfoEnabled()) {
-            super.log.info("initializing jboss login module");
-        }
-
-        this.key = (String) options.get("key");
-
-        if ((key == null) || "".equals(key)) {
-            throw new IllegalArgumentException("key must be defined");
-        }
-
-        String singletonId = (String) options.get("singletonId");
-
-        String appContextLocation = (String) options.get("appContextLocation");
-
-        if ((((singletonId == null) || "".equals(singletonId)) && (appContextLocation == null))
-            || "".equals(appContextLocation)) {
-            throw new IllegalArgumentException("appContextLocation must be defined");
-        }
-
-        String beanName = (String) options.get("authenticationManager");
-
-        // Attempt to find the appContextLocation only if no singletonId was defined
-        if ((singletonId == null) || "".equals(singletonId)) {
-            if (Thread.currentThread().getContextClassLoader().getResource(appContextLocation) == null) {
-                if (super.log.isInfoEnabled()) {
-                    super.log.info("cannot locate " + appContextLocation);
-                }
-
-                throw new IllegalArgumentException("Cannot locate " + appContextLocation);
-            }
-        }
-
-        ApplicationContext ctx = null;
-
-        if ((singletonId == null) || "".equals(singletonId)) {
-            try {
-                ctx = new ClassPathXmlApplicationContext(appContextLocation);
-            } catch (Exception e) {
-                if (super.log.isInfoEnabled()) {
-                    super.log.info("error loading spring context " + appContextLocation + " " + e);
-                }
-
-                throw new IllegalArgumentException("error loading spring context " + appContextLocation + " " + e);
-            }
-        } else {
-            if (super.log.isInfoEnabled()) {
-                super.log.debug("retrieving singleton instance " + singletonId);
-            }
-
-            BeanFactoryLocator bfl = SingletonBeanFactoryLocator.getInstance();
-            BeanFactoryReference bf = bfl.useBeanFactory(singletonId);
-            ctx = (ApplicationContext) bf.getFactory();
-
-            if (ctx == null) {
-                if (super.log.isInfoEnabled()) {
-                    super.log.info("singleton " + beanName + " does not exists");
-                }
-
-                throw new IllegalArgumentException("singleton " + singletonId + " does not exists");
-            }
-        }
-
-        if ((beanName == null) || "".equals(beanName)) {
-            Map beans = null;
-
-            try {
-                beans = ctx.getBeansOfType(AuthenticationManager.class, true, true);
-            } catch (Exception e) {
-                if (super.log.isInfoEnabled()) {
-                    super.log.info("exception in getBeansOfType " + e);
-                }
-
-                throw new IllegalStateException("spring error in get beans by class");
-            }
-
-            if (beans.size() == 0) {
-                throw new IllegalArgumentException(
-                    "Bean context must contain at least one bean of type AuthenticationManager");
-            }
-
-            beanName = (String) beans.keySet().iterator().next();
-        }
-
-        authenticationManager = (AuthenticationManager) ctx.getBean(beanName);
-
-        if (super.log.isInfoEnabled()) {
-            super.log.info("Successfully started JbossSpringLoginModule");
-        }
-    }
-
-    public boolean login() throws LoginException {
-        super.loginOk = false;
-
-        String[] info = getUsernameAndPassword();
-        String username = info[0];
-        String password = info[1];
-
-        if ((username == null) && (password == null)) {
-            identity = null;
-            super.log.trace("Authenticating as unauthenticatedIdentity=" + identity);
-        }
-
-        if (username == null) {
-            username = "";
-        }
-
-        if (password == null) {
-            password = "";
-        }
-
-        if (super.log.isDebugEnabled()) {
-            super.log.debug("checking identity");
-        }
-
-        if (identity == null) {
-            super.log.debug("creating usernamepassword token");
-
-            Authentication request = new UsernamePasswordAuthenticationToken(username, password);
-            Authentication response = null;
-
-            try {
-                if (super.log.isDebugEnabled()) {
-                    super.log.debug("attempting authentication");
-                }
-
-                response = authenticationManager.authenticate(request);
-
-                if (super.log.isDebugEnabled()) {
-                    super.log.debug("authentication succeded");
-                }
-            } catch (CredentialsExpiredException cee) {
-                if (super.log.isDebugEnabled()) {
-                    super.log.debug("Credential has expired");
-                }
-
-                throw new javax.security.auth.login.CredentialExpiredException(
-                    "The credential used to identify the user has expired");
-            } catch (AccountExpiredException cee) {
-                if (super.log.isDebugEnabled()) {
-                    super.log.debug("Account has expired, throwing jaas exception");
-                }
-
-                throw new javax.security.auth.login.AccountExpiredException(
-                    "The account specified in login has expired");
-            } catch (AuthenticationException failed) {
-                if (super.log.isDebugEnabled()) {
-                    super.log.debug("Bad password for username=" + username);
-                }
-
-                throw new FailedLoginException("Password Incorrect/Password Required");
-            }
-
-            super.log.debug("user is logged. redirecting to jaas classes");
-
-            identity = new PrincipalAcegiUserToken(this.key, response.getName(), response.getCredentials().toString(),
-                    response.getAuthorities(), response.getPrincipal());
-        }
-
-        if (getUseFirstPass() == true) {
-            // Add the username and password to the shared state map
-            sharedState.put("javax.security.auth.login.name", username);
-            sharedState.put("javax.security.auth.login.password", credential);
-        }
-
-        super.loginOk = true;
-        super.log.trace("User '" + identity + "' authenticated, loginOk=" + loginOk);
-
-        return true;
-    }
-}
@@ -1,146 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import org.acegisecurity.Authentication;
-
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.context.HttpSessionContextIntegrationFilter;
-import org.acegisecurity.context.SecurityContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.IOException;
-
-import java.security.Principal;
-
-import java.util.Iterator;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import javax.security.auth.Subject;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-
-/**
- * Populates a {@link SecurityContext} from JBoss' <code>java:comp/env/security/subject</code>.
- * <p>This filter <b>never</b> preserves the <code>Authentication</code> on the <code>ContextHolder</code> -
- * it is replaced every request.</p>
- * <p>See {@link HttpSessionContextIntegrationFilter} for further information.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JbossIntegrationFilter implements Filter {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(JbossIntegrationFilter.class);
-
-    //~ Methods ========================================================================================================
-
-    /**
-     * Does nothing. We use IoC container lifecycle services instead.
-     */
-    public void destroy() {}
-
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-        throws IOException, ServletException {
-        Object principal = extractFromContainer(request);
-
-        if ((principal != null) && principal instanceof Authentication) {
-            SecurityContextHolder.getContext().setAuthentication((Authentication) principal);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("ContextHolder updated with Authentication from container: '" + principal + "'");
-            }
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug("ContextHolder not set with new Authentication as Principal was: '" + principal + "'");
-            }
-        }
-
-        chain.doFilter(request, response);
-    }
-
-    private Object extractFromContainer(ServletRequest request) {
-        Subject subject = null;
-
-        try {
-            Context lc = this.getLookupContext();
-
-            if (lc == null) {
-                if (logger.isWarnEnabled()) {
-                    logger.warn("Could not obtain a Context to perform lookup");
-                }
-
-                return null;
-            }
-
-            Object result = lc.lookup("java:comp/env/security/subject");
-
-            if (result instanceof Subject) {
-                subject = (Subject) result;
-            }
-        } catch (NamingException ne) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("Lookup on Subject failed " + ne.getLocalizedMessage());
-            }
-        }
-
-        if ((subject != null) && (subject.getPrincipals() != null)) {
-            Iterator principals = subject.getPrincipals().iterator();
-
-            while (principals.hasNext()) {
-                Principal p = (Principal) principals.next();
-
-                if (p instanceof Authentication) {
-                    return p;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Provided so that unit tests can override.
-     *
-     * @return a <code>Context</code> that can be used for lookup
-     *
-     * @throws NamingException DOCUMENT ME!
-     */
-    protected Context getLookupContext() throws NamingException {
-        return new InitialContext();
-    }
-
-    /**
-     * Does nothing. We use IoC container lifecycle services instead.
-     *
-     * @param arg0 ignored
-     *
-     * @throws ServletException ignored
-     */
-    public void init(FilterConfig arg0) throws ServletException {}
-}
@@ -1,7 +0,0 @@
-<html>
-<body>
-Adapter to JBoss.
-<p>
-</body>
-</html>
-
@@ -1,358 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SimpleGroup;
-
-import java.io.IOException;
-
-import java.security.Principal;
-import java.security.acl.Group;
-
-import java.util.Properties;
-import java.util.Enumeration;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginException;
-
-
-/**
- * Tests {@link JbossAcegiLoginModule}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JbossAcegiLoginModuleTests extends TestCase {
-    //~ Instance fields ================================================================================================
-
-    private final String ADAPTER_KEY = "my_key";
-
-    //~ Constructors ===================================================================================================
-
-    public JbossAcegiLoginModuleTests() {
-        super();
-    }
-
-    public JbossAcegiLoginModuleTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(JbossAcegiLoginModuleTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-invalid.xml");
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAdapterAbortsIfNoAppContextSpecified()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-
-        props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "");
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoKeySpecified() throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-
-        Properties props = new Properties();
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-
-        props = new Properties();
-        props.put("key", "");
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsWithIncorrectApplicationContextLocation()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "INVALID_PATH");
-
-        try {
-            adapter.initialize(null, null, null, props);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue("Cannot locate INVALID_PATH".equals(expected.getMessage()));
-        }
-    }
-
-    public void testAdapterFailsToAuthenticateIfNoCallbackHandlerAvailable()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-
-        adapter.initialize(subject, null, null, props);
-
-        try {
-            adapter.login();
-        } catch (LoginException loginException) {
-            assertEquals("Error: no CallbackHandler available to collect authentication information",
-                loginException.getMessage());
-        }
-    }
-
-    public void testAdapterStartsUpSuccess() throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.initialize(null, null, null, props);
-        assertTrue(true);
-    }
-
-    public void testAuthenticationFailsForIncorrectPassword()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler("marissa", "kangaroo");
-
-        adapter.initialize(subject, callback, null, props);
-
-        try {
-            adapter.login();
-            fail("Should have thrown FailedLoginException");
-        } catch (FailedLoginException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticationFailsForIncorrectUserName()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler("melissa", "koala");
-
-        adapter.initialize(subject, callback, null, props);
-
-        try {
-            adapter.login();
-            fail("Should have thrown FailedLoginException");
-        } catch (FailedLoginException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticationSuccess() throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler("marissa", "koala");
-
-        adapter.initialize(subject, callback, null, props);
-        assertTrue(adapter.login());
-
-        Principal result = adapter.getIdentity();
-
-        if (!(result instanceof PrincipalAcegiUserToken)) {
-            fail("Should have returned PrincipalAcegiUserToken");
-        }
-
-        PrincipalAcegiUserToken castResult = (PrincipalAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationWithNullPasswordHandledGracefully()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler("marissa", null);
-
-        adapter.initialize(subject, callback, null, props);
-
-        try {
-            adapter.login();
-            fail("Should have thrown FailedLoginException");
-        } catch (FailedLoginException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticationWithNullUserNameAndNullPasswordHandledGracefully()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler(null, null);
-
-        adapter.initialize(subject, callback, null, props);
-
-        try {
-            adapter.login();
-            fail("Should have thrown FailedLoginException");
-        } catch (FailedLoginException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticationWithNullUserNameHandledGracefully()
-        throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler(null, "kangaroo");
-
-        adapter.initialize(subject, callback, null, props);
-
-        try {
-            adapter.login();
-            fail("Should have thrown FailedLoginException");
-        } catch (FailedLoginException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testGetRoleSets() throws Exception {
-        JbossAcegiLoginModule adapter = new JbossAcegiLoginModule();
-        Properties props = new Properties();
-        props.put("key", ADAPTER_KEY);
-        props.put("appContextLocation", "org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        Subject subject = new Subject();
-        CallbackHandler callback = new MockCallbackHandler("marissa", "koala");
-
-        adapter.initialize(subject, callback, null, props);
-        assertTrue(adapter.login());
-
-        Group[] result = adapter.getRoleSets();
-        // Expect Roles group.
-        assertEquals(1, result.length);
-
-        Group roles = result[0];
-        assertTrue(roles.isMember(new SimplePrincipal("ROLE_TELLER")));
-        assertTrue(roles.isMember(new SimplePrincipal("ROLE_SUPERVISOR")));
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockCallbackHandler implements CallbackHandler {
-        private String password;
-        private String username;
-
-        public MockCallbackHandler(String username, String password) {
-            this.username = username;
-            this.password = password;
-        }
-
-        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (int i = 0; i < callbacks.length; i++) {
-                if (callbacks[i] instanceof NameCallback) {
-                    ((NameCallback) callbacks[i]).setName(username);
-                } else if (callbacks[i] instanceof PasswordCallback) {
-                    if (this.password == null) {
-                        ((PasswordCallback) callbacks[i]).setPassword(null);
-                    } else {
-                        ((PasswordCallback) callbacks[i]).setPassword(password.toCharArray());
-                    }
-                } else {
-                    throw new UnsupportedCallbackException(callbacks[i]);
-                }
-            }
-        }
-    }
-}
@@ -1,184 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.acegisecurity.context.SecurityContextHolder;
-import org.acegisecurity.context.SecurityContextImpl;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-
-import java.io.IOException;
-
-import java.security.Principal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-
-import javax.security.auth.Subject;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-
-/**
- * Tests {@link JbossIntegrationFilter}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JbossIntegrationFilterTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public JbossIntegrationFilterTests() {
-        super();
-    }
-
-    public JbossIntegrationFilterTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    private void executeFilterInContainerSimulator(FilterConfig filterConfig, Filter filter, ServletRequest request,
-        ServletResponse response, FilterChain filterChain)
-        throws ServletException, IOException {
-        filter.init(filterConfig);
-        filter.doFilter(request, response, filterChain);
-        filter.destroy();
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(JbossIntegrationFilterTests.class);
-    }
-
-    private Subject makeIntoSubject(Principal principal) {
-        Set principals = new HashSet();
-        principals.add(principal);
-
-        return new Subject(false, principals, new HashSet(), new HashSet());
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        SecurityContextHolder.setContext(new SecurityContextImpl());
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        SecurityContextHolder.setContext(new SecurityContextImpl());
-    }
-
-    public void testCorrectOperation() throws Exception {
-        PrincipalAcegiUserToken principal = new PrincipalAcegiUserToken("key", "someone", "password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("SOME_ROLE")}, null);
-
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext(makeIntoSubject(principal)));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-
-        assertEquals(principal, SecurityContextHolder.getContext().getAuthentication());
-        SecurityContextHolder.setContext(new SecurityContextImpl());
-    }
-
-    public void testReturnsNullIfContextReturnsSomethingOtherThanASubject()
-        throws Exception {
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext("THIS_IS_NOT_A_SUBJECT"));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    public void testReturnsNullIfInitialContextHasNullPrincipal()
-        throws Exception {
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext(makeIntoSubject(null)));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    public void testReturnsNullIfInitialContextHasNullSubject()
-        throws Exception {
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext(null));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    public void testReturnsNullIfInitialContextIsNull()
-        throws Exception {
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(null);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    public void testReturnsNullIfPrincipalNotAnAuthenticationImplementation()
-        throws Exception {
-        JbossIntegrationFilter filter = new MockJbossIntegrationFilter(new MockInitialContext(makeIntoSubject(
-                        new Principal() {
-                    public String getName() {
-                        return "MockPrincipal";
-                    }
-                })));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockFilterChain chain = new MockFilterChain();
-
-        filter.doFilter(request, null, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    public void testTestingObjectReturnsInitialContext()
-        throws Exception {
-        JbossIntegrationFilter filter = new JbossIntegrationFilter();
-        assertTrue(filter.getLookupContext() instanceof Context);
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockFilterChain implements FilterChain {
-        public void doFilter(ServletRequest arg0, ServletResponse arg1)
-            throws IOException, ServletException {}
-    }
-}
@@ -1,171 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-
-/**
- * Mocks a <code>javax.naming.Context</code> and returns an <code>Object</code> when queried for address
- * <code>java:comp/env/security/subject</code>.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MockInitialContext implements Context {
-    //~ Instance fields ================================================================================================
-
-    private Object object;
-
-    //~ Constructors ===================================================================================================
-
-    public MockInitialContext(Object object) {
-        this.object = object;
-    }
-
-    private MockInitialContext() {
-        super();
-    }
-
-    //~ Methods ========================================================================================================
-
-    public Object addToEnvironment(String propName, Object propVal)
-        throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void bind(String name, Object obj) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void bind(Name name, Object obj) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void close() throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public String composeName(String name, String prefix)
-        throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Name composeName(Name name, Name prefix) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Context createSubcontext(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Context createSubcontext(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void destroySubcontext(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void destroySubcontext(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Hashtable getEnvironment() throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public String getNameInNamespace() throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NameParser getNameParser(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NameParser getNameParser(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NamingEnumeration list(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NamingEnumeration list(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NamingEnumeration listBindings(String name)
-        throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public NamingEnumeration listBindings(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Object lookup(String name) throws NamingException {
-        return this.object;
-    }
-
-    public Object lookup(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Object lookupLink(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Object lookupLink(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void rebind(String name, Object obj) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void rebind(Name name, Object obj) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public Object removeFromEnvironment(String propName)
-        throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void rename(String oldName, String newName)
-        throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void rename(Name oldName, Name newName) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void unbind(String name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-
-    public void unbind(Name name) throws NamingException {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
-}
@@ -1,49 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jboss;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-
-/**
- * Provides mock of <code>JbossIntegrationFilter</code>, using a lookup <code>Context</code> provided in the
- * constructor.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MockJbossIntegrationFilter extends JbossIntegrationFilter {
-    //~ Instance fields ================================================================================================
-
-    private Context context;
-
-    //~ Constructors ===================================================================================================
-
-    public MockJbossIntegrationFilter(Context context) {
-        this.context = context;
-    }
-
-    private MockJbossIntegrationFilter() {
-        super();
-    }
-
-    //~ Methods ========================================================================================================
-
-    protected Context getLookupContext() throws NamingException {
-        return this.context;
-    }
-}
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,17 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-adapters</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-jetty</artifactId>
-  <name>Acegi Security System for Spring - Jetty adapter</name>
-  <dependencies>
-    <dependency>
-      <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
-      <version>4.2.22</version>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,161 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jetty;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.mortbay.http.HttpRequest;
-import org.mortbay.http.UserPrincipal;
-import org.mortbay.http.UserRealm;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.util.Map;
-
-
-/**
- * Adapter to enable Jetty to authenticate via the Acegi Security System for Spring.<p>Returns a {@link
- * JettyAcegiUserToken} to Jetty's authentication system, which is subsequently available via
- * <code>HttpServletRequest.getUserPrincipal()</code>.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public final class JettyAcegiUserRealm implements UserRealm {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(JettyAcegiUserRealm.class);
-
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private String key;
-    private String realm;
-
-    //~ Constructors ===================================================================================================
-
-/**
-     * Construct a <code>SpringUserRealm</code>.
-     *
-     * @param realm the name of the authentication realm (within Jetty)
-     * @param providerKey a password to sign all authentication objects
-     * @param appContextLocation the classpath location of the bean context XML
-     *        file
-     *
-     * @throws IllegalArgumentException DOCUMENT ME!
-     */
-    public JettyAcegiUserRealm(String realm, String providerKey, String appContextLocation) {
-        this.realm = realm;
-        this.key = providerKey;
-
-        if ((realm == null) || "".equals(realm)) {
-            throw new IllegalArgumentException("realm must be specified");
-        }
-
-        if ((key == null) || "".equals(key)) {
-            throw new IllegalArgumentException("key must be specified");
-        }
-
-        if ((appContextLocation == null) || "".equals(appContextLocation)) {
-            throw new IllegalArgumentException("appContextLocation must be specified");
-        }
-
-        if (Thread.currentThread().getContextClassLoader().getResource(appContextLocation) == null) {
-            throw new IllegalArgumentException("Cannot locate " + appContextLocation);
-        }
-
-        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(appContextLocation);
-        Map beans = ctx.getBeansOfType(AuthenticationManager.class, true, true);
-
-        if (beans.size() == 0) {
-            throw new IllegalArgumentException(
-                "Bean context must contain at least one bean of type AuthenticationManager");
-        }
-
-        String beanName = (String) beans.keySet().iterator().next();
-        authenticationManager = (AuthenticationManager) beans.get(beanName);
-    }
-
-    protected JettyAcegiUserRealm() {
-        throw new IllegalArgumentException("Cannot use default constructor");
-    }
-
-    //~ Methods ========================================================================================================
-
-    public UserPrincipal authenticate(String username, Object password, HttpRequest httpRequest) {
-        if (username == null) {
-            return null;
-        }
-
-        if (password == null) {
-            password = "";
-        }
-
-        Authentication request = new UsernamePasswordAuthenticationToken(username.toString(), password.toString());
-        Authentication response = null;
-
-        try {
-            response = authenticationManager.authenticate(request);
-        } catch (AuthenticationException failed) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Authentication request for user: " + username + " failed: " + failed.toString());
-            }
-
-            return null;
-        }
-
-        return new JettyAcegiUserToken(this.key, response.getPrincipal().toString(),
-            response.getCredentials().toString(), response.getAuthorities());
-    }
-
-    public void disassociate(UserPrincipal userPrincipal) {
-        // No action required
-    }
-
-    public AuthenticationManager getAuthenticationManager() {
-        return authenticationManager;
-    }
-
-    /**
-     * Accesses the realm name.
-     *
-     * @return the name of the realm as defined when <code>SpringUserRealm</code> was created
-     */
-    public String getName() {
-        return this.realm;
-    }
-
-    public void logout(UserPrincipal arg0) {
-        // Not supported
-    }
-
-    public UserPrincipal popRole(UserPrincipal userPrincipal) {
-        // Not supported
-        return userPrincipal;
-    }
-
-    public UserPrincipal pushRole(UserPrincipal userPrincipal, String role) {
-        // Not supported
-        return userPrincipal;
-    }
-}
@@ -1,63 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jetty;
-
-import org.acegisecurity.GrantedAuthority;
-
-import org.acegisecurity.adapters.AbstractAdapterAuthenticationToken;
-
-import org.mortbay.http.UserPrincipal;
-
-
-/**
- * A Jetty compatible {@link org.acegisecurity.Authentication} object.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JettyAcegiUserToken extends AbstractAdapterAuthenticationToken implements UserPrincipal {
-    //~ Instance fields ================================================================================================
-
-	private static final long serialVersionUID = 1L;
-    private String password;
-    private String username;
-
-    //~ Constructors ===================================================================================================
-
-    public JettyAcegiUserToken(String key, String username, String password, GrantedAuthority[] authorities) {
-        super(key, authorities);
-        this.username = username;
-        this.password = password;
-    }
-
-    protected JettyAcegiUserToken() {
-        throw new IllegalArgumentException("Cannot use default constructor");
-    }
-
-    //~ Methods ========================================================================================================
-
-    public Object getCredentials() {
-        return this.password;
-    }
-
-    public String getName() {
-        return this.username;
-    }
-
-    public Object getPrincipal() {
-        return this.username;
-    }
-}
@@ -1,7 +0,0 @@
-<html>
-<body>
-Adapter to Jetty web container.
-<p>
-</body>
-</html>
-
@@ -1,237 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jetty;
-
-import junit.framework.TestCase;
-
-import org.mortbay.http.UserPrincipal;
-
-
-/**
- * Tests {@link JettyAcegiUserRealm}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JettyAcegiUserRealmTests extends TestCase {
-    //~ Instance fields ================================================================================================
-
-    private final String ADAPTER_KEY = "my_key";
-    private final String REALM_NAME = "Acegi Powered Realm";
-
-    //~ Constructors ===================================================================================================
-
-    public JettyAcegiUserRealmTests() {
-        super();
-    }
-
-    public JettyAcegiUserRealmTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(JettyAcegiUserRealmTests.class);
-    }
-
-    private JettyAcegiUserRealm makeAdapter(String fileName)
-        throws Exception {
-        String useFile = "org/acegisecurity/adapters/" + fileName;
-
-        return new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, useFile);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
-        throws Exception {
-        try {
-            JettyAcegiUserRealm adapter = makeAdapter("adaptertest-invalid.xml");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Bean context must contain at least one bean of type AuthenticationManager",
-                expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoAppContextSpecified()
-        throws Exception {
-        try {
-            new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("appContextLocation must be specified", expected.getMessage());
-        }
-
-        try {
-            new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, "");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("appContextLocation must be specified", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoKeySpecified() throws Exception {
-        try {
-            new JettyAcegiUserRealm(REALM_NAME, null, "SOME_PATH");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("key must be specified", expected.getMessage());
-        }
-
-        try {
-            new JettyAcegiUserRealm(REALM_NAME, "", "SOME_PATH");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("key must be specified", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoRealmNameSpecified()
-        throws Exception {
-        try {
-            new JettyAcegiUserRealm(null, ADAPTER_KEY, "SOME_PATH");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("realm must be specified", expected.getMessage());
-        }
-
-        try {
-            new JettyAcegiUserRealm(null, ADAPTER_KEY, "SOME_PATH");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("realm must be specified", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsWithIncorrectApplicationContextLocation()
-        throws Exception {
-        try {
-            new JettyAcegiUserRealm(REALM_NAME, ADAPTER_KEY, "SOME_INVALID_LOCATION");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(expected.getMessage().startsWith("Cannot locate"));
-        }
-    }
-
-    public void testAdapterIdentifiesTheRealmItManages()
-        throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertEquals(REALM_NAME, adapter.getName());
-    }
-
-    public void testAdapterStartsUpSuccess() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertTrue(true);
-    }
-
-    public void testAuthenticationFailsForIncorrectPassword()
-        throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertEquals(null, adapter.authenticate("marissa", "kangaroo", null));
-    }
-
-    public void testAuthenticationFailsForIncorrectUserName()
-        throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertEquals(null, adapter.authenticate("melissa", "koala", null));
-    }
-
-    public void testAuthenticationSuccess() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        UserPrincipal result = adapter.authenticate("marissa", "koala", null);
-
-        if (!(result instanceof JettyAcegiUserToken)) {
-            fail("Should have returned JettyAcegiUserToken");
-        }
-
-        JettyAcegiUserToken castResult = (JettyAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationWithNullPasswordHandledGracefully()
-        throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertEquals(null, adapter.authenticate("marissa", null, null));
-    }
-
-    public void testAuthenticationWithNullUserNameHandledGracefully()
-        throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertEquals(null, adapter.authenticate(null, "koala", null));
-    }
-
-    public void testDisassociateImplemented() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        adapter.disassociate(new MockUserPrincipal());
-        assertTrue(true);
-    }
-
-    public void testGetAuthenticationManager() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        assertTrue(adapter.getAuthenticationManager() != null);
-    }
-
-    public void testLogoutImplemented() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        adapter.logout(new MockUserPrincipal());
-        assertTrue(true);
-    }
-
-    public void testNoArgsConstructor() {
-        try {
-            new JettyAcegiUserRealm();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testPopRoleImplemented() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        MockUserPrincipal user = new MockUserPrincipal();
-        assertEquals(user, adapter.popRole(user));
-    }
-
-    public void testPushRoleImplemented() throws Exception {
-        JettyAcegiUserRealm adapter = makeAdapter("adaptertest-valid.xml");
-        MockUserPrincipal user = new MockUserPrincipal();
-        assertEquals(user, adapter.pushRole(user, "SOME_ROLE"));
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockUserPrincipal implements UserPrincipal {
-        public String getName() {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-
-        public boolean isAuthenticated() {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-
-        public boolean isUserInRole(String arg0) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-    }
-}
@@ -1,68 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.jetty;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-
-
-/**
- * Tests {@link JettyAcegiUserToken}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class JettyAcegiUserTokenTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public JettyAcegiUserTokenTests() {
-        super();
-    }
-
-    public JettyAcegiUserTokenTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(JettyAcegiUserTokenTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testGetters() throws Exception {
-        JettyAcegiUserToken token = new JettyAcegiUserToken("my_password", "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")});
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("Password", token.getCredentials());
-        assertEquals("my_password".hashCode(), token.getKeyHash());
-        assertEquals("Test", token.getName());
-    }
-
-    public void testNoArgsConstructor() {
-        try {
-            new JettyAcegiUserToken();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-}
@@ -1,30 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-parent</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-adapters</artifactId>
-  <name>Acegi Security System for Spring - Adapters</name>
-  <packaging>pom</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <modules>
-    <module>cas</module>
-    <module>catalina</module>
-    <module>jboss</module>
-    <module>jetty</module>
-    <module>resin</module>
-  </modules>
-</project>
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,23 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-adapters</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-resin</artifactId>
-  <name>Acegi Security System for Spring - Resin adapter</name>
-  <dependencies>
-    <dependency>
-      <groupId>com.caucho</groupId>
-      <artifactId>resin</artifactId>
-      <version>3.0.9</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
@@ -1,152 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.resin;
-
-import com.caucho.http.security.AbstractAuthenticator;
-
-import org.acegisecurity.Authentication;
-import org.acegisecurity.AuthenticationException;
-import org.acegisecurity.AuthenticationManager;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import org.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.security.Principal;
-
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- * Adapter to enable Resin to authenticate via the Acegi Security System for Spring.<p>Returns a {@link
- * PrincipalAcegiUserToken} to Resin's authentication system, which is subsequently available via
- * <code>HttpServletRequest.getUserPrincipal()</code>.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class ResinAcegiAuthenticator extends AbstractAuthenticator {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final Log logger = LogFactory.getLog(ResinAcegiAuthenticator.class);
-
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationManager authenticationManager;
-    private String appContextLocation;
-    private String key;
-
-    //~ Methods ========================================================================================================
-
-    public String getAppContextLocation() {
-        return appContextLocation;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void init() throws ServletException {
-        super.init();
-
-        if ((appContextLocation == null) || "".equals(appContextLocation)) {
-            throw new ServletException("appContextLocation must be defined");
-        }
-
-        if ((key == null) || "".equals(key)) {
-            throw new ServletException("key must be defined");
-        }
-
-        if (Thread.currentThread().getContextClassLoader().getResource(appContextLocation) == null) {
-            throw new ServletException("Cannot locate " + appContextLocation);
-        }
-
-        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(appContextLocation);
-        Map beans = ctx.getBeansOfType(AuthenticationManager.class, true, true);
-
-        if (beans.size() == 0) {
-            throw new ServletException("Bean context must contain at least one bean of type AuthenticationManager");
-        }
-
-        String beanName = (String) beans.keySet().iterator().next();
-        authenticationManager = (AuthenticationManager) beans.get(beanName);
-        logger.info("ResinAcegiAuthenticator Started");
-    }
-
-    public boolean isUserInRole(HttpServletRequest request, HttpServletResponse response, ServletContext application,
-        Principal principal, String role) {
-        if (!(principal instanceof PrincipalAcegiUserToken)) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("Expected passed principal to be of type PrincipalAcegiUserToken");
-            }
-
-            return false;
-        }
-
-        PrincipalAcegiUserToken test = (PrincipalAcegiUserToken) principal;
-
-        return test.isUserInRole(role);
-    }
-
-    protected Principal loginImpl(String username, String credentials) {
-        if (username == null) {
-            return null;
-        }
-
-        if (credentials == null) {
-            credentials = "";
-        }
-
-        Authentication request = new UsernamePasswordAuthenticationToken(username, credentials);
-        Authentication response = null;
-
-        try {
-            response = authenticationManager.authenticate(request);
-        } catch (AuthenticationException failed) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Authentication request for user: " + username + " failed: " + failed.toString());
-            }
-
-            return null;
-        }
-
-        return new PrincipalAcegiUserToken(this.key, response.getPrincipal().toString(),
-            response.getCredentials().toString(), response.getAuthorities(), response.getPrincipal());
-    }
-
-    protected Principal loginImpl(HttpServletRequest request, HttpServletResponse response, ServletContext application,
-        String userName, String password) throws ServletException {
-        return loginImpl(userName, password);
-    }
-
-    public void setAppContextLocation(String appContextLocation) {
-        this.appContextLocation = appContextLocation;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-}
@@ -1,7 +0,0 @@
-<html>
-<body>
-Adapter to Resin web container.
-<p>
-</body>
-</html>
-
@@ -1,261 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.adapters.resin;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.GrantedAuthority;
-import org.acegisecurity.GrantedAuthorityImpl;
-
-import org.acegisecurity.adapters.PrincipalAcegiUserToken;
-
-import java.security.Principal;
-
-import javax.servlet.ServletException;
-
-
-/**
- * Tests {@link ResinAcegiAuthenticator}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class ResinAcegiAuthenticatorTests extends TestCase {
-    //~ Instance fields ================================================================================================
-
-    private final String ADAPTER_KEY = "my_key";
-
-    //~ Constructors ===================================================================================================
-
-    public ResinAcegiAuthenticatorTests() {
-        super();
-    }
-
-    public ResinAcegiAuthenticatorTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ResinAcegiAuthenticatorTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testAdapterAbortsIfAppContextDoesNotContainAnAuthenticationBean()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-invalid.xml");
-        adapter.setKey(ADAPTER_KEY);
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertEquals("Bean context must contain at least one bean of type AuthenticationManager",
-                expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoAppContextSpecified()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setKey(ADAPTER_KEY);
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-
-        adapter.setAppContextLocation("");
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertEquals("appContextLocation must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsIfNoKeySpecified() throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-
-        adapter.setKey("");
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertEquals("key must be defined", expected.getMessage());
-        }
-    }
-
-    public void testAdapterAbortsWithIncorrectApplicationContextLocation()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("FILE_DOES_NOT_EXIST");
-        adapter.setKey(ADAPTER_KEY);
-
-        try {
-            adapter.init();
-            fail("Should have thrown ServletException");
-        } catch (ServletException expected) {
-            assertTrue(expected.getMessage().startsWith("Cannot locate"));
-        }
-    }
-
-    public void testAdapterStartsUpSuccess() throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertTrue(true);
-    }
-
-    public void testAuthenticationFailsForIncorrectPassword()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertEquals(null, adapter.loginImpl("marissa", "kangaroo"));
-    }
-
-    public void testAuthenticationFailsForIncorrectUserName()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertEquals(null, adapter.loginImpl("melissa", "koala"));
-    }
-
-    public void testAuthenticationSuccess() throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-
-        Principal result = adapter.loginImpl("marissa", "koala");
-
-        if (!(result instanceof PrincipalAcegiUserToken)) {
-            fail("Should have returned PrincipalAcegiUserToken");
-        }
-
-        PrincipalAcegiUserToken castResult = (PrincipalAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationSuccessUsingAlternateMethod()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-
-        Principal result = adapter.loginImpl(null, null, null, "marissa", "koala");
-
-        if (!(result instanceof PrincipalAcegiUserToken)) {
-            fail("Should have returned PrincipalAcegiUserToken");
-        }
-
-        PrincipalAcegiUserToken castResult = (PrincipalAcegiUserToken) result;
-        assertEquals("marissa", castResult.getPrincipal());
-        assertEquals("koala", castResult.getCredentials());
-        assertEquals("ROLE_TELLER", castResult.getAuthorities()[0].getAuthority());
-        assertEquals("ROLE_SUPERVISOR", castResult.getAuthorities()[1].getAuthority());
-        assertEquals(ADAPTER_KEY.hashCode(), castResult.getKeyHash());
-    }
-
-    public void testAuthenticationWithNullPasswordHandledGracefully()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertEquals(null, adapter.loginImpl("marissa", null));
-    }
-
-    public void testAuthenticationWithNullUserNameHandledGracefully()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertEquals(null, adapter.loginImpl(null, "koala"));
-    }
-
-    public void testGetters() throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        assertEquals(ADAPTER_KEY, adapter.getKey());
-        assertEquals("org/acegisecurity/adapters/adaptertest-valid.xml", adapter.getAppContextLocation());
-    }
-
-    public void testHasRoleWithANullPrincipalFails() throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertTrue(!adapter.isUserInRole(null, null, null, null, "ROLE_ONE"));
-    }
-
-    public void testHasRoleWithAPrincipalTheAdapterDidNotCreateFails()
-        throws Exception {
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertTrue(!adapter.isUserInRole(null, null, null,
-                new Principal() {
-                public String getName() {
-                    return "MockPrincipal";
-                }
-            }, "ROLE_ONE"));
-    }
-
-    public void testHasRoleWithPrincipalAcegiUserToken()
-        throws Exception {
-        PrincipalAcegiUserToken token = new PrincipalAcegiUserToken("KEY", "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl("ROLE_TWO")},
-                null);
-        ResinAcegiAuthenticator adapter = new ResinAcegiAuthenticator();
-        adapter.setAppContextLocation("org/acegisecurity/adapters/adaptertest-valid.xml");
-        adapter.setKey(ADAPTER_KEY);
-        adapter.init();
-        assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE"));
-        assertTrue(adapter.isUserInRole(null, null, null, token, "ROLE_ONE"));
-        assertTrue(!adapter.isUserInRole(null, null, null, token, "ROLE_WE_DO_NOT_HAVE"));
-    }
-}
@@ -0,0 +1,38 @@
+antora:
+  extensions:
+  - require: '@springio/antora-extensions'
+    root_component_name: 'security'
+site:
+  title: Spring Security
+  url: https://docs.spring.io/spring-security/reference
+  robots: allow
+git:
+  ensure_git_suffix: false
+content:
+  sources:
+  - url: https://github.com/spring-projects/spring-security
+    branches: [main, '6.5.x', '{7..99}.*.x']
+    tags: ['6.5.*','{7..99}.*']
+    start_path: docs
+asciidoc:
+  attributes:
+    page-stackoverflow-url: https://stackoverflow.com/tags/spring-security
+    page-related-doc-categories: security
+    page-related-doc-projects: framework,graphql
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+  extensions:
+  - '@asciidoctor/tabs'
+  - '@springio/asciidoctor-extensions'
+  - '@springio/asciidoctor-extensions/javadoc-extension'
+urls:
+  latest_version_segment_strategy: redirect:to
+  latest_version_segment: ''
+  redirect_facility: httpd
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.26/ui-bundle.zip
+    snapshot: true
+runtime:
+  log:
+    failure_level: warn
@@ -0,0 +1,12 @@
+plugins {
+	id 'base'
+	id 'org.antora' version '1.0.0'
+}
+
+node {
+	version = "24.15.0"
+}
+
+antora {
+	options = [clean: true, fetch: true, stacktrace: true]
+}
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,53 +0,0 @@
-<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>
-  <parent>
-    <groupId>org.acegisecurity</groupId>
-    <artifactId>acegi-security-parent</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <artifactId>acegi-security-tiger</artifactId>
-  <name>Acegi Security System for Spring - Java 5 (Tiger)</name>
-
-  <scm>
-    <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger</connection>
-    <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core-tiger</developerConnection>
-    <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core-tiger/</url>
-  </scm>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <targetJdk>1.5</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
@@ -1,56 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Java 5 annotation for describing service layer security attributes.
- * 
- * <p>The <code>Secured</code> annotation is used to define a list of security 
- * configuration attributes for business methods.  This annotation can be used 
- * as a Java 5 alternative to XML configuration.
- * <p>For example:
- * <pre>
- *     &#64;Secured ({"ROLE_USER"})
- *     public void create(Contact contact);
- *     
- *     &#64;Secured ({"ROLE_USER", "ROLE_ADMIN"})
- *     public void update(Contact contact);
- *     
- *     &#64;Secured ({"ROLE_ADMIN"})
- *     public void delete(Contact contact);
- * </pre> 
- * @author Mark St.Godard
- * @version $Id$
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface Secured {
-/**
-     * Returns the list of security configuration attributes. 
-     *   (i.e. ROLE_USER, ROLE_ADMIN etc.)
-     * @return String[] The secure method attributes 
-     */
-    public String[] value();
-}
@@ -1,141 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.acegisecurity.annotation;
-
-import org.acegisecurity.SecurityConfig;
-
-import org.springframework.metadata.Attributes;
-
-import org.springframework.util.ClassUtils;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-
-/**
- * Java 5 Annotation <code>Attributes</code> metadata implementation used for  secure method interception.<p>This
- * <code>Attributes</code> implementation will return security  configuration for classes described using the
- * <code>Secured</code> Java 5 annotation.</p>
- *  <p>The <code>SecurityAnnotationAttributes</code> implementation can be used to configure a
- * <code>MethodDefinitionAttributes</code> and  <code>MethodSecurityInterceptor</code> bean definition (see below).</p>
- *  <p>For example:<pre>&lt;bean id="attributes" 
- *     class="org.acegisecurity.annotation.SecurityAnnotationAttributes"/>&lt;bean id="objectDefinitionSource" 
- *     class="org.acegisecurity.intercept.method.MethodDefinitionAttributes">    &lt;property name="attributes">
- *         &lt;ref local="attributes"/>    &lt;/property>&lt;/bean>&lt;bean id="securityInterceptor" 
- *     class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">     . . .
- *      &lt;property name="objectDefinitionSource">         &lt;ref local="objectDefinitionSource"/>     &lt;/property>
- * &lt;/bean></pre></p>
- *  <p>These security annotations are similiar to the Commons Attributes approach, however they are using Java 5
- * language-level metadata support.</p>
- *  <p>This class should be used with Spring 2.0 or above, as it relies upon utility classes in Spring 2.0 for
- * correct introspection of annotations on bridge methods.</p>
- *
- * @author Mark St.Godard
- * @version $Id$
- *
- * @see org.acegisecurity.annotation.Secured
- */
-public class SecurityAnnotationAttributes implements Attributes {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Get the <code>Secured</code> attributes for a given target class.
-     *
-     * @param target The target method
-     *
-     * @return Collection of <code>SecurityConfig</code>
-     *
-     * @see Attributes#getAttributes
-     */
-    public Collection getAttributes(Class target) {
-        Set<SecurityConfig> attributes = new HashSet<SecurityConfig>();
-
-        for (Annotation annotation : target.getAnnotations()) {
-            // check for Secured annotations
-            if (annotation instanceof Secured) {
-                Secured attr = (Secured) annotation;
-
-                for (String auth : attr.value()) {
-                    attributes.add(new SecurityConfig(auth));
-                }
-
-                break;
-            }
-        }
-
-        return attributes;
-    }
-
-    public Collection getAttributes(Class clazz, Class filter) {
-        throw new UnsupportedOperationException("Unsupported operation");
-    }
-
-    /**
-     * Get the <code>Secured</code> attributes for a given target method.
-     *
-     * @param method The target method
-     *
-     * @return Collection of <code>SecurityConfig</code>
-     *
-     * @see Attributes#getAttributes
-     */
-    public Collection getAttributes(Method method) {
-        Set<SecurityConfig> attributes = new HashSet<SecurityConfig>();
-
-        Annotation[] annotations = null;
-
-        // Use AnnotationUtils if in classpath (ie Spring 1.2.9+ deployment)
-        try {
-            Class clazz = ClassUtils.forName("org.springframework.core.annotation.AnnotationUtils");
-            Method m = clazz.getMethod("getAnnotations", new Class[] {Method.class});
-            annotations = (Annotation[]) m.invoke(null, new Object[] {method});
-        } catch (Exception ex) {
-            // Fallback to manual retrieval if no AnnotationUtils available
-            annotations = method.getAnnotations();
-        }
-
-        for (Annotation annotation : annotations) {
-            // check for Secured annotations
-            if (annotation instanceof Secured) {
-                Secured attr = (Secured) annotation;
-
-                for (String auth : attr.value()) {
-                    attributes.add(new SecurityConfig(auth));
-                }
-
-                break;
-            }
-        }
-
-        return attributes;
-    }
-
-    public Collection getAttributes(Method method, Class clazz) {
-        throw new UnsupportedOperationException("Unsupported operation");
-    }
-
-    public Collection getAttributes(Field field) {
-        throw new UnsupportedOperationException("Unsupported operation");
-    }
-
-    public Collection getAttributes(Field field, Class clazz) {
-        throw new UnsupportedOperationException("Unsupported operation");
-    }
-}
@@ -1,39 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
-  */
-@Secured({"ROLE_USER"})
-public interface BusinessService {
-    //~ Methods ========================================================================================================
-
-    @Secured({"ROLE_ADMIN"})
-    public void someAdminMethod();
-
-    @Secured({"ROLE_USER", "ROLE_ADMIN"})
-    public void someUserAndAdminMethod();
-
-    @Secured({"ROLE_USER"})
-    public void someUserMethod1();
-
-    @Secured({"ROLE_USER"})
-    public void someUserMethod2();
-}
@@ -1,28 +0,0 @@
-package org.acegisecurity.annotation;
-
-/**
- *
- * @author Joe Scalise
- */
-public class BusinessServiceImpl<E extends Entity> implements BusinessService {
-
-    @Secured({"ROLE_USER"})
-    public void someUserMethod1() {
-    }
-
-    @Secured({"ROLE_USER"})
-    public void someUserMethod2() {
-    }
-
-    @Secured({"ROLE_USER", "ROLE_ADMIN"})
-    public void someUserAndAdminMethod() {
-    }
-
-    @Secured({"ROLE_ADMIN"})
-    public void someAdminMethod() {
-    }
-
-    public E someUserMethod3(final E entity) {
-        return entity;
-    }
-}
@@ -1,28 +0,0 @@
-package org.acegisecurity.annotation;
-
-/**
- *
- * @author Joe Scalise
- */
-public class Department extends Entity {
-    //~ Instance fields ========================================================
-
-    private boolean active = true;
-
-    //~ Constructors ===========================================================
-
-    public Department(String name) {
-        super(name);
-    }
-
-    //~ Methods ================================================================
-
-    public boolean isActive() {
-        return this.active;
-    }
-
-    void deactive() {
-        this.active = true;
-    }
-
-}
@@ -1,11 +0,0 @@
-package org.acegisecurity.annotation;
-
-/**
- *
- * @author Joe Scalise
- */
-public interface DepartmentService extends BusinessService {
-
-    @Secured({"ROLE_USER"})
-    Department someUserMethod3(Department dept);
-}
@@ -1,12 +0,0 @@
-package org.acegisecurity.annotation;
-
-/**
- * @author Joe Scalise
- */
-public class DepartmentServiceImpl extends BusinessServiceImpl <Department> implements DepartmentService {
-
-    @Secured({"ROLE_ADMIN"})
-    public Department someUserMethod3(final Department dept) {
-        return super.someUserMethod3(dept);
-    }
-}
@@ -1,11 +0,0 @@
-package org.acegisecurity.annotation;
-
-/**
- * Class to act as a superclass for annotations testing.
- * 
- * @author Ben Alex
- *
- */
-public class Entity {
-	public Entity(String someParameter) {}
-}
@@ -1,150 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation;
-
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.ConfigAttributeDefinition;
-import org.acegisecurity.SecurityConfig;
-import org.acegisecurity.annotation.test.Entity;
-import org.acegisecurity.annotation.test.OrganisationService;
-import org.acegisecurity.annotation.test.PersonService;
-import org.acegisecurity.annotation.test.PersonServiceImpl;
-import org.acegisecurity.annotation.test.Service;
-import org.acegisecurity.annotation.test.ServiceImpl;
-import org.acegisecurity.intercept.method.MethodDefinitionMap;
-import org.acegisecurity.intercept.method.MethodDefinitionSourceEditor;
-import org.aopalliance.intercept.MethodInvocation;
-
-
-/**
- * Extra tests to demonstrate generics behaviour with <code>MethodDefinitionMap</code>.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MethodDefinitionSourceEditorTigerTests extends TestCase {
-    //~ Constructors ===================================================================================================
-
-    public MethodDefinitionSourceEditorTigerTests() {
-        super();
-    }
-
-    public MethodDefinitionSourceEditorTigerTests(String arg0) {
-        super(arg0);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(MethodDefinitionSourceEditorTigerTests.class);
-    }
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testConcreteClassInvocationsAlsoReturnDefinitionsAgainstInterface()
-        throws Exception {
-        MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText(
-            "org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
-
-        MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
-        assertEquals(3, map.getMethodMapSize());
-
-        ConfigAttributeDefinition returnedMakeLower = map.getAttributes(new MockMethodInvocation(Service.class,
-                    "makeLowerCase", new Class[] {Entity.class}));
-        ConfigAttributeDefinition expectedMakeLower = new ConfigAttributeDefinition();
-        expectedMakeLower.addConfigAttribute(new SecurityConfig("ROLE_FROM_INTERFACE"));
-        assertEquals(expectedMakeLower, returnedMakeLower);
-
-        ConfigAttributeDefinition returnedMakeUpper = map.getAttributes(new MockMethodInvocation(ServiceImpl.class,
-                    "makeUpperCase", new Class[] {Entity.class}));
-        ConfigAttributeDefinition expectedMakeUpper = new ConfigAttributeDefinition();
-        expectedMakeUpper.addConfigAttribute(new SecurityConfig("ROLE_FROM_IMPLEMENTATION"));
-        expectedMakeUpper.addConfigAttribute(new SecurityConfig("ROLE_FROM_INTERFACE"));
-        assertEquals(expectedMakeUpper, returnedMakeUpper);
-    }
-
-    public void testGenericsSuperclassDeclarationsAreIncludedWhenSubclassesOverride()
-        throws Exception {
-        MethodDefinitionSourceEditor editor = new MethodDefinitionSourceEditor();
-        editor.setAsText(
-            "org.acegisecurity.annotation.test.Service.makeLower*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.Service.makeUpper*=ROLE_FROM_INTERFACE\r\norg.acegisecurity.annotation.test.ServiceImpl.makeUpper*=ROLE_FROM_IMPLEMENTATION");
-
-        MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
-        assertEquals(3, map.getMethodMapSize());
-
-        ConfigAttributeDefinition returnedMakeLower = map.getAttributes(new MockMethodInvocation(PersonService.class,
-                    "makeLowerCase", new Class[] {Entity.class}));
-        ConfigAttributeDefinition expectedMakeLower = new ConfigAttributeDefinition();
-        expectedMakeLower.addConfigAttribute(new SecurityConfig("ROLE_FROM_INTERFACE"));
-        assertEquals(expectedMakeLower, returnedMakeLower);
-
-        ConfigAttributeDefinition returnedMakeLower2 = map.getAttributes(new MockMethodInvocation(
-                    OrganisationService.class, "makeLowerCase", new Class[] {Entity.class}));
-        ConfigAttributeDefinition expectedMakeLower2 = new ConfigAttributeDefinition();
-        expectedMakeLower2.addConfigAttribute(new SecurityConfig("ROLE_FROM_INTERFACE"));
-        assertEquals(expectedMakeLower2, returnedMakeLower2);
-
-        ConfigAttributeDefinition returnedMakeUpper = map.getAttributes(new MockMethodInvocation(
-                    PersonServiceImpl.class, "makeUpperCase", new Class[] {Entity.class}));
-        ConfigAttributeDefinition expectedMakeUpper = new ConfigAttributeDefinition();
-        expectedMakeUpper.addConfigAttribute(new SecurityConfig("ROLE_FROM_IMPLEMENTATION"));
-        expectedMakeUpper.addConfigAttribute(new SecurityConfig("ROLE_FROM_INTERFACE"));
-        assertEquals(expectedMakeUpper, returnedMakeUpper);
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockMethodInvocation implements MethodInvocation {
-        Method method;
-
-        private MockMethodInvocation() {
-            super();
-        }
-
-        public MockMethodInvocation(Class clazz, String methodName, Class[] parameterTypes)
-            throws NoSuchMethodException {
-            System.out.println(clazz + " " + methodName + " " + parameterTypes[0]);
-            method = clazz.getMethod(methodName, parameterTypes);
-        }
-
-        public Object[] getArguments() {
-            return null;
-        }
-
-        public Method getMethod() {
-            return method;
-        }
-
-        public AccessibleObject getStaticPart() {
-            return null;
-        }
-
-        public Object getThis() {
-            return null;
-        }
-
-        public Object proceed() throws Throwable {
-            return null;
-        }
-    }
-}
@@ -1,200 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.acegisecurity.annotation;
-
-import junit.framework.TestCase;
-
-import org.acegisecurity.SecurityConfig;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.metadata.Attributes;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import java.util.Collection;
-
-
-/**
- * Tests for {@link org.acegisecurity.annotation.SecurityAnnotationAttributes}
- *
- * @author Mark St.Godard
- * @author Joe Scalise
- * @version $Id$
- */
-public class SecurityAnnotationAttributesTests extends TestCase {
-    //~ Instance fields ================================================================================================
-
-    private Attributes attributes;
-    private Log logger = LogFactory.getLog(SecurityAnnotationAttributesTests.class);
-
-    //~ Methods ========================================================================================================
-
-    protected void setUp() throws Exception {
-        // create the Annotations impl
-        this.attributes = new SecurityAnnotationAttributes();
-    }
-
-    public void testGenericsSuperclassDeclarationsAreIncludedWhenSubclassesOverride() {
-        Method method = null;
-
-        try {
-            method = DepartmentServiceImpl.class.getMethod("someUserMethod3", new Class[] {Department.class});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a superMethod called 'someUserMethod3' on class!");
-        }
-
-        Collection attrs = this.attributes.getAttributes(method);
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("attrs: ");
-            logger.debug(attrs);
-        }
-
-        assertNotNull(attrs);
-
-        // expect 1 attribute
-        assertTrue("Did not find 1 attribute", attrs.size() == 1);
-
-        // should have 1 SecurityConfig
-        for (Object obj : attrs) {
-            assertTrue(obj instanceof SecurityConfig);
-
-            SecurityConfig sc = (SecurityConfig) obj;
-            assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
-        }
-
-        Method superMethod = null;
-
-        try {
-            superMethod = DepartmentServiceImpl.class.getMethod("someUserMethod3", new Class[] {Entity.class});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a superMethod called 'someUserMethod3' on class!");
-        }
-
-        System.out.println(superMethod);
-
-        Collection superAttrs = this.attributes.getAttributes(superMethod);
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("superAttrs: ");
-            logger.debug(superAttrs);
-        }
-
-        assertNotNull(superAttrs);
-
-        // TODO: Enable this part of the test once we can build against Spring 2.0+ and above only (SEC-274)
-        /*
-           // expect 1 attribute
-           assertTrue("Did not find 1 attribute", superAttrs.size() == 1);
-           // should have 1 SecurityConfig
-           for (Object obj : superAttrs) {
-               assertTrue(obj instanceof SecurityConfig);
-               SecurityConfig sc = (SecurityConfig) obj;
-               assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
-           }
-         */
-    }
-
-    public void testGetAttributesClass() {
-        Collection attrs = this.attributes.getAttributes(BusinessService.class);
-
-        assertNotNull(attrs);
-
-        // expect 1 annotation
-        assertTrue(attrs.size() == 1);
-
-        // should have 1 SecurityConfig 
-        SecurityConfig sc = (SecurityConfig) attrs.iterator().next();
-
-        assertTrue(sc.getAttribute().equals("ROLE_USER"));
-    }
-
-    public void testGetAttributesClassClass() {
-        try {
-            this.attributes.getAttributes(BusinessService.class, null);
-            fail("Unsupported method should have thrown an exception!");
-        } catch (UnsupportedOperationException expected) {}
-    }
-
-    public void testGetAttributesField() {
-        try {
-            Field field = null;
-            this.attributes.getAttributes(field);
-            fail("Unsupported method should have thrown an exception!");
-        } catch (UnsupportedOperationException expected) {}
-    }
-
-    public void testGetAttributesFieldClass() {
-        try {
-            Field field = null;
-            this.attributes.getAttributes(field, null);
-            fail("Unsupported method should have thrown an exception!");
-        } catch (UnsupportedOperationException expected) {}
-    }
-
-    public void testGetAttributesMethod() {
-        Method method = null;
-
-        try {
-            method = BusinessService.class.getMethod("someUserAndAdminMethod", new Class[] {});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a method called 'someUserAndAdminMethod' on class!");
-        }
-
-        Collection attrs = this.attributes.getAttributes(method);
-
-        assertNotNull(attrs);
-
-        // expect 2 attributes
-        assertTrue(attrs.size() == 2);
-
-        boolean user = false;
-        boolean admin = false;
-
-        // should have 2 SecurityConfigs 
-        for (Object obj : attrs) {
-            assertTrue(obj instanceof SecurityConfig);
-
-            SecurityConfig sc = (SecurityConfig) obj;
-
-            if (sc.getAttribute().equals("ROLE_USER")) {
-                user = true;
-            } else if (sc.getAttribute().equals("ROLE_ADMIN")) {
-                admin = true;
-            }
-        }
-
-        // expect to have ROLE_USER and ROLE_ADMIN
-        assertTrue(user && admin);
-    }
-
-    public void testGetAttributesMethodClass() {
-        Method method = null;
-
-        try {
-            method = BusinessService.class.getMethod("someUserAndAdminMethod", new Class[] {});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a method called 'someUserAndAdminMethod' on class!");
-        }
-
-        try {
-            this.attributes.getAttributes(method, null);
-            fail("Unsupported method should have thrown an exception!");
-        } catch (UnsupportedOperationException expected) {}
-    }
-}
@@ -1,52 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-import org.springframework.util.Assert;
-
-
-/**
- * An entity used in our generics testing.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class Entity {
-    //~ Instance fields ================================================================================================
-
-    String info;
-
-    //~ Constructors ===================================================================================================
-
-    public Entity(String info) {
-        Assert.hasText(info, "Some information must be given!");
-        this.info = info;
-    }
-
-    //~ Methods ========================================================================================================
-
-    public String getInfo() {
-        return info;
-    }
-
-    void makeLowercase() {
-        this.info = info.toLowerCase();
-    }
-
-    void makeUppercase() {
-        this.info = info.toUpperCase();
-    }
-}
@@ -1,44 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * An extended version of <code>Entity</code>.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class Organisation extends Entity {
-    //~ Instance fields ================================================================================================
-
-    private boolean active = true;
-
-    //~ Constructors ===================================================================================================
-
-    public Organisation(String name) {
-        super(name);
-    }
-
-    //~ Methods ========================================================================================================
-
-    void deactive() {
-        this.active = true;
-    }
-
-    public boolean isActive() {
-        return this.active;
-    }
-}
@@ -1,28 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1496 $
-  */
-public interface OrganisationService extends Service<Organisation> {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Organisation org);
-}
@@ -1,30 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1496 $
-  */
-public class OrganisationServiceImpl extends ServiceImpl<Organisation> implements OrganisationService {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Organisation org) {
-        org.deactive();
-    }
-}
@@ -1,44 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * An extended version of <code>Entity</code>.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class Person extends Entity {
-    //~ Instance fields ================================================================================================
-
-    private boolean active = true;
-
-    //~ Constructors ===================================================================================================
-
-    public Person(String name) {
-        super(name);
-    }
-
-    //~ Methods ========================================================================================================
-
-    void deactive() {
-        this.active = true;
-    }
-
-    public boolean isActive() {
-        return this.active;
-    }
-}
@@ -1,28 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1496 $
-  */
-public interface PersonService extends Service<Person> {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Person person);
-}
@@ -1,30 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1496 $
-  */
-public class PersonServiceImpl extends ServiceImpl<Person> implements PersonService {
-    //~ Methods ========================================================================================================
-
-    public void deactive(Person person) {
-        person.deactive();
-    }
-}
@@ -1,37 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-import java.util.Collection;
-
-
-/**
- * An interface that uses Java 5 generics.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface Service<E extends Entity> {
-    //~ Methods ========================================================================================================
-
-    public int countElements(Collection<E> ids);
-
-    public void makeLowerCase(E input);
-
-    public void makeUpperCase(E input);
-
-    public void publicMakeLowerCase(E input);
-}
@@ -1,47 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.annotation.test;
-
-import java.util.Collection;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision: 1496 $
-  *
- * @param <E> DOCUMENT ME!
- */
-public class ServiceImpl<E extends Entity> implements Service<E> {
-    //~ Methods ========================================================================================================
-
-    public int countElements(Collection<E> ids) {
-        return 0;
-    }
-
-    public void makeLowerCase(E input) {
-        input.makeLowercase();
-    }
-
-    public void makeUpperCase(E input) {
-        input.makeUppercase();
-    }
-
-    public void publicMakeLowerCase(E input) {
-        input.makeUppercase();
-    }
-}
@@ -1,5 +0,0 @@
-target
-.settings
-.classpath
-.project
-.wtpmodules
@@ -1,175 +0,0 @@
-<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>
-	<parent>
-		<groupId>org.acegisecurity</groupId>
-		<artifactId>acegi-security-parent</artifactId>
-		<version>1.0.5</version>
-	</parent>
-	<packaging>jar</packaging>
-	<artifactId>acegi-security</artifactId>
-	<name>Acegi Security Core</name>
-
-	<scm>
-		<connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core</connection>
-		<developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core</developerConnection>
-		<url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/core/</url>
-	</scm>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-        <dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-remoting</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-support</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<optional>true</optional>
-		</dependency>
-        <dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
-			<optional>true</optional>
-		</dependency>
-        <dependency>
-            <!-- TODO: Upgrade to 1.2 before 2.0 release -->
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-ldap</artifactId>
-            <version>1.1.2</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache</artifactId>
-			<version>1.2.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>cas</groupId>
-			<artifactId>casclient</artifactId>
-			<version>2.0.11</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>oro</groupId>
-			<artifactId>oro</artifactId>
-			<version>2.0.8</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.2</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-			<version>1.0.6</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.directory.server</groupId>
-			<artifactId>apacheds-core</artifactId>
-			<version>1.0.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>jmock</groupId>
-			<artifactId>jmock</artifactId>
-			<version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<directory>${basedir}/../</directory>
-				<targetPath>META-INF</targetPath>
-				<includes>
-					<include>notice.txt</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>
-					${basedir}/src/main/resources/org/acegisecurity/taglibs
-				</directory>
-				<targetPath>META-INF</targetPath>
-				<includes>
-					<include>*.tld</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>${basedir}/src/main/resources</directory>
-				<targetPath>/</targetPath>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-	</build>
-
-</project>
@@ -1,83 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-import org.acegisecurity.providers.AbstractAuthenticationToken;
-
-
-/**
- * An abstract implementation of the {@link AuthenticationManager}.
- *
- * @author Wesley Hall
- * @version $Id$
- */
-public abstract class AbstractAuthenticationManager implements AuthenticationManager {
-    //~ Methods ========================================================================================================
-
-    /**
-     * <p>An implementation of the <code>authenticate</code> method that calls the abstract method
-     * <code>doAuthenticatation</code> to do its work.</p>
-     *  <p>If doAuthenticate throws an <code>AuthenticationException</code> then the exception is populated
-     * with the failed <code>Authentication</code> object that failed.</p>
-     *
-     * @param authRequest the authentication request object
-     *
-     * @return a fully authenticated object including credentials
-     *
-     * @throws AuthenticationException if authentication fails
-     */
-    public final Authentication authenticate(Authentication authRequest)
-        throws AuthenticationException {
-        try {
-            Authentication authResult = doAuthentication(authRequest);
-            copyDetails(authRequest, authResult);
-
-            return authResult;
-        } catch (AuthenticationException e) {
-            e.setAuthentication(authRequest);
-            throw e;
-        }
-    }
-
-    /**
-     * Copies the authentication details from a source Authentication object to a destination one, provided the
-     * latter does not already have one set.
-     *
-     * @param source source authentication
-     * @param dest the destination authentication object
-     */
-    private void copyDetails(Authentication source, Authentication dest) {
-        if ((dest instanceof AbstractAuthenticationToken) && (dest.getDetails() == null)) {
-            AbstractAuthenticationToken token = (AbstractAuthenticationToken) dest;
-
-            token.setDetails(source.getDetails());
-        }
-    }
-
-    /**
-     * <p>Concrete implementations of this class override this method to provide the authentication service.</p>
-     *  <p>The contract for this method is documented in the {@link
-     * AuthenticationManager#authenticate(org.acegisecurity.Authentication)}.</p>
-     *
-     * @param authentication the authentication request object
-     *
-     * @return a fully authenticated object including credentials
-     *
-     * @throws AuthenticationException if authentication fails
-     */
-    protected abstract Authentication doAuthentication(Authentication authentication)
-        throws AuthenticationException;
-}
@@ -1,65 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Makes a final access control (authorization) decision.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface AccessDecisionManager {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Resolves an access control decision for the passed parameters.
-     *
-     * @param authentication the caller invoking the method
-     * @param object the secured object being called
-     * @param config the configuration attributes associated with the secured object being invoked
-     *
-     * @throws AccessDeniedException if access is denied as the authentication does not hold a required authority or
-     *         ACL privilege
-     * @throws InsufficientAuthenticationException if access is denied as the authentication does not provide a
-     *         sufficient level of trust
-     */
-    void decide(Authentication authentication, Object object, ConfigAttributeDefinition config)
-        throws AccessDeniedException, InsufficientAuthenticationException;
-
-    /**
-     * Indicates whether this <code>AccessDecisionManager</code> is able to process authorization requests
-     * presented with the passed <code>ConfigAttribute</code>.<p>This allows the
-     * <code>AbstractSecurityInterceptor</code> to check every configuration attribute can be consumed by the
-     * configured <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
-     * <code>AfterInvocationManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return true if this <code>AccessDecisionManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
-
-    /**
-     * Indicates whether the <code>AccessDecisionManager</code> implementation is able to provide access
-     * control decisions for the indicated secured object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return <code>true</code> if the implementation can process the indicated class
-     */
-    boolean supports(Class clazz);
-}
@@ -1,47 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Thrown if an {@link Authentication} object does not hold a required authority.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AccessDeniedException extends AcegiSecurityException {
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs an <code>AccessDeniedException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public AccessDeniedException(String msg) {
-        super(msg);
-    }
-
-/**
-     * Constructs an <code>AccessDeniedException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AccessDeniedException(String msg, Throwable t) {
-        super(msg, t);
-    }
-}
@@ -1,48 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Thrown if an authentication request is rejected because the account has expired. Makes no assertion as to
- * whether or not the credentials were valid.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AccountExpiredException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs a <code>AccountExpiredException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public AccountExpiredException(String msg) {
-        super(msg);
-    }
-
-/**
-     * Constructs a <code>AccountExpiredException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AccountExpiredException(String msg, Throwable t) {
-        super(msg, t);
-    }
-}
@@ -1,43 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.context.support.ResourceBundleMessageSource;
-
-
-/**
- * The default <code>MessageSource</code> used by Acegi Security.<p>All Acegi Security classes requiring messge
- * localization will by default use this class. However, all such classes will also implement
- * <code>MessageSourceAware</code> so that the application context can inject an alternative message source. Therefore
- * this class is only used when the deployment environment has not specified an alternative message source.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AcegiMessageSource extends ResourceBundleMessageSource {
-    //~ Constructors ===================================================================================================
-
-    public AcegiMessageSource() {
-        setBasename("org.acegisecurity.messages");
-    }
-
-    //~ Methods ========================================================================================================
-
-    public static MessageSourceAccessor getAccessor() {
-        return new MessageSourceAccessor(new AcegiMessageSource());
-    }
-}
@@ -1,51 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-import org.springframework.core.NestedRuntimeException;
-
-
-/**
- * Abstract superclass for all exceptions thrown in the security package and subpackages.<p>Note that this is a
- * runtime (unchecked) exception. Security exceptions are usually fatal; there is no reason for them to be checked.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public abstract class AcegiSecurityException extends NestedRuntimeException {
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs an <code>AcegiSecurityException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t the root cause
-     */
-    public AcegiSecurityException(String msg, Throwable t) {
-        super(msg, t);
-    }
-
-/**
-     * Constructs an <code>AcegiSecurityException</code> with the specified
-     * message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public AcegiSecurityException(String msg) {
-        super(msg);
-    }
-}
@@ -1,89 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Reviews the <code>Object</code> returned from a secure object invocation,
- * being able to modify the <code>Object</code> or throw an {@link
- * AccessDeniedException}.
- *
- * <p>
- * Typically used to ensure the principal is permitted to access the domain
- * object instance returned by a service layer bean. Can also be used to
- * mutate the domain object instance so the principal is only able to access
- * authorised bean properties or <code>Collection</code> elements. Often used
- * in conjunction with an {@link org.acegisecurity.acl.AclManager} to
- * obtain the access control list applicable for the domain object instance.
- * </p>
- *
- * <p>
- * Special consideration should be given to using an
- * <code>AfterInvocationManager</code> on bean methods that modify a database.
- * Typically an <code>AfterInvocationManager</code> is used with read-only
- * methods, such as <code>public DomainObject getById(id)</code>. If used with
- * methods that modify a database, a transaction manager should be used to
- * ensure any <code>AccessDeniedException</code> will cause a rollback of the
- * changes made by the transaction.
- * </p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface AfterInvocationManager {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Given the details of a secure object invocation including its returned <code>Object</code>, make an
-     * access control decision or optionally modify the returned <code>Object</code>.
-     *
-     * @param authentication the caller that invoked the method
-     * @param object the secured object that was called
-     * @param config the configuration attributes associated with the secured object that was invoked
-     * @param returnedObject the <code>Object</code> that was returned from the secure object invocation
-     *
-     * @return the <code>Object</code> that will ultimately be returned to the caller (if an implementation does not
-     *         wish to modify the object to be returned to the caller, the implementation should simply return the
-     *         same object it was passed by the <code>returnedObject</code> method argument)
-     *
-     * @throws AccessDeniedException if access is denied
-     */
-    Object decide(Authentication authentication, Object object, ConfigAttributeDefinition config,
-        Object returnedObject) throws AccessDeniedException;
-
-    /**
-     * Indicates whether this <code>AfterInvocationManager</code> is able to process "after invocation"
-     * requests presented with the passed <code>ConfigAttribute</code>.<p>This allows the
-     * <code>AbstractSecurityInterceptor</code> to check every configuration attribute can be consumed by the
-     * configured <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
-     * <code>AfterInvocationManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return true if this <code>AfterInvocationManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
-
-    /**
-     * Indicates whether the <code>AfterInvocationManager</code> implementation is able to provide access
-     * control decisions for the indicated secured object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return <code>true</code> if the implementation can process the indicated class
-     */
-    boolean supports(Class clazz);
-}
@@ -1,106 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-import java.io.Serializable;
-
-import java.security.Principal;
-
-
-/**
- * Represents an authentication request.
- *
- * <p>
- * An <code>Authentication</code> object is not considered authenticated until
- * it is processed by an {@link AuthenticationManager}.
- * </p>
- *
- * <p>
- * Stored in a request {@link org.acegisecurity.context.SecurityContext}.
- * </p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface Authentication extends Principal, Serializable {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Set by an <code>AuthenticationManager</code> to indicate the authorities that the principal has been
-     * granted. Note that classes should not rely on this value as being valid unless it has been set by a trusted
-     * <code>AuthenticationManager</code>.<p>Implementations should ensure that modifications to the returned
-     * array do not affect the state of the Authentication object (e.g. by returning an array copy).</p>
-     *
-     * @return the authorities granted to the principal, or <code>null</code> if authentication has not been completed
-     */
-    GrantedAuthority[] getAuthorities();
-
-    /**
-     * The credentials that prove the principal is correct. This is usually a password, but could be anything
-     * relevant to the <code>AuthenticationManager</code>. Callers are expected to populate the credentials.
-     *
-     * @return the credentials that prove the identity of the <code>Principal</code>
-     */
-    Object getCredentials();
-
-    /**
-     * Stores additional details about the authentication request. These might be an IP address, certificate
-     * serial number etc.
-     *
-     * @return additional details about the authentication request, or <code>null</code> if not used
-     */
-    Object getDetails();
-
-    /**
-     * The identity of the principal being authenticated. This is usually a username. Callers are expected to
-     * populate the principal.
-     *
-     * @return the <code>Principal</code> being authenticated
-     */
-    Object getPrincipal();
-
-    /**
-     * Used to indicate to <code>AbstractSecurityInterceptor</code> whether it should present the
-     * authentication token to the <code>AuthenticationManager</code>. Typically an <code>AuthenticationManager</code>
-     * (or, more often, one of its <code>AuthenticationProvider</code>s) will return an immutable authentication token
-     * after successful authentication, in which case that token can safely return <code>true</code> to this method.
-     * Returning <code>true</code> will improve performance, as calling the <code>AuthenticationManager</code> for
-     * every request will no longer be necessary.<p>For security reasons, implementations of this interface
-     * should be very careful about returning <code>true</code> to this method unless they are either immutable, or
-     * have some way of ensuring the properties have not been changed since original creation.</p>
-     *
-     * @return true if the token has been authenticated and the <code>AbstractSecurityInterceptor</code> does not need
-     *         to represent the token for re-authentication to the <code>AuthenticationManager</code>
-     */
-    boolean isAuthenticated();
-
-    /**
-     * See {@link #isAuthenticated()} for a full description.<p>Implementations should <b>always</b> allow this
-     * method to be called with a <code>false</code> parameter, as this is used by various classes to specify the
-     * authentication token should not be trusted. If an implementation wishes to reject an invocation with a
-     * <code>true</code> parameter (which would indicate the authentication token is trusted - a potential security
-     * risk) the implementation should throw an {@link IllegalArgumentException}.</p>
-     *
-     * @param isAuthenticated <code>true</code> if the token should be trusted (which may result in an exception) or
-     *        <code>false</code> if the token should not be trusted
-     *
-     * @throws IllegalArgumentException if an attempt to make the authentication token trusted (by passing
-     *         <code>true</code> as the argument) is rejected due to the implementation being immutable or
-     *         implementing its own alternative approach to {@link #isAuthenticated()}
-     */
-    void setAuthenticated(boolean isAuthenticated)
-        throws IllegalArgumentException;
-}
@@ -1,48 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Thrown if an authentication request is rejected because there is no {@link Authentication} object in the  {@link
- * org.acegisecurity.context.SecurityContext SecurityContext}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AuthenticationCredentialsNotFoundException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs an <code>AuthenticationCredentialsNotFoundException</code>
-     * with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationCredentialsNotFoundException(String msg) {
-        super(msg);
-    }
-
-/**
-     * Constructs an <code>AuthenticationCredentialsNotFoundException</code>
-     * with the specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AuthenticationCredentialsNotFoundException(String msg, Throwable t) {
-        super(msg, t);
-    }
-}
@@ -1,63 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Abstract superclass for all exceptions related an {@link Authentication} object being invalid for whatever
- * reason.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public abstract class AuthenticationException extends AcegiSecurityException {
-    //~ Instance fields ================================================================================================
-
-    /** The authentication that related to this exception (may be <code>null</code>) */
-    private Authentication authentication;
-
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs an <code>AuthenticationException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t the root cause
-     */
-    public AuthenticationException(String msg, Throwable t) {
-        super(msg, t);
-    }
-
-/**
-     * Constructs an <code>AuthenticationException</code> with the specified
-     * message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationException(String msg) {
-        super(msg);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public Authentication getAuthentication() {
-        return authentication;
-    }
-
-    void setAuthentication(Authentication authentication) {
-        this.authentication = authentication;
-    }
-}
@@ -1,49 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Processes an {@link Authentication} request.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface AuthenticationManager {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Attempts to authenticate the passed {@link Authentication} object, returning a fully populated
-     * <code>Authentication</code> object (including granted authorities) if successful.<p>An
-     * <code>AuthenticationManager</code> must honour the following contract concerning exceptions:</p>
-     *  <p>A {@link DisabledException} must be thrown if an account is disabled and the
-     * <code>AuthenticationManager</code> can test for this state.</p>
-     *  <p>A {@link LockedException} must be thrown if an account is locked and the
-     * <code>AuthenticationManager</code> can test for account locking.</p>
-     *  <p>A {@link BadCredentialsException} must be thrown if incorrect credentials are presented. Whilst the
-     * above exceptions are optional, an <code>AuthenticationManager</code> must <B>always</B> test credentials.</p>
-     *  <p>Exceptions should be tested for and if applicable thrown in the order expressed above (ie if an
-     * account is disabled or locked, the authentication request is immediately rejected and the credentials testing
-     * process is not performed). This prevents credentials being tested against  disabled or locked accounts.</p>
-     *
-     * @param authentication the authentication request object
-     *
-     * @return a fully authenticated object including credentials
-     *
-     * @throws AuthenticationException if authentication fails
-     */
-    Authentication authenticate(Authentication authentication)
-        throws AuthenticationException;
-}
@@ -1,48 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Thrown if an authentication request could not be processed due to a system problem.<p>This might be thrown if a
- * backend authentication repository is  unavailable.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AuthenticationServiceException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
-
-/**
-     * Constructs an <code>AuthenticationServiceException</code> with the
-     * specified message.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationServiceException(String msg) {
-        super(msg);
-    }
-
-/**
-     * Constructs an <code>AuthenticationServiceException</code> with the
-     * specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AuthenticationServiceException(String msg, Throwable t) {
-        super(msg, t);
-    }
-}
@@ -1,56 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-/**
- * Evaluates <code>Authentication</code> tokens
- *
- * @author Ben Alex
- * @version $Id$
- */
-public interface AuthenticationTrustResolver {
-    //~ Methods ========================================================================================================
-
-    /**
-     * Indicates whether the passed <code>Authentication</code> token represents an anonymous user. Typically
-     * the framework will call this method if it is trying to decide whether an <code>AccessDeniedException</code>
-     * should result in a final rejection (ie as would be the case if the principal was non-anonymous/fully
-     * authenticated) or direct the principal to attempt actual authentication (ie as would be the case if the
-     * <code>Authentication</code> was merely anonymous).
-     *
-     * @param authentication to test (may be <code>null</code> in which case the method will always return
-     *        <code>false</code>)
-     *
-     * @return <code>true</code> the passed authentication token represented an anonymous principal, <code>false</code>
-     *         otherwise
-     */
-    boolean isAnonymous(Authentication authentication);
-
-    /**
-     * Indicates whether the passed <code>Authentication</code> token represents user that has been remembered
-     * (ie not a user that has been fully authenticated).<p><b>No part of the framework uses this method</b>,
-     * as it is a weak definition of trust levels. The method is provided simply to assist with custom
-     * <code>AccessDecisionVoter</code>s and the like that you might develop. Of course, you don't need to use this
-     * method either and can develop your own "trust level" hierarchy instead.</p>
-     *
-     * @param authentication to test (may be <code>null</code> in which case the method will always return
-     *        <code>false</code>)
-     *
-     * @return <code>true</code> the passed authentication token represented a principal authenticated using a
-     *         remember-me token, <code>false</code> otherwise
-     */
-    boolean isRememberMe(Authentication authentication);
-}
@@ -1,70 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity;
-
-import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
-import org.acegisecurity.providers.rememberme.RememberMeAuthenticationToken;
-
-
-/**
- * Basic implementation of {@link AuthenticationTrustResolver}.<p>Makes trust decisions based on whether the passed
- * <code>Authentication</code> is an instance of a defined class.</p>
- *  <p>If {@link #anonymousClass} or {@link #rememberMeClass} is <code>null</code>, the corresponding method will
- * always return <code>false</code>.</p>
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class AuthenticationTrustResolverImpl implements AuthenticationTrustResolver {
-    //~ Instance fields ================================================================================================
-
-    private Class anonymousClass = AnonymousAuthenticationToken.class;
-    private Class rememberMeClass = RememberMeAuthenticationToken.class;
-
-    //~ Methods ========================================================================================================
-
-    public Class getAnonymousClass() {
-        return anonymousClass;
-    }
-
-    public Class getRememberMeClass() {
-        return rememberMeClass;
-    }
-
-    public boolean isAnonymous(Authentication authentication) {
-        if ((anonymousClass == null) || (authentication == null)) {
-            return false;
-        }
-
-        return anonymousClass.isAssignableFrom(authentication.getClass());
-    }
-
-    public boolean isRememberMe(Authentication authentication) {
-        if ((rememberMeClass == null) || (authentication == null)) {
-            return false;
-        }
-
-        return rememberMeClass.isAssignableFrom(authentication.getClass());
-    }
-
-    public void setAnonymousClass(Class anonymousClass) {
-        this.anonymousClass = anonymousClass;
-    }
-
-    public void setRememberMeClass(Class rememberMeClass) {
-        this.rememberMeClass = rememberMeClass;
-    }
-}
--- a/Show More
+++ b/Show More