diff --git a/doc/src/site/resources/announcements/announcement-0.1.txt b/src/site/resources/announcements/announcement-0.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.1.txt rename to src/site/resources/announcements/announcement-0.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.2.txt b/src/site/resources/announcements/announcement-0.2.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.2.txt rename to src/site/resources/announcements/announcement-0.2.txt diff --git a/doc/src/site/resources/announcements/announcement-0.3.txt b/src/site/resources/announcements/announcement-0.3.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.3.txt rename to src/site/resources/announcements/announcement-0.3.txt diff --git a/doc/src/site/resources/announcements/announcement-0.4.txt b/src/site/resources/announcements/announcement-0.4.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.4.txt rename to src/site/resources/announcements/announcement-0.4.txt diff --git a/doc/src/site/resources/announcements/announcement-0.5.1.txt b/src/site/resources/announcements/announcement-0.5.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.5.1.txt rename to src/site/resources/announcements/announcement-0.5.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.5.txt b/src/site/resources/announcements/announcement-0.5.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.5.txt rename to src/site/resources/announcements/announcement-0.5.txt diff --git a/doc/src/site/resources/announcements/announcement-0.6.1.txt b/src/site/resources/announcements/announcement-0.6.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.6.1.txt rename to src/site/resources/announcements/announcement-0.6.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.6.txt b/src/site/resources/announcements/announcement-0.6.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.6.txt rename to src/site/resources/announcements/announcement-0.6.txt diff --git a/doc/src/site/resources/announcements/announcement-0.7.0.txt b/src/site/resources/announcements/announcement-0.7.0.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.7.0.txt rename to src/site/resources/announcements/announcement-0.7.0.txt diff --git a/doc/src/site/resources/announcements/announcement-0.7.1.txt b/src/site/resources/announcements/announcement-0.7.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.7.1.txt rename to src/site/resources/announcements/announcement-0.7.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.8.0.txt b/src/site/resources/announcements/announcement-0.8.0.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.8.0.txt rename to src/site/resources/announcements/announcement-0.8.0.txt diff --git a/doc/src/site/resources/announcements/announcement-0.8.1.1.txt b/src/site/resources/announcements/announcement-0.8.1.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.8.1.1.txt rename to src/site/resources/announcements/announcement-0.8.1.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.8.1.txt b/src/site/resources/announcements/announcement-0.8.1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.8.1.txt rename to src/site/resources/announcements/announcement-0.8.1.txt diff --git a/doc/src/site/resources/announcements/announcement-0.8.2.txt b/src/site/resources/announcements/announcement-0.8.2.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.8.2.txt rename to src/site/resources/announcements/announcement-0.8.2.txt diff --git a/doc/src/site/resources/announcements/announcement-0.8.3.txt b/src/site/resources/announcements/announcement-0.8.3.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.8.3.txt rename to src/site/resources/announcements/announcement-0.8.3.txt diff --git a/doc/src/site/resources/announcements/announcement-0.9.0.txt b/src/site/resources/announcements/announcement-0.9.0.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-0.9.0.txt rename to src/site/resources/announcements/announcement-0.9.0.txt diff --git a/doc/src/site/resources/announcements/announcement-1.0.0 Final.txt b/src/site/resources/announcements/announcement-1.0.0 Final.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-1.0.0 Final.txt rename to src/site/resources/announcements/announcement-1.0.0 Final.txt diff --git a/doc/src/site/resources/announcements/announcement-1.0.0 RC1.txt b/src/site/resources/announcements/announcement-1.0.0 RC1.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-1.0.0 RC1.txt rename to src/site/resources/announcements/announcement-1.0.0 RC1.txt diff --git a/doc/src/site/resources/announcements/announcement-1.0.0 RC2.txt b/src/site/resources/announcements/announcement-1.0.0 RC2.txt similarity index 100% rename from doc/src/site/resources/announcements/announcement-1.0.0 RC2.txt rename to src/site/resources/announcements/announcement-1.0.0 RC2.txt diff --git a/src/site/resources/upgrade/upgrade-03-04.html b/src/site/xdoc/upgrade/upgrade-03-04.xml similarity index 80% rename from src/site/resources/upgrade/upgrade-03-04.html rename to src/site/xdoc/upgrade/upgrade-03-04.xml index ceb66fe29d..71007bc590 100644 --- a/src/site/resources/upgrade/upgrade-03-04.html +++ b/src/site/xdoc/upgrade/upgrade-03-04.xml @@ -1,16 +1,10 @@ - - -Acegi Security - Upgrading from version 0.3 to 0.4 - - -

Upgrading from 0.3 to 0.4

- -

Several changes were made between version 0.3 and 0.4 of the project. + +Acegi Security - Upgrading from version 0.3 to 0.4

Several changes were made between version 0.3 and 0.4 of the project. These changes increased the modularity of the code, enhanced unit testing, made package roles clearer, and added compelling alternatives to container adapters and using web.xml security constraints to protect HTTP resources. -

Unfortunately, changes to the API and package locations were required. The +

Unfortunately, changes to the API and package locations were required. The following should help most casual users of the project update their applications: @@ -34,20 +28,21 @@ applications: net.sf.acegisecurity.intercept.web package. This will give you considerably more flexibility, and reuse the same concepts as you'd be familiar with via the method security interception system. Refer to the reference - documentation or Contacts sample application. + documentation or Contacts sample application.

  • The Contacts sample application now builds two distributions: contacts.war can be instantly deployed without configuring any container adapters, whilst contacts-container-adapter.war still uses container adapters. The contacts.war uses the net.sf.acegisecurity.intercept.web package to - protect HTTP URLs, rather than web.xml s.
    • + protect HTTP URLs, rather than web.xml s.
  • If you're using the Jetty container adapter, please check the jetty.xml requirements in the reference documentation. There has been a minor change.
    • -

    +

    We hope you find the new features useful in your projects. - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-04-05.html b/src/site/xdoc/upgrade/upgrade-04-05.xml similarity index 88% rename from src/site/resources/upgrade/upgrade-04-05.html rename to src/site/xdoc/upgrade/upgrade-04-05.xml index 38c698d8d1..255a9c5bb6 100644 --- a/src/site/resources/upgrade/upgrade-04-05.html +++ b/src/site/xdoc/upgrade/upgrade-04-05.xml @@ -1,11 +1,5 @@ - - -Acegi Security - Upgrading from version 0.4 to 0.5 - - -

    Upgrading from 0.4 to 0.5

    - -

    The following should help most casual users of the project update their + +Acegi Security - Upgrading from version 0.4 to 0.5

    The following should help most casual users of the project update their applications:

    -

    +

    There are also lots of new features you might wish to consider for your projects. These include CAS integration, pluggable password encoders (such as MD5 and SHA), along with pluggable salt sources. We hope you find the new features useful in your projects. - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-05-06.html b/src/site/xdoc/upgrade/upgrade-05-06.xml similarity index 67% rename from src/site/resources/upgrade/upgrade-05-06.html rename to src/site/xdoc/upgrade/upgrade-05-06.xml index d372ef4331..8348c29701 100644 --- a/src/site/resources/upgrade/upgrade-05-06.html +++ b/src/site/xdoc/upgrade/upgrade-05-06.xml @@ -1,11 +1,5 @@ - - -Acegi Security - Upgrading from version 0.3 to 0.4 - - -

    Upgrading from 0.5 to 0.6

    - -

    + +Acegi Security - Upgrading from version 0.3 to 0.4

    The following should help most casual users of the project update their applications:

    - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-06-070.html b/src/site/xdoc/upgrade/upgrade-06-070.xml similarity index 93% rename from src/site/resources/upgrade/upgrade-06-070.html rename to src/site/xdoc/upgrade/upgrade-06-070.xml index 717e338339..73bf74289b 100644 --- a/src/site/resources/upgrade/upgrade-06-070.html +++ b/src/site/xdoc/upgrade/upgrade-06-070.xml @@ -1,11 +1,5 @@ - - -Acegi Security - Upgrading from version 0.6 to 0.7 - - -

    Upgrading from 0.6 to 0.7.0

    - -

    + +Acegi Security - Upgrading from version 0.6 to 0.7

    The following should help most casual users of the project update their applications:

    - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-070-080.html b/src/site/xdoc/upgrade/upgrade-070-080.xml similarity index 68% rename from src/site/resources/upgrade/upgrade-070-080.html rename to src/site/xdoc/upgrade/upgrade-070-080.xml index cdf3c41b0a..2ce1289095 100644 --- a/src/site/resources/upgrade/upgrade-070-080.html +++ b/src/site/xdoc/upgrade/upgrade-070-080.xml @@ -1,11 +1,5 @@ - - -Acegi Security - Upgrading from version 0.7.0 to 0.8.0 - - -

    Upgrading from 0.7.0 to 0.8.0

    - -

    + +Acegi Security - Upgrading from version 0.7.0 to 0.8.0

    The following should help most casual users of the project update their applications: @@ -13,34 +7,35 @@ applications:

  • HttpSessionIntegrationFilter has been removed. Use net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter instead. Note you will need to set the mandatory "context" property to something like "net.sf.acegisecurity.context.security.SecureContextImpl". - It's not the default because we want no dependencies between the context package and the rest of Acegi Security.

    • + It's not the default because we want no dependencies between the context package and the rest of Acegi Security.



  • Filter ordering has changed. See the reference guide for confirmation of the correct ordering. Basically you should have - HttpSessionContextIntegrationFilter appear before any of your authentication mechanisms.

    • + HttpSessionContextIntegrationFilter appear before any of your authentication mechanisms.



  • IoC container hosted filter chains can now be used instead of lengthy web.xml declarations. See the reference guide or the - Contacts Sample for further information.

    • + Contacts Sample for further information.



  • Certain classes have been moved to new packages: ContextHolderAwareRequestWrapper (and its filter), AuthenticationSimpleHttpInvokerRequestExecutor, ContextPropagatingRemoteInvocation, SecureContext (and its implementation). These classes were moved as part of refactorings aimed at - improving the simplicity of the project's design.

    • + improving the simplicity of the project's design.



  • If you wish to use the new ConcurrentSessionController you must declare the HttpSessionEventPublisher context listener in your - web.xml

    • + web.xml



  • The JaasAuthenticationCallbackHandler interface has had it's setAuthentication method removed. - The handle method now takes both the Callback and Authentication objects as arguments.

    • + The handle method now takes both the Callback and Authentication objects as arguments.



    -
  • Added AuthenticationException to the AutenticationEntryPoint.commence method signature.

    • +
  • Added AuthenticationException to the AutenticationEntryPoint.commence method signature.



    • -
  • Added AccessDeniedException to the SecurityEncorcementFilter.sendAccessDeniedError method signature.

    • +
  • Added AccessDeniedException to the SecurityEncorcementFilter.sendAccessDeniedError method signature.



  • The Authentication.getDetails() no longer returns simply the IP address used for authentication. It now returns a WebAuthenticationDetails instance, which contains the IP address, session information, - and can be extended to store further details.

    • + and can be extended to store further details.



    - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-080-090.html b/src/site/xdoc/upgrade/upgrade-080-090.xml similarity index 67% rename from src/site/resources/upgrade/upgrade-080-090.html rename to src/site/xdoc/upgrade/upgrade-080-090.xml index c8cd60efde..fc3271ecd1 100644 --- a/src/site/resources/upgrade/upgrade-080-090.html +++ b/src/site/xdoc/upgrade/upgrade-080-090.xml @@ -1,11 +1,5 @@ - - -Acegi Security - Upgrading from version 0.8.0 to 0.9.0 - - -

    Upgrading from 0.8.0 to 0.9.0

    - -

    + +Acegi Security - Upgrading from version 0.8.0 to 0.9.0

    The following should help most casual users of the project update their applications: @@ -22,79 +16,80 @@ applications: SecurityContextHolder and provides a single getter/setter for a SecurityContext. SecurityContextHolder guarantees to never return a null SecurityContext. - SecurityContext provides single getter/setter for Authentication.

    + SecurityContext provides single getter/setter for Authentication.



    To migrate, simply modify all your code that previously worked with ContextHolder, SecureContext and Context to directly call SecurityContextHolder and work with the SecurityContext (instead of the now removed Context - and SecureContext interfaces).

    + and SecureContext interfaces).



    - For example, change:
    + For example, change:

    - SecureContext ctx = SecureContextUtils.getSecureContext();
    + SecureContext ctx = SecureContextUtils.getSecureContext();

     - to:
    + to:

    - SecurityContext ctx = SecurityContextHolder.getContext();
    + SecurityContext ctx = SecurityContextHolder.getContext();

     -
    - and change:
    +

    + and change:

    - <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter">
    - <property name="context"><value>net.sf.acegisecurity.context.security.SecureContextImpl</value></property>
    - </bean>
    + <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter">

    + <property name="context"><value>net.sf.acegisecurity.context.security.SecureContextImpl</value></property>

    + </bean>

     - to:
    + to:

    - <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter">
    - <property name="context"><value>net.sf.acegisecurity.context.SecurityContextImpl</value></property>
    - </bean>
    + <bean id="httpSessionContextIntegrationFilter" class="net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter">

    + <property name="context"><value>net.sf.acegisecurity.context.SecurityContextImpl</value></property>

    + </bean>

     -
    +

    We apologise for the inconvenience, but on a more positive note this means you receive strict type checking, you no longer need to mess around with casting to and from Context implementations, your applications no longer need to perform checking of null and - unexpected Context implementation types.

    + unexpected Context implementation types.



  • AbstractProcessingFilter has changed its getter/setter approach used for customised authentication exception directions. See the - AbstractProcessingFilter JavaDocs to learn more.

    • + AbstractProcessingFilter JavaDocs to learn more.



  • AnonymousProcessingFilter now has a removeAfterRequest property, which defaults to true. This will cause the anonymous authentication token to be set to null at the end of each request, thus avoiding the expense of creating a HttpSession in HttpSessionContextIntegrationFilter. You may set this property to false if you would like the anoymous authentication token to be preserved, - which would be an unusual requirement.

    • + which would be an unusual requirement.



  • Event publishing has been refactored. New event classes have been added, and the location of - LoggerListener has changed. See the net.sf.acegisecurity.event package.
    -
    - For example, change:
    + LoggerListener has changed. See the net.sf.acegisecurity.event package.

    +

    + For example, change:

    - <bean id="loggerListener" class="net.sf.acegisecurity.providers.dao.event.LoggerListener"/>
    + <bean id="loggerListener" class="net.sf.acegisecurity.providers.dao.event.LoggerListener"/>

     - to:
    + to:

    - <bean id="loggerListener" class="net.sf.acegisecurity.event.authentication.LoggerListener"/> -

    + <bean id="loggerListener" class="net.sf.acegisecurity.event.authentication.LoggerListener"/> +



    • -
  • Users of the <authz:authentication> JSP tag will generally need to set the operation - property equal to "username", as reflection is now used to retrieve the property displayed.

    • +
  • Users of the <authz:authentication> JSP tag will generally need to set the operation + property equal to "username", as reflection is now used to retrieve the property displayed.



  • Users of net.sf.acegisecurity.wrapper.ContextHolderAwareRequestFilter should note that it has been - renamed to net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter.

    + renamed to net.sf.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter.



  • The concurrent session support handling has changed. Please refer to the Reference Guide to - review the new configuration requirements.

    + review the new configuration requirements.



    • - - + + +

    \ No newline at end of file diff --git a/src/site/resources/upgrade/upgrade-090-100.html b/src/site/xdoc/upgrade/upgrade-090-100.xml similarity index 90% rename from src/site/resources/upgrade/upgrade-090-100.html rename to src/site/xdoc/upgrade/upgrade-090-100.xml index 93f82cf7ea..7b2d897653 100644 --- a/src/site/resources/upgrade/upgrade-090-100.html +++ b/src/site/xdoc/upgrade/upgrade-090-100.xml @@ -1,22 +1,8 @@ - - - - - - -Acegi Security - Upgrading from version 0.8.0 to 1.0.0 - - -

    Upgrading from 0.9.0 to 1.0.0

    - -

    + +Acegi Security - Upgrading from version 0.8.0 to 1.0.0

    The following should help most casual users of the project update their applications: -

    - -

    Changes 0.9.0 to RC1

    - -
    - - -

    Changes RC1 to RC2

    - - -
    - - -

    Changes RC2 to Final

    - - -
    - - - +
    \ No newline at end of file