Moved Add-on section from external to the dedicated addons.
diff --git a/site/src/main/asciidoc/addons.adoc b/site/src/main/asciidoc/addons.adoc
index dd8b52f..0e43f4f 100644
--- a/site/src/main/asciidoc/addons.adoc
+++ b/site/src/main/asciidoc/addons.adoc
@@ -6,6 +6,21 @@
Add-ons extend the functionality of DeltaSpike and several have been developed external to the DeltaSpike project. Brief information is given here about each of the add-ons, with details of where they can be obtained from.
+== lbitonti@github
+This GitHub account contains e.g. a DBUnit Add-on for the Test-Control-Module of DeltaSpike.
+
+**Source code:** https://github.com/lbitonti/deltaspike-dbunit
+
+== os890@github
+This GitHub account contains several DeltaSpike Add-ons e.g. to integrate CDI with other frameworks.
+
+**Source code:** https://github.com/os890/
+
+== rmannibucau@github
+This GitHub account contains several DeltaSpike Add-ons e.g. an integration with the TomEE PasswordCipher API.
+
+**Source code:** https://github.com/rmannibucau/
+
== Monitoring
`ds-monitoring-addon` provides simple monitoring for several common use-cases (exceptions, performance, audits), collecting information about the monitored method-invocations during a request and enabling you to process the entries based on your requirements. For more information about its use and implementation, see http://os890.blogspot.com.au/2014/04/add-on-monitoring-lite-with-deltaspike.html[os890: [add-on\] monitoring lite with deltaspike].
@@ -19,4 +34,4 @@
== Disruptor
`ds-disruptor-addon` improves CDI synchronous event-processing performance by creating a disruptor process for every observer method, enabling CDI synchronous events in conjunction with asynchronous observers. This add-on currently works with Apache TomEE and JBoss AS 7. For more information about its use and implementation, see http://os890.blogspot.com.au/2014/05/faster-cdi-like-events.html[os890: [add-on\] fast event processing with disruptor + deltaspike].
-**Source code:** https://github.com/os890/ds-disruptor-addon
\ No newline at end of file
+**Source code:** https://github.com/os890/ds-disruptor-addon
diff --git a/site/src/main/asciidoc/external.adoc b/site/src/main/asciidoc/external.adoc
index 94edd7a..75e8111 100644
--- a/site/src/main/asciidoc/external.adoc
+++ b/site/src/main/asciidoc/external.adoc
@@ -21,7 +21,7 @@
== Presentations
=== Apache DeltaSpike: The CDI toolbox
-CDI portable extensions are one of greatest features of Java EE allowing the platform to be extended in a clean and portable way. But allowing extension is just part of the story. CDI opens the door to a whole new eco-system for Java EE, but it’s not the role of the specification to create these extensions.
+CDI portable extensions are one of greatest features of Java EE allowing the platform to be extended in a clean and portable way. But allowing extension is just part of the story. CDI opens the door to a whole new eco-system for Java EE, but it’s not the role of the specification to create these extensions.
Apache DeltaSpike is the project that leads this brand new eco-system by providing useful extension modules for CDI applications as well as tools to ease the creation of new ones.
In this session, we’ll start by presenting the DeltaSpike toolbox and show how it helps you to develop for CDI. Then we’ll describe the major extensions included in Deltaspike, including 'configuration', 'scheduling' and 'data'.
@@ -33,7 +33,7 @@
**Event:** http://www.meetup.com/JBoss-User-Group-Worldwide/events/218755922/
=== DeltaSpike: CDI extensions of the world, unite!
-Several popular CDI extension frameworks like Seam 3 and MyFaces CODI have faded out over the years. But not to worry - their functionality is taken over by projects like Picketlink, Agorava, and mainly DeltaSpike, a new Apache project that wants CDI extension authors to unite in an effort to make the life of web application developers easier. Even without a five year plan!
+Several popular CDI extension frameworks like Seam 3 and MyFaces CODI have faded out over the years. But not to worry - their functionality is taken over by projects like Picketlink, Agorava, and mainly DeltaSpike, a new Apache project that wants CDI extension authors to unite in an effort to make the life of web application developers easier. Even without a five year plan!
**Slides:** http://devconf.cz/filebrowser/download/414
@@ -50,7 +50,7 @@
**Slides:** http://www.slideshare.net/os890/myfaces-codi-and-jboss-seam3-become-apache-deltaspike
=== Migrating a JSF-Based Web Application from Spring 3 to Java EE 7 and CDI
-This talk is a detailed case study about the migration of a JSF-based web application from Spring 3 to Java EE 7 and CDI. It is presented at the JavaOne 2014 conference.
+This talk is a detailed case study about the migration of a JSF-based web application from Spring 3 to Java EE 7 and CDI. It is presented at the JavaOne 2014 conference.
**Slides:** http://www.slideshare.net/MarioLeanderReimer/migrating-a-jsfbased-web-application-from-spring-3-to-java-ee-7-and-cdi
@@ -111,14 +111,14 @@
**Source code:** https://github.com/os890/ee6-ds-demo
=== Fullstack CODI to DeltaSpike
-This pair of examples show how to achieve the most important MyFaces CODI features with DeltaSpike and also how to migrate a CODI project to DeltaSpike. The examples are basic, compacting core CODI features into just a few JSF pages, and are intended for deployment with TomEE.
+This pair of examples show how to achieve the most important MyFaces CODI features with DeltaSpike and also how to migrate a CODI project to DeltaSpike. The examples are basic, compacting core CODI features into just a few JSF pages, and are intended for deployment with TomEE.
**Source code:** https://github.com/os890/tomee_mf_stack_001
* CODI version in master branch
* Migrated DeltaSpike version in codi2ds branch
-=== JBoss Quickstarts
+=== JBoss Quickstarts
The JBoss quickstarts are small working examples that demonstrate recommended practices for specific Java EE technology use cases. A subset of these quickstarts are dedicated to demonstrating DeltaSpike, including custom authorization restrictions using annotations, constructing and modifying beans, extending the influence of CDI using BeanManager, and deactivating DeltaSpike features.
**Source code:** https://github.com/jboss-developer/jboss-wfk-quickstarts
@@ -203,7 +203,7 @@
=== JSF + CDI + DS (Servlet-Container)
**Source code:** https://github.com/os890/javaweb-cdi-ds-project-template
-
+
=== EJB + CDI + DS (Module)
**Source code:** https://github.com/os890/javaee_cdi_ejb_ds_project_template
@@ -218,21 +218,3 @@
=== JSF + CDI + DS (Apache TomEE)
**Source code:** https://github.com/os890/tomee-ds-project-template
-
-== Add-ons
-
-=== lbitonti@github
-This GitHub account contains e.g. a DBUnit Add-on for the Test-Control-Module of DeltaSpike.
-
-**Source code:** https://github.com/lbitonti/deltaspike-dbunit
-
-=== os890@github
-This GitHub account contains several DeltaSpike Add-ons e.g. to integrate CDI with other frameworks.
-
-**Source code:** https://github.com/os890/
-
-=== rmannibucau@github
-This GitHub account contains several DeltaSpike Add-ons e.g. an integration with the TomEE PasswordCipher API.
-
-**Source code:** https://github.com/rmannibucau/
-
