You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2014/12/15 18:12:41 UTC

svn commit: r1643124 [1/2] - /deltaspike/site/trunk/content/staging/documentation/

Author: rafabene
Date: Wed Dec  3 14:26:05 2014
New Revision: 1643124

URL: http://svn.apache.org/r1643124
Log:
Site checkin for project Apache DeltaSpike - Documentation

Added:
    deltaspike/site/trunk/content/staging/documentation/modules.html
    deltaspike/site/trunk/content/staging/documentation/steps_for_a_release.html
Modified:
    deltaspike/site/trunk/content/staging/documentation/addons.html
    deltaspike/site/trunk/content/staging/documentation/build.html
    deltaspike/site/trunk/content/staging/documentation/cdiimp.html
    deltaspike/site/trunk/content/staging/documentation/configure.html
    deltaspike/site/trunk/content/staging/documentation/examples.html
    deltaspike/site/trunk/content/staging/documentation/external.html
    deltaspike/site/trunk/content/staging/documentation/index.html
    deltaspike/site/trunk/content/staging/documentation/overview.html
    deltaspike/site/trunk/content/staging/documentation/snapshots.html
    deltaspike/site/trunk/content/staging/documentation/source.html
    deltaspike/site/trunk/content/staging/documentation/spi.html

Modified: deltaspike/site/trunk/content/staging/documentation/addons.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/addons.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/addons.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/addons.html Wed Dec  3 14:26:05 2014
@@ -188,23 +188,10 @@ body {
 <h2 id="_monitoring">Monitoring</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
+<p><code>ds-monitoring-addon</code> 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 <a href="http://os890.blogspot.com.au/2014/04/add-on-monitoring-lite-with-deltaspike.html">os890: [add-on] monitoring lite with deltaspike</a>.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the add-on (e.g., A two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible.)?</p>
-</li>
-<li>
-<p>When would the user use this add-on?</p>
-</li>
-<li>
-<p>Where can the user get the add-on from (<a href="https://github.com/os890/ds-monitoring-addon" class="bare">https://github.com/os890/ds-monitoring-addon</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for using the add-on correctly?</p>
-</li>
-</ul>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-monitoring-addon" class="bare">https://github.com/os890/ds-monitoring-addon</a></p>
 </div>
 </div>
 </div>
@@ -212,26 +199,10 @@ body {
 <h2 id="_spring_bridge">Spring Bridge</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><code>ds-spring-bridge-addon</code> is a two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible. You can obtain this add-on from <a href="https://github.com/os890/ds-spring-bridge-addon" class="bare">https://github.com/os890/ds-spring-bridge-addon</a>.</p>
+<p><code>ds-spring-bridge-addon</code> is a two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible. For more information about its use and implementation, see <a href="http://os890.blogspot.com.au/2013/12/add-on-spring-bridge-with-deltaspike.html">os890: [add-on] spring-bridge with deltaspike</a>.</p>
 </div>
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the add-on (e.g., A two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible.)?</p>
-</li>
-<li>
-<p>When would the user use this add-on?</p>
-</li>
-<li>
-<p>Where can the user get the add-on from (<a href="https://github.com/os890/ds-spring-bridge-addon" class="bare">https://github.com/os890/ds-spring-bridge-addon</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for using the add-on correctly?</p>
-</li>
-</ul>
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-spring-bridge-addon" class="bare">https://github.com/os890/ds-spring-bridge-addon</a>.</p>
 </div>
 </div>
 </div>
@@ -239,26 +210,10 @@ body {
 <h2 id="_disruptor">Disruptor</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>This add-on creates a disruptor process for every observer method. It currently works with Apache TomEE and JBoss AS 7.</p>
+<p><code>ds-disruptor-addon</code> 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 <a href="http://os890.blogspot.com.au/2014/05/faster-cdi-like-events.html">os890: [add-on] fast event processing with disruptor + deltaspike</a>.</p>
 </div>
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the add-on (e.g., A two-way cdi-spring bridge that allows spring-beans to be injected into cdi-beans and vice versa provided the concepts, for example qualifiers, are compatible.)?</p>
-</li>
-<li>
-<p>When would the user use this add-on?</p>
-</li>
-<li>
-<p>Where can the user get the add-on from (<a href="https://github.com/os890/ds-disruptor-addon" class="bare">https://github.com/os890/ds-disruptor-addon</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for using the add-on correctly?</p>
-</li>
-</ul>
+<p><strong>Source code:</strong> <a href="https://github.com/os890/ds-disruptor-addon" class="bare">https://github.com/os890/ds-disruptor-addon</a></p>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/build.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/build.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/build.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/build.html Wed Dec  3 14:26:05 2014
@@ -173,7 +173,7 @@ body {
        	 		<ul class="sectlevel1">
 <li><a href="#_build_without_cdi_implementation_tests">Build without CDI Implementation Tests</a></li>
 <li><a href="#_build_and_test_with_a_cdi_implementation">Build and Test with a CDI Implementation</a></li>
-<li><a href="#_build_and_test_with_cdi_containers">Build and Test with CDI Containers</a></li>
+<li><a href="#_build_and_test_with_a_cdi_container">Build and Test with a CDI Container</a></li>
 <li><a href="#_next">Next</a></li>
 </ul>
        	 		<hr>	
@@ -181,13 +181,13 @@ body {
 				<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>The DeltaSpike source (modules and examples) is provided for inspection, contribution and testing purposes. The source must be built with Maven, which has been used to automate the compilation, testing and packaging processes. Arquillian tests are automatically conducted when DeltaSpike is built and CDI implementations or containers with which to carry out the tests can be specified.</p>
+<p>The DeltaSpike source (modules and examples) is provided for inspection, contribution and testing purposes. The source must be built with Maven, which has been used to automate the compilation, testing and packaging processes. Arquillian tests are included with the source and a CDI implementation or container can be specified with which to carry out the tests.</p>
 </div>
 <div class="paragraph">
-<p>In all cases, to obtain the DeltaSpike source, <a href="https://deltaspike.apache.org/download.html">download <code>deltaspike-project-&lt;version&gt;-source-release.zip</code></a> and extract the contents.</p>
+<p>In all cases, to obtain the DeltaSpike source, <a href="https://deltaspike.apache.org/download.html">download</a> <code>deltaspike-project-&lt;version&gt;-source-release.zip</code> and extract the contents.</p>
 </div>
 <div class="paragraph">
-<p><strong>Note:</strong> You can also obtain the DeltaSpike source from the project Git repository. The repository is subject to change and it can be used for contributing but should not be used in production environments. For more information, see <a href="source.html">Get Source and compile it</a>.</p>
+<p><strong>Note:</strong> You can also obtain the DeltaSpike source from the project Git repository. The repository is subject to change and it can be used for contributing but should not be used in production environments. For more information, see <a href="source.html">Contribute to the DeltaSpike Source</a>.</p>
 </div>
 </div>
 </div>
@@ -245,7 +245,7 @@ $ mvn clean install</code></pre>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_build_and_test_with_cdi_containers">Build and Test with CDI Containers</h2>
+<h2 id="_build_and_test_with_a_cdi_container">Build and Test with a CDI Container</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Tests can be executed with JBoss Weld and Apache OpenWebBeans through Java EE 6+ application servers and containers. Configurations are currently provided as details in the table here.</p>

Modified: deltaspike/site/trunk/content/staging/documentation/cdiimp.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/cdiimp.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/cdiimp.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/cdiimp.html Wed Dec  3 14:26:05 2014
@@ -175,14 +175,13 @@ body {
 <li><a href="#_java_ee5_and_servlet_containers">Java EE5 and Servlet Containers</a></li>
 <li><a href="#_java_se6">Java SE6+</a>
 <ul class="sectlevel2">
-<li><a href="#_declare_dependencies_for_maven_based_projects">Declare Dependencies for Maven-based Projects</a>
+<li><a href="#_1_declare_cdi_dependencies">1. Declare CDI Dependencies</a>
 <ul class="sectlevel3">
-<li><a href="#_option_a_for_jboss_weld">Option A: For JBoss Weld</a></li>
-<li><a href="#_option_b_for_apache_openwebbeans">Option B: For Apache OpenWebBeans</a></li>
+<li><a href="#_option_a_declare_dependencies_for_maven_based_projects">Option A: Declare Dependencies for Maven-based Projects</a></li>
+<li><a href="#_option_b_declare_dependencies_for_maven_independent_projects">Option B: Declare Dependencies for Maven-independent Projects</a></li>
 </ul>
 </li>
-<li><a href="#_declare_dependencies_for_maven_independent_projects">Declare Dependencies for Maven-independent Projects</a></li>
-<li><a href="#_start_the_cdi_container_from_your_project">Start the CDI Container from Your Project</a></li>
+<li><a href="#_2_start_the_cdi_container_from_your_project">2. Start the CDI Container from Your Project</a></li>
 </ul>
 </li>
 <li><a href="#_next">Next</a></li>
@@ -192,7 +191,7 @@ body {
 				<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>DeltaSpike requires a CDI implementation to be available in the Java environment that your projects are deployed to. The implementation provides the CDI essentials, managing dependency injection and contextual lifecycles. <a href="http://weld.cdi-spec.org/">JBoss Weld</a> and <a href="http://openwebbeans.apache.org/">Apache OpenWebBeans (OWB)</a> are two widely used CDI implementations. Dependent on the Java environment you choose, some setup may be necessary as detailed here.</p>
+<p>DeltaSpike requires a CDI implementation to be available in the Java environment where your projects are deployed. The implementation provides the CDI essentials, managing dependency injection and contextual lifecycles. <a href="http://weld.cdi-spec.org/">JBoss Weld</a> and <a href="http://openwebbeans.apache.org/">Apache OpenWebBeans (OWB)</a> are two widely used CDI implementations. Dependent on the Java environment you choose, some setup may be necessary as detailed here.</p>
 </div>
 </div>
 </div>
@@ -231,7 +230,9 @@ body {
 <p>Instructions are provided here for adding the required resources to both Maven-based and Maven-independent projects and subsequently booting the CDI container from your project source code.</p>
 </div>
 <div class="sect2">
-<h3 id="_declare_dependencies_for_maven_based_projects">Declare Dependencies for Maven-based Projects</h3>
+<h3 id="_1_declare_cdi_dependencies">1. Declare CDI Dependencies</h3>
+<div class="sect3">
+<h4 id="_option_a_declare_dependencies_for_maven_based_projects">Option A: Declare Dependencies for Maven-based Projects</h4>
 <div class="paragraph">
 <p>For Maven-based projects, the Container Control module is available in Maven Central together with the other DeltaSpike modules. You must configure your project to use the DeltaSpike Container Control API and one of the CDI container-specific modules.</p>
 </div>
@@ -255,16 +256,9 @@ body {
 </li>
 <li>
 <p>Add CDI container dependencies for one of the container options listed here</p>
-</li>
-</ol>
-</div>
-<div class="sect3">
-<h4 id="_option_a_for_jboss_weld">Option A: For JBoss Weld</h4>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open the project <code>pom.xml</code> file for editing</p>
-</li>
+<div class="olist loweralpha">
+<div class="title">For JBoss Weld</div>
+<ol class="loweralpha" type="a">
 <li>
 <p>Add the JBoss Weld version to the list of properties, replacing the version as desired</p>
 <div class="listingblock">
@@ -301,27 +295,11 @@ body {
 </div>
 </div>
 </li>
-<li>
-<p>Save the <code>pom.xml</code> file changes</p>
-</li>
-<li>
-<p>Download all required dependencies</p>
-<div class="listingblock">
-<div class="content">
-<pre>mvn clean install</pre>
-</div>
-</div>
-</li>
 </ol>
 </div>
-</div>
-<div class="sect3">
-<h4 id="_option_b_for_apache_openwebbeans">Option B: For Apache OpenWebBeans</h4>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open the project <code>pom.xml</code> file for editing</p>
-</li>
+<div class="olist loweralpha">
+<div class="title">For Apache OpenWebBeans</div>
+<ol class="loweralpha" type="a">
 <li>
 <p>Add the Apache OpenWebBeans version to the list of properties, replacing the version as desired</p>
 <div class="listingblock">
@@ -365,6 +343,9 @@ body {
 </div>
 </div>
 </li>
+</ol>
+</div>
+</li>
 <li>
 <p>Save the <code>pom.xml</code> file changes</p>
 </li>
@@ -379,18 +360,18 @@ body {
 </ol>
 </div>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_declare_dependencies_for_maven_independent_projects">Declare Dependencies for Maven-independent Projects</h3>
+<div class="sect3">
+<h4 id="_option_b_declare_dependencies_for_maven_independent_projects">Option B: Declare Dependencies for Maven-independent Projects</h4>
 <div class="paragraph">
 <p>For Maven-independent projects, the Container Control module is distributed together with the other DeltaSpike modules in <code>distribution-fill-&lt;version&gt;.zip</code>. You must add two of the files from the <code>cdictrl</code> directory to your project, namely <code>deltaspike-cdictrl-api.jar</code> and the .jar file that corresponds to the CDI container you have chosen. Add these files to the project <code>WEB-INF/lib</code> or <code>EAR/lib</code> directory for .war and .ear projects respectively.</p>
 </div>
 </div>
+</div>
 <div class="sect2">
-<h3 id="_start_the_cdi_container_from_your_project">Start the CDI Container from Your Project</h3>
+<h3 id="_2_start_the_cdi_container_from_your_project">2. Start the CDI Container from Your Project</h3>
 <div class="paragraph">
 <p>To start a CDI container in your application, you must instantiate a <code>CdiContainer</code> object and call the <code>#boot</code> method. When <code>#boot</code> is called, the <code>CdiContainer</code> scans CDI-enabled
-archives for beans and CDI extensions. An example is given in the code snippet here. Before the application exits, <code>#shutdown</code> must be called to correctly destroy all beans.</p>
+archives for beans and CDI extensions. Before the application exits, <code>#shutdown</code> must be called to correctly destroy all beans. An example is given in the code snippet here.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -426,7 +407,7 @@ archives for beans and CDI extensions. A
         CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
         cdiContainer.boot();
 
-        <span class="comment">// Starting the application-context allows to use @ApplicationScoped beans</span>
+        <span class="comment">// Starting the application-context enables use of @ApplicationScoped beans</span>
         ContextControl contextControl = cdiContainer.getContextControl();
         contextControl.startContext(ApplicationScoped.class);
 
@@ -438,7 +419,7 @@ archives for beans and CDI extensions. A
 </div>
 </div>
 <div class="paragraph">
-<p>To resolve project beans, you can use the DeltaSpike <code>BeanProvider</code> class. Whether <code>EchoService</code> is a concrete implementation or just an interface depends on the application. In the case that it is an interface, the corresponding implementation is resolved. The resolved bean is a standard CDI bean and it can be used for all CDI concepts, such as @Inject, in the class without further uses of <code>BeanProvider</code>. An example of resolving the bean without qualifiers is given in the code snippet here.</p>
+<p>To resolve project beans, you can use the DeltaSpike <code>BeanProvider</code> class. Whether <code>EchoService</code> is a concrete implementation or just an interface depends on the application. In the case that it is an interface, the corresponding implementation is resolved. The resolved bean is a standard CDI bean and it can be used for all CDI concepts, such as <code>@Inject</code>, in the class without further uses of <code>BeanProvider</code>. An example of resolving the bean without qualifiers is given in the code snippet here.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -456,6 +437,12 @@ archives for beans and CDI extensions. A
 <li>
 <p>For more information about the Container Control module, see <a href="container-control.html">Container Control Module</a>.</p>
 </li>
+<li>
+<p>To understand how the various DeltaSpike modules can enhance and extend your applications, see <a href="modules.html">Overview of DeltaSpike Modules</a> and the individual module pages.</p>
+</li>
+<li>
+<p>To see ready-to-deploy example DeltaSpike applications, see <a href="examples.html">See DeltaSpike in Action</a>.</p>
+</li>
 </ul>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/configure.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/configure.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/configure.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/configure.html Wed Dec  3 14:26:05 2014
@@ -171,8 +171,8 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_configure_deltaspike_in_maven_based_projects">Configure DeltaSpike in Maven-based Projects</a></li>
-<li><a href="#_configure_deltaspike_in_maven_independent_projects">Configure DeltaSpike in Maven-independent Projects</a></li>
+<li><a href="#_option_a_configure_deltaspike_in_maven_based_projects">Option A: Configure DeltaSpike in Maven-based Projects</a></li>
+<li><a href="#_option_b_configure_deltaspike_in_maven_independent_projects">Option B: Configure DeltaSpike in Maven-independent Projects</a></li>
 <li><a href="#_next">Next</a></li>
 </ul>
        	 		<hr>	
@@ -183,12 +183,12 @@ body {
 <p>DeltaSpike is available for use in Maven-based and Maven-independent projects. Instructions are given here for obtaining released final versions of DeltaSpike for both approaches.</p>
 </div>
 <div class="paragraph">
-<p><strong>Note:</strong> You can also opt to use the lastest DeltaSpike snapshots; for more information, see <a href="snapshots.html">Test Snapshots</a>.</p>
+<p><strong>Note:</strong> You can also opt to use the lastest DeltaSpike snapshots; for more information, see <a href="snapshots.html">Use DeltaSpike Snapshots</a>.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_configure_deltaspike_in_maven_based_projects">Configure DeltaSpike in Maven-based Projects</h2>
+<h2 id="_option_a_configure_deltaspike_in_maven_based_projects">Option A: Configure DeltaSpike in Maven-based Projects</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>DeltaSpike released versions are available from the Maven Central repository for use in Maven-based projects. This means that you do not need to modify your Maven configuration <code>settings.xml</code> file; when building projects, Maven automatically searches the online Maven Central repository for project dependencies and downloads sources to your local Maven repository.</p>
@@ -276,7 +276,7 @@ body {
 </div>
 </div>
 <div class="sect1">
-<h2 id="_configure_deltaspike_in_maven_independent_projects">Configure DeltaSpike in Maven-independent Projects</h2>
+<h2 id="_option_b_configure_deltaspike_in_maven_independent_projects">Option B: Configure DeltaSpike in Maven-independent Projects</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Deltaspike is provided as a set of downloadable .jar files for projects not utilizing the Maven build system. Alternatively, you can build the DeltaSpike .jar files from source; for instructions, see <a href="build.html">Build DeltaSpike from Source</a>. In both cases, you must add the DeltaSpike .jar files directly to your projects.</p>
@@ -302,10 +302,10 @@ body {
 <div class="olist loweralpha">
 <ol class="loweralpha" type="a">
 <li>
-<p>For .war projects, copy the .jar files to <code>WEB-INF/lib</code> directory</p>
+<p>For .war projects, copy the .jar files to the <code>WEB-INF/lib</code> directory</p>
 </li>
 <li>
-<p>For .ear projects, copy the .jar files to <code>EAR/lib directory</code> and add the following to <code>META-INF/application.xml</code>:</p>
+<p>For .ear projects, copy the .jar files to the <code>EAR/lib directory</code> and add the following to <code>META-INF/application.xml</code>:</p>
 <div class="listingblock">
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;library-directory&gt;</span>lib<span class="tag">&lt;/library-directory&gt;</span></code></pre>
@@ -325,13 +325,13 @@ body {
 <div class="ulist">
 <ul>
 <li>
-<p>To check whether your Java envrionment needs any additional CDI-specific configuration, see <a href="cdiimp.html">Enable CDI For Your Java Environment</a>.</p>
+<p>To check whether your Java environment needs any additional CDI-specific configuration, see <a href="cdiimp.html">Enable CDI For Your Java Environment</a>.</p>
 </li>
 <li>
 <p>To see ready-to-deploy example DeltaSpike applications, see <a href="examples.html">See DeltaSpike in Action</a>.</p>
 </li>
 <li>
-<p>To understand how the various DeltaSpike modules can enhance and extend your applications, see the individual module pages.</p>
+<p>To understand how the various DeltaSpike modules can enhance and extend your applications, see <a href="modules.html">Overview of DeltaSpike Modules</a> and the individual module pages.</p>
 </li>
 </ul>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/examples.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/examples.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/examples.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/examples.html Wed Dec  3 14:26:05 2014
@@ -171,17 +171,14 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_jse_examples">jse-examples</a></li>
-<li><a href="#_jsf_examples">jsf-examples</a></li>
-<li><a href="#_jsf_playground">jsf-playground</a></li>
-<li><a href="#_scheduler_playground">scheduler-playground</a></li>
+<li><a href="#_next">Next</a></li>
 </ul>
        	 		<hr>	
        	 		
 				<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>A collection of ready-to-build Maven-based projects are provided to demonstrate the inclusion of DeltaSpike in applications. Each example showcases a different DeltaSpike feature and explores the mechanics of DeltaSpike implementation. You can use these examples to see DeltaSpike in action and learn how to add these capabilities to your own projects. The Maven-based project examples are available in <code>deltaspike-project-&lt;version&gt;-source-release.zip</code> and each is briefly outlined here.</p>
+<p>A collection of ready-to-build Maven-based projects are provided to demonstrate the inclusion of DeltaSpike in applications. Each example showcases a different DeltaSpike feature and explores the mechanics of DeltaSpike implementation. You can use these examples to see DeltaSpike in action and learn how to add these capabilities to your own projects. The Maven-based project examples are available in <code>deltaspike-project-&lt;version&gt;-source-release.zip</code>.</p>
 </div>
 <div class="paragraph">
 <p>To begin using the projects, complete the following steps:</p>
@@ -213,84 +210,15 @@ $ mvn clean package</code></pre>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_jse_examples">jse-examples</h2>
+<h2 id="_next">Next</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the example (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this example (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_jsf_examples">jsf-examples</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the example (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this example (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_jsf_playground">jsf-playground</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the example (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this example (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_scheduler_playground">scheduler-playground</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
 <div class="ulist">
 <ul>
 <li>
-<p>What is the purpose of the example (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this example (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
+<p>To see more ready-to-deploy DeltaSpike examples and templates, see <a href="external.html">External Examples</a>.</p>
 </li>
 <li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
+<p>To read how DeltaSpike is being used by developers, see <a href="articles.html">Articles and Blogs</a>.</p>
 </li>
 </ul>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/external.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/external.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/external.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/external.html Wed Dec  3 14:26:05 2014
@@ -171,27 +171,37 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_example_confess_2012_workshop_demo">Example: Confess 2012 Workshop Demo</a></li>
-<li><a href="#_example_fullstack_ee6_with_deltaspike">Example: Fullstack EE6+ with DeltaSpike</a></li>
-<li><a href="#_example_fullstack_codi_to_deltaspike">Example: Fullstack CODI to DeltaSpike</a></li>
-<li><a href="#_examples_jboss_web_framework_kit_quickstarts">Examples: JBoss Web Framework Kit Quickstarts</a></li>
-<li><a href="#_template_java_se_cdi_ds">Template: Java SE + CDI + DS</a></li>
-<li><a href="#_template_jsf_cdi_ds_servlet_container">Template: JSF + CDI + DS (Servlet-Container)</a></li>
-<li><a href="#_template_ejb_cdi_ds_module">Template: EJB + CDI + DS (Module)</a></li>
-<li><a href="#_template_jsf_ejb_cdi_ds_ee_server">Template: JSF + EJB + CDI + DS (EE-Server)</a></li>
+<li><a href="#_examples">Examples</a>
+<ul class="sectlevel2">
+<li><a href="#_confess_2012_workshop_demo">Confess 2012 Workshop Demo</a></li>
+<li><a href="#_fullstack_ee6_with_deltaspike">Fullstack EE6+ with DeltaSpike</a></li>
+<li><a href="#_fullstack_codi_to_deltaspike">Fullstack CODI to DeltaSpike</a></li>
+<li><a href="#_jboss_quickstarts">JBoss Quickstarts</a></li>
+</ul>
+</li>
+<li><a href="#_templates">Templates</a>
+<ul class="sectlevel2">
+<li><a href="#_java_se_cdi_ds">Java SE + CDI + DS</a></li>
+<li><a href="#_jsf_cdi_ds_servlet_container">JSF + CDI + DS (Servlet-Container)</a></li>
+<li><a href="#_ejb_cdi_ds_module">EJB + CDI + DS (Module)</a></li>
+<li><a href="#_jsf_ejb_cdi_ds_ee_server">JSF + EJB + CDI + DS (EE-Server)</a></li>
+</ul>
+</li>
 </ul>
        	 		<hr>	
        	 		
 				<div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>A number of DeltaSpike examples and templates have been developed external to the DeltaSpike project. These extend the DeltaSpike resources from which you can see DeltaSpike in action. Brief information is given here about each of the examples and templates, with details of where they can be obtained from.</p>
+<p>A number of DeltaSpike examples and templates have been developed external to the DeltaSpike project. These extend the DeltaSpike resources from which you can see DeltaSpike in action. Brief information is given here about the examples and templates, with details of where they can be obtained from.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_example_confess_2012_workshop_demo">Example: Confess 2012 Workshop Demo</h2>
+<h2 id="_examples">Examples</h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_confess_2012_workshop_demo">Confess 2012 Workshop Demo</h3>
 <div class="paragraph">
 <p>This example was prepared for the Confess workshop and demonstrates how to use DeltaSpike instead of and side-by-side with MyFaces CODI. The secured web application demonstrates presenting users with differentiating content based on their account status.</p>
 </div>
@@ -199,10 +209,8 @@ body {
 <p><strong>Source code:</strong> <a href="https://github.com/confess/confess2012_deltaspike" class="bare">https://github.com/confess/confess2012_deltaspike</a></p>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_example_fullstack_ee6_with_deltaspike">Example: Fullstack EE6+ with DeltaSpike</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_fullstack_ee6_with_deltaspike">Fullstack EE6+ with DeltaSpike</h3>
 <div class="paragraph">
 <p>Simple example based on Java EE6+ and DeltaSpike (tested with EE6 and EE7).</p>
 </div>
@@ -210,10 +218,8 @@ body {
 <p><strong>Source code:</strong> <a href="https://github.com/os890/ee6-ds-demo" class="bare">https://github.com/os890/ee6-ds-demo</a></p>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_example_fullstack_codi_to_deltaspike">Example: Fullstack CODI to DeltaSpike</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_fullstack_codi_to_deltaspike">Fullstack CODI to DeltaSpike</h3>
 <div class="paragraph">
 <p>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.</p>
 </div>
@@ -231,10 +237,8 @@ body {
 </ul>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_examples_jboss_web_framework_kit_quickstarts">Examples: JBoss Web Framework Kit Quickstarts</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_jboss_quickstarts">JBoss Quickstarts</h3>
 <div class="paragraph">
 <p>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.</p>
 </div>
@@ -243,99 +247,33 @@ body {
 </div>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_template_java_se_cdi_ds">Template: Java SE + CDI + DS</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the template (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this template (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Where can the user get the template from (<a href="https://github.com/os890/javase-cdi-ds-project-template" class="bare">https://github.com/os890/javase-cdi-ds-project-template</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
-</div>
-</div>
 </div>
 <div class="sect1">
-<h2 id="_template_jsf_cdi_ds_servlet_container">Template: JSF + CDI + DS (Servlet-Container)</h2>
+<h2 id="_templates">Templates</h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_java_se_cdi_ds">Java SE + CDI + DS</h3>
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the template (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this template (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Where can the user get the template from (<a href="https://github.com/os890/javaweb-cdi-ds-project-template" class="bare">https://github.com/os890/javaweb-cdi-ds-project-template</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javase-cdi-ds-project-template" class="bare">https://github.com/os890/javase-cdi-ds-project-template</a></p>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_template_ejb_cdi_ds_module">Template: EJB + CDI + DS (Module)</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_jsf_cdi_ds_servlet_container">JSF + CDI + DS (Servlet-Container)</h3>
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaweb-cdi-ds-project-template" class="bare">https://github.com/os890/javaweb-cdi-ds-project-template</a></p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the template (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this template (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Where can the user get the template from (<a href="https://github.com/os890/javaee_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_cdi_ejb_ds_project_template</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
 </div>
+<div class="sect2">
+<h3 id="_ejb_cdi_ds_module">EJB + CDI + DS (Module)</h3>
+<div class="paragraph">
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaee_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_cdi_ejb_ds_project_template</a></p>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_template_jsf_ejb_cdi_ds_ee_server">Template: JSF + EJB + CDI + DS (EE-Server)</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_jsf_ejb_cdi_ds_ee_server">JSF + EJB + CDI + DS (EE-Server)</h3>
 <div class="paragraph">
-<p><strong>Replace this text!</strong> Write 2-3 sentences in plain language making sure you answer every question:</p>
+<p><strong>Source code:</strong> <a href="https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template</a></p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>What is the purpose of the template (e.g., This quickstart demonstrates the use of a partial bean to provide dynamic implementations of an interface, and how this might be used to provide a generic query service.)?</p>
-</li>
-<li>
-<p>When would the user use this template (e.g., The PersonQueryService provides an example of the end user API that might be available from such a framework. Extensive code comments document the example implementation.)?</p>
-</li>
-<li>
-<p>Where can the user get the template from (<a href="https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template" class="bare">https://github.com/os890/javaee_jsf_cdi_ejb_ds_project_template</a> )?</p>
-</li>
-<li>
-<p>Any special instructions for how to build and deploy (e.g., It does not contain any user interface; the tests must be run to verify everything is working correctly.)?</p>
-</li>
-</ul>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/index.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/index.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/index.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/index.html Wed Dec  3 14:26:05 2014
@@ -176,7 +176,7 @@ body {
 				<div class="ulist">
 <ul>
 <li>
-<p>Getting Started</p>
+<p>Get Started</p>
 <div class="ulist">
 <ul>
 <li>
@@ -195,10 +195,13 @@ body {
 </div>
 </li>
 <li>
-<p>Using Individual Modules</p>
+<p>Use Individual Modules</p>
 <div class="ulist">
 <ul>
 <li>
+<p><a href="modules.html">Overview of DeltaSpike Modules</a></p>
+</li>
+<li>
 <p><a href="core.html">Core</a></p>
 </li>
 <li>
@@ -239,7 +242,7 @@ body {
 <div class="ulist">
 <ul>
 <li>
-<p><a href="build.html">Build DeltaSpike from Source</a></p>
+<p><a href="build.html">Build and Test DeltaSpike from Source</a></p>
 </li>
 <li>
 <p><a href="snapshots.html">Use DeltaSpike Snapshots</a></p>
@@ -248,13 +251,16 @@ body {
 <p><a href="https://deltaspike.apache.org/migration-guide.html">Migrate to DeltaSpike</a></p>
 </li>
 <li>
+<p><a href="source.html">Contribute to the DeltaSpike Source</a></p>
+</li>
+<li>
 <p><a href="spi.html">DeltaSpike Service Provider Interface (SPI)</a></p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>More Resources</p>
+<p>Access More DeltaSpike Resources</p>
 <div class="ulist">
 <ul>
 <li>

Added: deltaspike/site/trunk/content/staging/documentation/modules.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/modules.html?rev=1643124&view=auto
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/modules.html (added)
+++ deltaspike/site/trunk/content/staging/documentation/modules.html Wed Dec  3 14:26:05 2014
@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="deltaspike-generate-pages">
+<meta name="author" content="chm">
+
+<title>Overview of DeltaSpike Modules</title>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
+/*pre.CodeRay {background-color:#f7f7f8;}*/
+.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
+.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
+.CodeRay .line-numbers strong{font-weight: normal}
+table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
+table.CodeRay td{vertical-align: top}
+table.CodeRay td.line-numbers{text-align:right}
+table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
+table.CodeRay td.code{padding:0 0 0 .5em}
+table.CodeRay td.code>pre{padding:0}
+.CodeRay .debug{color:#fff !important;background:#000080 !important}
+.CodeRay .annotation{color:#007}
+.CodeRay .attribute-name{color:#000080}
+.CodeRay .attribute-value{color:#700}
+.CodeRay .binary{color:#509}
+.CodeRay .comment{color:#998;font-style:italic}
+.CodeRay .char{color:#04d}
+.CodeRay .char .content{color:#04d}
+.CodeRay .char .delimiter{color:#039}
+.CodeRay .class{color:#458;font-weight:bold}
+.CodeRay .complex{color:#a08}
+.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
+.CodeRay .color{color:#099}
+.CodeRay .class-variable{color:#369}
+.CodeRay .decorator{color:#b0b}
+.CodeRay .definition{color:#099}
+.CodeRay .delimiter{color:#000}
+.CodeRay .doc{color:#970}
+.CodeRay .doctype{color:#34b}
+.CodeRay .doc-string{color:#d42}
+.CodeRay .escape{color:#666}
+.CodeRay .entity{color:#800}
+.CodeRay .error{color:#808}
+.CodeRay .exception{color:inherit}
+.CodeRay .filename{color:#099}
+.CodeRay .function{color:#900;font-weight:bold}
+.CodeRay .global-variable{color:#008080}
+.CodeRay .hex{color:#058}
+.CodeRay .integer,.CodeRay .float{color:#099}
+.CodeRay .include{color:#555}
+.CodeRay .inline{color:#00}
+.CodeRay .inline .inline{background:#ccc}
+.CodeRay .inline .inline .inline{background:#bbb}
+.CodeRay .inline .inline-delimiter{color:#d14}
+.CodeRay .inline-delimiter{color:#d14}
+.CodeRay .important{color:#555;font-weight:bold}
+.CodeRay .interpreted{color:#b2b}
+.CodeRay .instance-variable{color:#008080}
+.CodeRay .label{color:#970}
+.CodeRay .local-variable{color:#963}
+.CodeRay .octal{color:#40e}
+.CodeRay .predefined{color:#369}
+.CodeRay .preprocessor{color:#579}
+.CodeRay .pseudo-class{color:#555}
+.CodeRay .directive{font-weight:bold}
+.CodeRay .type{font-weight:bold}
+.CodeRay .predefined-type{color:inherit}
+.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
+.CodeRay .key{color:#808}
+.CodeRay .key .delimiter{color:#606}
+.CodeRay .key .char{color:#80f}
+.CodeRay .value{color:#088}
+.CodeRay .regexp .delimiter{color:#808}
+.CodeRay .regexp .content{color:#808}
+.CodeRay .regexp .modifier{color:#808}
+.CodeRay .regexp .char{color:#d14}
+.CodeRay .regexp .function{color:#404;font-weight:bold}
+.CodeRay .string{color:#d20}
+.CodeRay .string .string .string{background:#ffd0d0}
+.CodeRay .string .content{color:#d14}
+.CodeRay .string .char{color:#d14}
+.CodeRay .string .delimiter{color:#d14}
+.CodeRay .shell{color:#d14}
+.CodeRay .shell .delimiter{color:#d14}
+.CodeRay .symbol{color:#990073}
+.CodeRay .symbol .content{color:#a60}
+.CodeRay .symbol .delimiter{color:#630}
+.CodeRay .tag{color:#008080}
+.CodeRay .tag-special{color:#d70}
+.CodeRay .variable{color:#036}
+.CodeRay .insert{background:#afa}
+.CodeRay .delete{background:#faa}
+.CodeRay .change{color:#aaf;background:#007}
+.CodeRay .head{color:#f8f;background:#505}
+.CodeRay .insert .insert{color:#080}
+.CodeRay .delete .delete{color:#800}
+.CodeRay .change .change{color:#66f}
+.CodeRay .head .head{color:#f4f}
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</head>
+
+<body>
+
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse"
+					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
+					class="icon-bar"></span> <span class="icon-bar"></span>
+				</a> <a class="brand logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache
+					DeltaSpike</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="http://deltaspike.apache.org/index.html">Home</a></li>
+						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
+						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
+						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
+						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
+						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
+						<li><a
+							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1>Overview of DeltaSpike Modules</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		
+       	 		<hr>	
+       	 		
+				<div class="paragraph">
+<p>DeltaSpike consists of ready-to-use modules. These include a core module and a number of optional modules for providing additional enterprise functionality to your applications. An overview of each module is provided here and for more information see the linked individual module pages.</p>
+</div>
+<table class="tableblock frame-all grid-all spread">
+<caption class="title">Table 1. DeltaSpike Modules</caption>
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 50%;">
+</colgroup>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="core.html">Core</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Required</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For the essential API and util classes</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="bean-validation.html">Bean Validation</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For adding CDI support in Bean Validation, enabling creation of CDI aware <code>ConstraintValidator</code> methods that can use business objects (EJBs, ManagedBeans) to support validation needs</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="container-control.html">Container Control</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="data.html">Data</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For an enhanced JPA experience with declarative queries, reducing boilerplate to a minimum</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="jpa.html">JPA</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="jsf.html">JSF</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="partial-bean.html">Partial-Bean</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="scheduler.html">Scheduler</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For simple integration with Quartz v2 (per default) or any other scheduler which supports cron-expressions for job-classes</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="security.html">Security</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For intercept and check security</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="servlet.html">Servlet</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For integration with the Java Servlet API, enabling injection of common servlet objects and propagation of servlet events to the CDI event bus</p>
+</div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="test-control.html">Test-Control</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Optional</p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>For easily writing CDI based tests</p>
+</div></div></td>
+</tr>
+</tbody>
+</table>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+				<p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+			</footer>
+
+		</div>
+		<!-- /.container -->
+
+</body>
+</html>
\ No newline at end of file

Modified: deltaspike/site/trunk/content/staging/documentation/overview.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/overview.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/overview.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/overview.html Wed Dec  3 14:26:05 2014
@@ -345,7 +345,7 @@ body {
 <h2 id="_next">Next</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>For instructions on how to start using DeltaSpike, see <a href="configure.html">Configure DeltaSpike in Your Projects</a>.</p>
+<p>For instructions on how to start using DeltaSpike, see <a href="configure.html">Configure DeltaSpike in Your Projects</a> and <a href="cdiimp.html">Enable CDI For Your Java Environment</a>.</p>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/snapshots.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/snapshots.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/snapshots.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/snapshots.html Wed Dec  3 14:26:05 2014
@@ -171,8 +171,8 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_configure_maven_to_use_the_apache_snapshot_repository">Configure Maven to Use the Apache Snapshot Repository</a></li>
-<li><a href="#_configure_your_project_with_the_snapshot_version">Configure Your Project with the Snapshot Version</a></li>
+<li><a href="#_1_configure_maven_to_use_the_apache_snapshot_repository">1. Configure Maven to Use the Apache Snapshot Repository</a></li>
+<li><a href="#_2_configure_your_project_with_the_snapshot_version">2. Configure Your Project with the Snapshot Version</a></li>
 </ul>
        	 		<hr>	
        	 		
@@ -187,7 +187,7 @@ body {
 </div>
 </div>
 <div class="sect1">
-<h2 id="_configure_maven_to_use_the_apache_snapshot_repository">Configure Maven to Use the Apache Snapshot Repository</h2>
+<h2 id="_1_configure_maven_to_use_the_apache_snapshot_repository">1. Configure Maven to Use the Apache Snapshot Repository</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>You must add the Apache Snapshot Repository to your Maven configuration <code>settings.xml</code> file. This ensures Maven can find the repository when it searches for your project DeltaSpike dependencies.</p>
@@ -195,7 +195,7 @@ body {
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Maven configuration <code>settings.xml</code> file for editing</p>
+<p>Open your Maven configuration <code>settings.xml</code> file for editing</p>
 </li>
 <li>
 <p>Add the Apache Snapshot Repository to the list of repositories</p>
@@ -224,7 +224,7 @@ body {
 </div>
 </div>
 <div class="sect1">
-<h2 id="_configure_your_project_with_the_snapshot_version">Configure Your Project with the Snapshot Version</h2>
+<h2 id="_2_configure_your_project_with_the_snapshot_version">2. Configure Your Project with the Snapshot Version</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>With Maven configured for the Apache Snapshot Repository, you can specify DeltaSpike snapshot versions in your Maven-based projects.</p>

Modified: deltaspike/site/trunk/content/staging/documentation/source.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/source.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/source.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/source.html Wed Dec  3 14:26:05 2014
@@ -6,7 +6,7 @@
 <meta name="description" content="deltaspike-generate-pages">
 <meta name="author" content="chm">
 
-<title>Get Source and compile it</title>
+<title>Contribute to the DeltaSpike Source</title>
 
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
 
@@ -166,129 +166,132 @@ body {
 		<div class="row">
 			<div class="span12">
 				<div class="page-title">
-			    <h1>Get Source and compile it</h1>
+			    <h1>Contribute to the DeltaSpike Source</h1>
                 </div>
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_introduction">Introduction</a></li>
-<li><a href="#_scm_repository">SCM / Repository</a>
-<ul class="sectlevel2">
-<li><a href="#_initial_checkout">Initial 'checkout'</a></li>
-<li><a href="#_update_existing_clone">Update existing clone</a></li>
-<li><a href="#_read_only_mirrors">Read-only Mirrors</a>
-<ul class="sectlevel3">
-<li><a href="#_github_mirror">GitHub-Mirror</a></li>
-</ul>
-</li>
-<li><a href="#_git_workflow">GIT Workflow</a></li>
-</ul>
-</li>
-<li><a href="#_build">Build</a></li>
-<li><a href="#_tools_ide">Tools / IDE</a>
+<li><a href="#_1_get_the_source">1. Get the Source</a></li>
+<li><a href="#_2_make_additions_and_changes_to_the_source">2. Make Additions and Changes to the Source</a>
 <ul class="sectlevel2">
 <li><a href="#_intellij">IntelliJ</a></li>
 <li><a href="#_eclipse">Eclipse</a></li>
 </ul>
 </li>
+<li><a href="#_3_build_the_source">3. Build the Source</a></li>
+<li><a href="#_4_make_a_pull_request">4. Make a Pull Request</a></li>
+<li><a href="#_git_resources">Git Resources</a></li>
 </ul>
        	 		<hr>	
        	 		
-				<div class="sect1">
-<h2 id="_introduction">Introduction</h2>
+				<div id="preamble">
 <div class="sectionbody">
-
+<div class="paragraph">
+<p>If you are looking to contribute to the DeltaSpike source, you must start with the latest version of the code base. DeltaSpike source is stored in the Apache Git repository at <a href="https://git-wip-us.apache.org/repos/asf/deltaspike.git" class="bare">https://git-wip-us.apache.org/repos/asf/deltaspike.git</a></p>
+</div>
+<div class="paragraph">
+<p>It is also important that you follow the git workflows we have established for the project to ensure efficient and clean collaboration as detailed here.</p>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_scm_repository">SCM / Repository</h2>
+<h2 id="_1_get_the_source">1. Get the Source</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>We are using GIT as a Version Control System. The official GIT
-repository of the project is available
-<a href="https://git-wip-us.apache.org/repos/asf/deltaspike.git">here</a>.</p>
-</div>
-<div class="sect2">
-<h3 id="_initial_checkout">Initial 'checkout'</h3>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Checkout the source</p>
 <div class="listingblock">
 <div class="content">
-<pre>git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git</pre>
+<pre class="CodeRay highlight"><code>git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>or for a read-only mirror version</p>
 </div>
-<div class="sect2">
-<h3 id="_update_existing_clone">Update existing clone</h3>
 <div class="listingblock">
 <div class="content">
-<pre>git pull --rebase</pre>
-</div>
+<pre class="CodeRay highlight"><code>git clone https://github.com/apache/deltaspike</code></pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_read_only_mirrors">Read-only Mirrors</h3>
-<div class="sect3">
-<h4 id="_github_mirror">GitHub-Mirror</h4>
+</li>
+<li>
+<p>Update the repository clone</p>
 <div class="listingblock">
 <div class="content">
-<pre>git clone https://github.com/apache/deltaspike</pre>
+<pre class="CodeRay highlight"><code>git pull --rebase</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>More information can be found <a href="https://help.github.com/articles/which-remote-url-should-i-use">here</a>.</p>
+</li>
+</ol>
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_git_workflow">GIT Workflow</h3>
+<div class="sect1">
+<h2 id="_2_make_additions_and_changes_to_the_source">2. Make Additions and Changes to the Source</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>We follow an <a href="../suggested-git-workflows.html">unified GIT workflow</a> to
-keep the commit history straight and therefore simple and clean. General
-details about GIT at Apache are available
-<a href="http://wiki.apache.org/couchdb/Git_At_Apache_Guide">here</a> and at
-<a href="http://git-wip-us.apache.org" class="bare">http://git-wip-us.apache.org</a>.</p>
+<p>Commits (and in the best case also patches), have to follow our
+"formatting rules". The following section provides settings for IDEs
+used by us.</p>
 </div>
+<div class="sect2">
+<h3 id="_intellij">IntelliJ</h3>
 <div class="paragraph">
-<p><strong>Hint:</strong></p>
+<p><a href="http://deltaspike.apache.org/resources/files/settings.jar">Attached</a> you can find the settings
+for formatting the source code. Import them via File | Import
+Settings</p>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_eclipse">Eclipse</h3>
 <div class="paragraph">
-<p>If you are new to Git you might like to try the
-<a href="http://git.or.cz/course/svn.html">Git guide for subversion users</a> or have
-a look at the <a href="http://git-scm.com/book">Git community book</a>.</p>
+<p>For Eclipse you can use this
+<a href="http://deltaspike.apache.org/resources/files/deltaspike-code-conventions.xml">Code Formatter Profile</a>. Import it via Window | Preferences | Java | Code Style | Formatter</p>
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_build">Build</h2>
+<h2 id="_3_build_the_source">3. Build the Source</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>So now you probably want to <strong><code>build the code</code></strong>. So follow the
-instructions <a href="build.html">here</a></p>
+<p>Always build and test your changes before you make pull requests to the DeltaSpike repository. For instructions on building the source and running Arquillian tests, see <a href="build.html">Build and Test DeltaSpike from Source</a>.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_tools_ide">Tools / IDE</h2>
+<h2 id="_4_make_a_pull_request">4. Make a Pull Request</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Commits (and in the best case also patches), have to follow our
-"formatting rules". The following section provides settings for IDEs
-used by us.</p>
+<p>Ensure your commits and pull requests follow the our established <a href="https://deltaspike.apache.org/suggested-git-workflows.html">DeltaSpike GIT workflow</a>.</p>
 </div>
-<div class="sect2">
-<h3 id="_intellij">IntelliJ</h3>
-<div class="paragraph">
-<p><a href="http://deltaspike.apache.org/resources/files/settings.jar">Attached</a> you can find the settings
-for formatting the source code. Import them via File | Import
-Settings&#8230;&#8203;</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_eclipse">Eclipse</h3>
+<div class="sect1">
+<h2 id="_git_resources">Git Resources</h2>
+<div class="sectionbody">
 <div class="paragraph">
-<p>For Eclipse you can use this
-<a href="http://deltaspike.apache.org/resources/files/deltaspike-code-conventions.xml">Code Formatter Profile</a>. Import it via Window | Preferences | Java | Code Style | Formatter</p>
+<p>For general information about Git and using Git, see the following:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="http://wiki.apache.org/couchdb/Git_At_Apache_Guide">Git At Apache Guide</a></p>
+</li>
+<li>
+<p><a href="http://git-wip-us.apache.org">Git at The ASF</a></p>
+</li>
+<li>
+<p><a href="http://git.or.cz/course/svn.html">Git - SVN Crash Course</a></p>
+</li>
+<li>
+<p><a href="http://git-scm.com/book">Pro Git</a></p>
+</li>
+<li>
+<p><a href="https://help.github.com/articles/which-remote-url-should-i-use">GitHub: Which remote URL should I use?</a></p>
+</li>
+</ul>
 </div>
 </div>
 </div>

Modified: deltaspike/site/trunk/content/staging/documentation/spi.html
URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/staging/documentation/spi.html?rev=1643124&r1=1643123&r2=1643124&view=diff
==============================================================================
--- deltaspike/site/trunk/content/staging/documentation/spi.html (original)
+++ deltaspike/site/trunk/content/staging/documentation/spi.html Wed Dec  3 14:26:05 2014
@@ -171,7 +171,6 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_introduction">Introduction</a></li>
 <li><a href="#_deactivatable">Deactivatable</a>
 <ul class="sectlevel2">
 <li><a href="#_classdeactivator">ClassDeactivator</a></li>
@@ -188,51 +187,31 @@ body {
 </ul>
        	 		<hr>	
        	 		
-				<div class="sect1">
-<h2 id="_introduction">Introduction</h2>
+				<div id="preamble">
 <div class="sectionbody">
-
+<div class="paragraph">
+<p>DeltaSpike provides an Service Provider Interface (SPI) to enable you to extend it.</p>
+</div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_deactivatable">Deactivatable</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>This mechanism is only used for artifacts <strong>like</strong> implementations of
-(<code>javax.enterprise.inject.spi.Extension</code>) which <strong>can&#8217;t</strong> be deactivated
-with std. CDI mechanisms.</p>
-</div>
-<div class="paragraph">
-<p>This interface is just a marker interface which is implemented by all
-pre-configured DeltaSpike artifacts which can be deactivated manually
-(e.g. to improve the performance if a part isn&#8217;t needed, to provide a
-custom implementation if the default implementation isn&#8217;t pluggable by
-default or to bypass an implementation which causes an issue (in this
-case please also <strong>contact us</strong> and we will fix it)).</p>
-</div>
-<div class="paragraph">
-<p>To deactivate a class it&#8217;s required to implement <code>ClassDeactivator</code>.
-Returning 'false' or 'true' allows to de-/activate the class in
-question. Retuning null means that the current class-deactivator doesn&#8217;t
-have information about the class in question and can&#8217;t provide a result.
-Since <code>ClassDeactivator</code> implementations are configured with the
-low-level config of DeltaSpike, the class-deactivator with the highest
-ordinal has the final decision. DeltaSpike itself doesn&#8217;t deactivate an
-implementation, however, an add-on or a 3rd party portable CDI extension
-based on DeltaSpike (Core+) can use the concept to deactivate a default
-implementation of DeltaSpike in favour of its own implementation.</p>
-</div>
-<div class="paragraph">
-<p><strong>Attention</strong>: due to the ordinal feature of the low-level config
-approach it&#8217;s possible that a class-deactivator with a higher ordinal,
-e.g. used in a concrete project, can re-activate a deactivated
-implementation.<br>
-<strong>Please note</strong> that you might have to deactivate the parts of the add-on
-or 3rd party CDI extension which relies on its own implementation.
-Therefore, you should <strong>be really careful with re-activation</strong>.) The
-implementation should be stateless because the result will be cached and
-as soon as everything is initialized the class-deactivators won&#8217;t be
-used any longer.</p>
+<p>This mechanism is only used for artifacts <strong>like</strong> implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which <strong>can&#8217;t</strong> be deactivated with std. CDI mechanisms.</p>
+</div>
+<div class="paragraph">
+<p>This interface is just a marker interface which is implemented by all pre-configured DeltaSpike artifacts which can be deactivated manually (e.g. to improve the performance if a part isn&#8217;t needed, to provide a custom implementation if the default implementation isn&#8217;t pluggable by default or to bypass an implementation which causes an issue (in this case please also <strong>contact us</strong> and we will fix it)).</p>
+</div>
+<div class="paragraph">
+<p>To deactivate a class it&#8217;s required to implement <code>ClassDeactivator</code>. Returning 'false' or 'true' allows to de-/activate the class in question. Retuning null means that the current class-deactivator doesn&#8217;t have information about the class in question and can&#8217;t provide a result. Since <code>ClassDeactivator</code> implementations are configured with the low-level config of DeltaSpike, the class-deactivator with the highest ordinal has the final decision. DeltaSpike itself doesn&#8217;t deactivate an implementation, however, an add-on or a 3rd party portable CDI extension based on DeltaSpike (Core+) can use the concept to deactivate a default implementation of DeltaSpike in favour of its own implementation.</p>
+</div>
+<div class="paragraph">
+<p><strong>Attention</strong>: due to the ordinal feature of the low-level config approach it&#8217;s possible that a class-deactivator with a higher ordinal, e.g. used in a concrete project, can re-activate a deactivated implementation.</p>
+</div>
+<div class="paragraph">
+<p><strong>Please note</strong> that you might have to deactivate the parts of the add-on or 3rd party CDI extension which relies on its own implementation. Therefore, you should <strong>be really careful with re-activation</strong>.) The implementation should be stateless because the result will be cached and
+as soon as everything is initialized the class-deactivators won&#8217;t be used any longer.</p>
 </div>
 <div class="sect2">
 <h3 id="_classdeactivator">ClassDeactivator</h3>
@@ -257,12 +236,7 @@ used any longer.</p>
 </div>
 </div>
 <div class="paragraph">
-<p>A class-deactivator will be resolved from the environment via the
-default resolvers or via a custom resolver which allows to use any type
-of configuration-format. (see
-<code>org.apache.deltaspike.core.api.config.ConfigResolver</code>). The key is the
-fully qualified name of the interface
-(<code>org.apache.deltaspike.core.spi.activation.ClassDeactivator</code>).</p>
+<p>A class-deactivator will be resolved from the environment via the default resolvers or via a custom resolver which allows to use any type of configuration-format. (see <code>org.apache.deltaspike.core.api.config.ConfigResolver</code>). The key is the fully qualified name of the interface (<code>org.apache.deltaspike.core.spi.activation.ClassDeactivator</code>).</p>
 </div>
 </div>
 </div>
@@ -290,12 +264,7 @@ fully qualified name of the interface
 <h2 id="_global_alternative">Global Alternative</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>There are several application servers (using CDI 1.0) which can&#8217;t handle
-alternative CDI beans correctly (e.g. due to a too strict interpretation
-or a broken implementation). Therefore, DeltaSpike allows to use the
-std. <code>@Alternative</code> annotation and an additional config entry for
-DeltaSpike which allows to use the alternative implementation as a
-global alternative.</p>
+<p>There are several application servers (using CDI 1.0) which can&#8217;t handle alternative CDI beans correctly (e.g. due to a too strict interpretation or a broken implementation). Therefore, DeltaSpike allows to use the std. <code>@Alternative</code> annotation and an additional config entry for DeltaSpike which allows to use the alternative implementation as a global alternative.</p>
 </div>
 <div class="paragraph">
 <p><strong>Std. CDI alternative implementation (without the required XML config)</strong></p>
@@ -314,15 +283,11 @@ global alternative.</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Instead of configuring the alternative in the beans.xml, a global
-alternative needs to be configured in
-/META-INF/apache-deltaspike.properties. CDI 1.1 should fix this issue
-and migrating to it means to remove the config entry for DeltaSpike
-again and move to the std. CDI config approach.</p>
+<p>Instead of configuring the alternative in the beans.xml, a global alternative needs to be configured in /META-INF/apache-deltaspike.properties. CDI 1.1 should fix this issue and migrating to it means to remove the config entry for DeltaSpike again and move to the std. CDI config approach.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>custom.CustomBean=custom.AlternativeCustomBean</pre>
+<pre class="CodeRay highlight"><code>custom.CustomBean=custom.AlternativeCustomBean</code></pre>
 </div>
 </div>
 </div>