diff --git a/doc/xdocs/building.html b/doc/xdocs/building.html
new file mode 100644
index 0000000000..275b6eee0e
--- /dev/null
+++ b/doc/xdocs/building.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+Building
+
+
+
+
+ Building Acegi Security System
+ Building from CVS
+ This project uses Maven as project manager and build tool. You only need to
+
+ - Install maven (at least 1.0).
+ - Run the following instruction on a single line to get latest sources from cvs HEAD
+ maven scm:checkout-project
+ -Dmaven.scm.method=cvs
+ -Dmaven.scm.cvs.module=acegisecurity
+ -Dmaven.scm.cvs.root=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity
+ -Dmaven.scm.checkout.dir=acegisecurity
+
+ - Run maven in any module directory, or maven multiproject:artifact in the root folder if you want to build all modules.
+
+
+
diff --git a/doc/xdocs/changes.xml b/doc/xdocs/changes.xml
new file mode 100644
index 0000000000..d43e1d12b4
--- /dev/null
+++ b/doc/xdocs/changes.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+ Acegi security changes
+
+
+
+ Major CVS repository restructure to support Maven and eliminate libraries
+ Major improvements to Contacts sample application (now demos ACL security)
+ Added AfterInvocationManager to mutate objects return from invocations
+ Added BasicAclEntryAfterInvocationProvider to ACL evaluate returned Object
+ Added BasicAclEntryAfterInvocationCollectionFilteringProvider
+ Added security propagation during RMI invocations (from sandbox)
+ Added security propagation for Spring's HTTP invoker
+ Added BasicAclEntryVoter, which votes based on AclManager permissions
+ Added AspectJ support (especially useful for instance-level security)
+ Added MethodDefinitionSourceAdvisor for performance and autoproxying
+ Added MethodDefinitionMap querying of interfaces defined by secure objects
+ Added AuthenticationProcessingFilter.setDetails for use by subclasses
+ Added 403-causing exception to HttpSession via SecurityEnforcementFilter
+ Added net.sf.acegisecurity.intercept.event package
+ Added BasicAclExtendedDao interface and JdbcExtendedDaoImpl for ACL CRUD
+ Added additional remoting protocol demonstrations to Contacts sample
+ Improved BasicAclProvider to only respond to specified ACL object requests
+ Refactored MethodDefinitionSource to work with Method, not MethodInvocation
+ Refactored AbstractSecurityInterceptor to better support other AOP libraries
+ Fixed AbstractProcessingFilter to use removeAttribute (JRun compatibility)
+ Fixed GrantedAuthorityEffectiveAclResolver support of UserDetails principals
+ Moved MethodSecurityInterceptor to ...intercept.method.aopalliance package
+ Documentation improvements
+
+
+
+
+
+
+
+
+
diff --git a/doc/xdocs/cvs-usage.html b/doc/xdocs/cvs-usage.html
new file mode 100644
index 0000000000..64937d34fc
--- /dev/null
+++ b/doc/xdocs/cvs-usage.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+CVS usage
+CVS instructions for all modules
+This instructions are general, check the module documentation if you need concrete instructions.
+modulename can be for example:
+
+ - acegisecurity (this will check out all modules)
+ - acegisecurity/core/
+ - acegisecurity/adapters/cas
+
+Web Access
+
+ http://cvs.sourceforge.net/viewcvs.py/acegisecurity
+
Anonymous Access with Maven
+ This project's CVS repository can be checked out through anonymous (pserver) CVS with the following instruction on a single line.
+maven scm:checkout-project
+ -Dmaven.scm.method=cvs
+ -Dmaven.scm.cvs.module=modulename
+ -Dmaven.scm.cvs.root=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity
+ -Dmaven.scm.checkout.dir=acegisecurity
+Anonymous CVS Access
+
+ This project's CVS repository can be checked out through anonymous (pserver)
+ CVS with the following instruction set.
+ When prompted for a password for anonymous, simply press the Enter key.
+
+ cvs -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity login
+
+ cvs -z3 -d :pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity co modulename
+
+ Updates from within the module's directory do not need the -d parameter.
+
Developer Access with Maven
+ Only project developers can access the CVS tree via this method. Substitute username with the proper value.
+ maven scm:checkout-project
+ -Dmaven.scm.method=cvs
+ -Dmaven.scm.cvs.module=modulename
+ -Dmaven.scm.cvs.root=:ext:username@cvs.sourceforge.net:/cvsroot/acegisecurity
+ -Dmaven.scm.checkout.dir=acegisecurity
+ -Dmaven.scm.cvs.rsh=ssh
+ Remember to replace 'username' with your actual username on cvs.sourceforge.net.
+ Also change ssh
in maven.scm.cvs.rsh=ssh
to the name of your ssh executable.
+ Developer CVS Access via SSH
+
+ Only project developers can access the CVS tree via this method.
+ SSH must be installed on your client machine. Substitute
+ username with the proper value. Enter your site password when prompted.
+
+
+ export CVS_RSH=ssh
+
+ cvs -z3 -d :ext:username@cvs.sourceforge.net:/cvsroot/acegisecurity co modulename
+
+ Remember to replace 'username' with your actual username on cvs.sourceforge.net.
+
CVS Access behind a firewall
+
+ For those developers who are stuck behind a corporate
+ firewall, CVSGrab
+ can use the viewcvs web interface to checkout the source code.
+
+
\ No newline at end of file
diff --git a/core/xdocs/changes.xml b/doc/xdocs/download.xml
similarity index 73%
rename from core/xdocs/changes.xml
rename to doc/xdocs/download.xml
index 9c7dfb33cf..0b14709a4f 100644
--- a/core/xdocs/changes.xml
+++ b/doc/xdocs/download.xml
@@ -1,4 +1,4 @@
-
+
+
- Acegi security changes
+ Downloading Acegi
+
-
- Migrated to Maven
-
+
diff --git a/doc/xdocs/faq.xml b/doc/xdocs/faq.xml
deleted file mode 100644
index a074913b57..0000000000
--- a/doc/xdocs/faq.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
- Acegi FAQ
-
-
-
-
-
-
- This document attempts to answer some of the more frequently asked
- questions regarding various aspects of JBoss. These questions are
- typically asked over and over again on the mailing lists and forums. As a
- courtesy to the developers, we ask that you read this document
- before posting to the mailing lists.
-
-
- General
-
-
- -
-
- What is Acegi?
-
-
-
-
-
- More FAQs ...
-
-
-
-
-
-
-
diff --git a/doc/xdocs/navigation.xml b/doc/xdocs/navigation.xml
index 29f855834b..895dc180dd 100644
--- a/doc/xdocs/navigation.xml
+++ b/doc/xdocs/navigation.xml
@@ -1,5 +1,25 @@
+
+
@@ -8,8 +28,10 @@