From 6988be2ef2782d53b5ba641d6b2e44c69f360da4 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Tue, 4 Sep 2007 23:59:25 +0000 Subject: [PATCH] SEC-540,SEC-541. Reorganized to get docbook to generate prior to the site with images correct for both pdf and html. Borrowed nuxeo project stylesheets. --- pom.xml | 92 +++++++++++++----- .../guide => docbkx}/images/ACLSecurity.gif | Bin .../images/AccessDecisionVoting.gif | Bin .../images/AfterInvocation.gif | Bin .../images/Authentication.gif | Bin .../images/BasicAclProvider.gif | Bin .../guide => docbkx}/images/Context.gif | Bin .../guide => docbkx}/images/Permissions.gif | Bin .../images/SecurityInterception.gif | Bin .../guide => docbkx}/images/logo.gif | Bin .../guide => docbkx}/images/logo.psd | Bin src/docbkx/springsecurity.xml | 10 +- src/site/resources/images/logo.gif | Bin 0 -> 8919 bytes 13 files changed, 75 insertions(+), 27 deletions(-) rename src/{site/resources/guide => docbkx}/images/ACLSecurity.gif (100%) rename src/{site/resources/guide => docbkx}/images/AccessDecisionVoting.gif (100%) rename src/{site/resources/guide => docbkx}/images/AfterInvocation.gif (100%) rename src/{site/resources/guide => docbkx}/images/Authentication.gif (100%) rename src/{site/resources/guide => docbkx}/images/BasicAclProvider.gif (100%) rename src/{site/resources/guide => docbkx}/images/Context.gif (100%) rename src/{site/resources/guide => docbkx}/images/Permissions.gif (100%) rename src/{site/resources/guide => docbkx}/images/SecurityInterception.gif (100%) rename src/{site/resources/guide => docbkx}/images/logo.gif (100%) rename src/{site/resources/guide => docbkx}/images/logo.psd (100%) create mode 100644 src/site/resources/images/logo.gif diff --git a/pom.xml b/pom.xml index 4b64e8a801..b44f24b99c 100644 --- a/pom.xml +++ b/pom.xml @@ -136,11 +136,6 @@ +10 - - Francois Beausoleil - fbos - fbos at users.sourceforge.net - Colin Sampaleanu colins @@ -155,7 +150,7 @@ Luke Taylor luke_t - luke at monkeymachine.ltd.uk + luke_t at users.sourceforge.net Monkey Machine Ltd. (http://monkeymachine.ltd.uk) @@ -177,15 +172,11 @@ markstg at users.sourceforge.net - Vishal Puri - vishalpuri - vishalpuri at users.sourceforge.net - - Interface21 Pty Limited (http://www.interface21.com) - - +10 + John A. Lewis + johnalewis + johnalewis at users.sourceforge.net - + @@ -198,6 +189,9 @@ Patrick Burleson + Francois Beausoleil + + Wesley Hall @@ -236,7 +230,16 @@ Robin Bramley - + + Robert Sanders + + + Vishal Puri + + + Martin Algesten + + @@ -386,6 +389,52 @@ com.agilejava.docbkx docbkx-maven-plugin 2.0.6 + + + build-singlehtml-doc + pre-site + + generate-html + + + ${docbook.source} + ${docbook.target} + springsecurity.xml + false + + + + + + + + + + + + + + build-pdf-doc + pre-site + + generate-pdf + + + ${docbook.source} + ${docbook.target} + springsecurity.xml + ${docbook.source}/ + ${docbook.source}/resources/images/admons/ + ${docbook.source}/resources/xsl/spring-security-docbook-fopdf.xsl + + + + org.docbook @@ -394,9 +443,6 @@ runtime - - ${basedir}/target/site/guide - @@ -422,12 +468,6 @@ ---> - org.codehaus.mojo @@ -528,6 +568,8 @@ 1.2.9 - + ${basedir}/src/docbkx + ${basedir}/target/site/guide + \ No newline at end of file diff --git a/src/site/resources/guide/images/ACLSecurity.gif b/src/docbkx/images/ACLSecurity.gif similarity index 100% rename from src/site/resources/guide/images/ACLSecurity.gif rename to src/docbkx/images/ACLSecurity.gif diff --git a/src/site/resources/guide/images/AccessDecisionVoting.gif b/src/docbkx/images/AccessDecisionVoting.gif similarity index 100% rename from src/site/resources/guide/images/AccessDecisionVoting.gif rename to src/docbkx/images/AccessDecisionVoting.gif diff --git a/src/site/resources/guide/images/AfterInvocation.gif b/src/docbkx/images/AfterInvocation.gif similarity index 100% rename from src/site/resources/guide/images/AfterInvocation.gif rename to src/docbkx/images/AfterInvocation.gif diff --git a/src/site/resources/guide/images/Authentication.gif b/src/docbkx/images/Authentication.gif similarity index 100% rename from src/site/resources/guide/images/Authentication.gif rename to src/docbkx/images/Authentication.gif diff --git a/src/site/resources/guide/images/BasicAclProvider.gif b/src/docbkx/images/BasicAclProvider.gif similarity index 100% rename from src/site/resources/guide/images/BasicAclProvider.gif rename to src/docbkx/images/BasicAclProvider.gif diff --git a/src/site/resources/guide/images/Context.gif b/src/docbkx/images/Context.gif similarity index 100% rename from src/site/resources/guide/images/Context.gif rename to src/docbkx/images/Context.gif diff --git a/src/site/resources/guide/images/Permissions.gif b/src/docbkx/images/Permissions.gif similarity index 100% rename from src/site/resources/guide/images/Permissions.gif rename to src/docbkx/images/Permissions.gif diff --git a/src/site/resources/guide/images/SecurityInterception.gif b/src/docbkx/images/SecurityInterception.gif similarity index 100% rename from src/site/resources/guide/images/SecurityInterception.gif rename to src/docbkx/images/SecurityInterception.gif diff --git a/src/site/resources/guide/images/logo.gif b/src/docbkx/images/logo.gif similarity index 100% rename from src/site/resources/guide/images/logo.gif rename to src/docbkx/images/logo.gif diff --git a/src/site/resources/guide/images/logo.psd b/src/docbkx/images/logo.psd similarity index 100% rename from src/site/resources/guide/images/logo.psd rename to src/docbkx/images/logo.psd diff --git a/src/docbkx/springsecurity.xml b/src/docbkx/springsecurity.xml index cc076c4d4a..5e6a8f4eee 100644 --- a/src/docbkx/springsecurity.xml +++ b/src/docbkx/springsecurity.xml @@ -812,8 +812,14 @@ if (obj instanceof UserDetails) { - + + + + + Figure 1: The key "secure object" model @@ -4671,7 +4677,7 @@ public boolean supports(Class clazz); implementations. - + diff --git a/src/site/resources/images/logo.gif b/src/site/resources/images/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..f7765dbbb7628caf5f4293688a077d3a021478c0 GIT binary patch literal 8919 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 literal 0 HcmV?d00001