diff --git a/readme.txt b/readme.txt
index fbfa52f184..db3d9cd534 100644
--- a/readme.txt
+++ b/readme.txt
@@ -28,6 +28,14 @@ DOCUMENTATION
Please refer to the Reference Guide, which is located in the docs/reference
directory. In addition, JavaDocs are located in the docs/api directory.
+-------------------------------------------------------------------------------
+ADDING ACEGI SECURITY TO YOUR OWN APPLICATION
+-------------------------------------------------------------------------------
+
+Take a look in samples/quick-start. There we give you the fragments to add to
+your existing web.xml and applicationContext.xml, along with a couple of files
+that need to be added to your WAR file.
+
-------------------------------------------------------------------------------
OBTAINING SUPPORT
-------------------------------------------------------------------------------
diff --git a/samples/quick-start/.cvsignore b/samples/quick-start/.cvsignore
new file mode 100644
index 0000000000..13350339d1
--- /dev/null
+++ b/samples/quick-start/.cvsignore
@@ -0,0 +1,5 @@
+classes
+dist
+api
+build.properties
+temporary
diff --git a/samples/quick-start/readme.txt b/samples/quick-start/readme.txt
new file mode 100644
index 0000000000..7871006d8b
--- /dev/null
+++ b/samples/quick-start/readme.txt
@@ -0,0 +1,51 @@
+===============================================================================
+ QUICK-START SAMPLE
+===============================================================================
+
+Acegi Security's flexibility can be a bit daunting. Because projects only have
+so much budget, and people only have so much time, often the complexity of
+getting started can seem too high a price to pay. The quick-start sample is
+designed to provide you the basic building blocks needed to be added to your
+existing application.
+
+Quick-start is not executable or deployable. It's just a convenient, simple
+place where you can see what needs to be added to your web application's
+existing files and directories.
+
+What you _will_ need to change in the quick-start configuration:
+
+- It protects a /secure directory from HTTP requests. The /secure directory
+ is included (along with a debug.jsp you might find useful), but can be
+ deleted as soon as you are up and running. You'll need to setup your own
+ URLs to protect in the applicationContext.xml. Search for the
+ FilterInvocationInterceptor bean.
+
+What you _may_ need to change in the quick-start configuration:
+
+- It uses an in-memory list of users as your authentication repository. This
+ means you edit the XML file to add users, change their roles etc. If you'd
+ prefer to use a database, remove the InMemoryDaoImpl from the
+ applicationContext.xml, and add in a JdbcDaoImpl bean. For an example of
+ using the JdbcDaoImpl, search the reference guide.
+
+What does this buy you? Not a great deal more than using the Servlet spec
+(although we do support regular expressions and Ant paths for URL matching)!
+Seriously, you can use the Servlet spec to protect URLs, so why bother?
+The quick-start sample provides you the BASE security building blocks for
+your application. Whilst there's nothing wrong with using it instead of the
+Servlet spec security just for the better path support or avoiding the
+multitude of container authentication configurations, most people will use it
+because this foundation allows you to simply tweak configuration if you wish
+to:
+
+- Protect your business beans (search for MethodSecurityInterceptor in docs)
+- Use enterprise-wide single sign on (see CAS section in docs)
+- Use custom authorization voters (see Authorization section in docs)
+- Deploy custom authentication providers (see Authentication section in docs)
+- Perform BASIC authentication (search for BasicProcessingFilter in docs)
+- Automate HTTPS redirection (see Channel Security section in docs)
+
+Good luck! Don't forget we're happy to help. See the end of the docs for
+contact details.
+
+$Id$
diff --git a/samples/quick-start/war-root/WEB-INF/.cvsignore b/samples/quick-start/war-root/WEB-INF/.cvsignore
new file mode 100644
index 0000000000..86e9501ee1
--- /dev/null
+++ b/samples/quick-start/war-root/WEB-INF/.cvsignore
@@ -0,0 +1,2 @@
+lib
+
diff --git a/samples/quick-start/war-root/WEB-INF/applicationContext.xml b/samples/quick-start/war-root/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000000..c242534750
--- /dev/null
+++ b/samples/quick-start/war-root/WEB-INF/applicationContext.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR
+ dianne=emu,ROLE_TELLER
+ scott=wombat,ROLE_TELLER
+ peter=opal,disabled,ROLE_TELLER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ Login
+
+ If you've used the standardInMemoryDaoImpl config, try these users:
+
+
username marissa, password koala (granted ROLE_SUPERVISOR)
+
username dianne, password emu (not a supervisor)
+
username scott, password wombat (not a supervisor)
+
+
+ <%-- this form-login-page form is also used as the
+ form-error-page to ask for a login again.
+ --%>
+
+
+ Your login attempt was not successful, try again.
+ Reason: <%= ((AuthenticationException) session.getAttribute(AbstractProcessingFilter.ACEGI_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %>
+
+
+
+
+
+
+
diff --git a/samples/quick-start/war-root/logoff.jsp b/samples/quick-start/war-root/logoff.jsp
new file mode 100644
index 0000000000..6384a8a022
--- /dev/null
+++ b/samples/quick-start/war-root/logoff.jsp
@@ -0,0 +1,3 @@
+<%session.invalidate();
+response.sendRedirect("index.jsp");
+%>
\ No newline at end of file
diff --git a/samples/quick-start/war-root/secure/debug.jsp b/samples/quick-start/war-root/secure/debug.jsp
new file mode 100644
index 0000000000..47f12d3353
--- /dev/null
+++ b/samples/quick-start/war-root/secure/debug.jsp
@@ -0,0 +1,47 @@
+<%@ page import="net.sf.acegisecurity.context.Context" %>
+<%@ page import="net.sf.acegisecurity.context.ContextHolder" %>
+<%@ page import="net.sf.acegisecurity.context.SecureContext" %>
+<%@ page import="net.sf.acegisecurity.Authentication" %>
+<%@ page import="net.sf.acegisecurity.GrantedAuthority" %>
+<%@ page import="net.sf.acegisecurity.adapters.AuthByAdapter" %>
+
+<% Context context = ContextHolder.getContext();
+if (context != null) { %>
+ Context on ContextHolder is of type: <%= context.getClass().getName() %>
+
+<% if (context instanceof SecureContext) { %>
+ The Context implements SecureContext.
+<% SecureContext sc = (SecureContext) context;
+
+ Authentication auth = sc.getAuthentication();
+ if (auth != null) { %>
+ Authentication object is of type: <%= auth.getClass().getName() %>
+ Authentication object as a String: <%= auth.toString() %>
+
+ Authentication object holds the following granted authorities:
+<% GrantedAuthority[] granted = auth.getAuthorities();
+ for (int i = 0; i < granted.length; i++) { %>
+ <%= granted[i].toString() %> (getAuthority(): <%= granted[i].getAuthority() %>)
+<% }
+
+ if (auth instanceof AuthByAdapter) { %>
+
SUCCESS! Your container adapter appears to be properly configured!
+<% } else { %>
+
SUCCESS! Your web filter appears to be properly configured!
+<% }
+
+ } else { %>
+ Authentication object is null.
+ This is an error and your container adapter will not operate properly until corrected.
+<% }
+ } else { %>
+ ContextHolder does not contain a SecureContext.
+ This is an error and your container adapter will not operate properly until corrected.
+<% }
+} else { %>
+ ContextHolder on ContextHolder is null.
+ This indicates improper setup of the container adapter. Refer to the reference documentation.
+ Also ensure the correct subclass of AbstractMvcIntegrationInterceptor is being used for your container.
+<%}
+%>
+