deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r931643 [2/2] - in /websites/staging/deltaspike/trunk/content: ./ draft/ retired/ staging/ staging/documentation/
Date Sat, 06 Dec 2014 11:55:31 GMT
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/examples.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/examples.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/examples.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
-<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>
+<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>
+<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>
-</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>
-</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>
@@ -307,6 +235,5 @@ $ mvn clean package</code></pre>
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/external.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/external.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/external.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -350,6 +288,5 @@ body {
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/index.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/index.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/index.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -282,6 +288,5 @@ body {
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/jpa.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/jpa.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/jpa.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -737,6 +737,5 @@ to /META-INF/apache-deltaspike.propertie
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -2625,6 +2625,5 @@ with Weld versions below 1.1.10 due to
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Added: websites/staging/deltaspike/trunk/content/staging/documentation/modules.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/modules.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/modules.html Sat Dec  6 11:55:30 2014
@@ -0,0 +1,270 @@
+<!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: websites/staging/deltaspike/trunk/content/staging/documentation/overview.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/overview.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/overview.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -360,6 +360,5 @@ body {
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -232,6 +232,5 @@ additional dependency and allows to impl
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -328,6 +328,5 @@ determine the string is the ConfigResolv
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -356,6 +356,5 @@ further details.</p>
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/security.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/security.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/security.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -811,6 +811,5 @@ globalAlternatives.<code>&lt;interface-n
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -529,6 +529,5 @@ your <code>web.xml</code> to disable the
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/snapshots.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/snapshots.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/snapshots.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -262,6 +262,5 @@ body {
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/source.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/source.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/source.html Sat Dec  6 11:55:30 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. -->
 
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -303,6 +306,5 @@ Settings&#8230;&#8203;</p>
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/spi.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/spi.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -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>
@@ -338,6 +303,5 @@ again and move to the std. CDI config ap
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Added: websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html Sat Dec  6 11:55:30 2014
@@ -0,0 +1,505 @@
+<!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>Steps for a Release</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>Steps for a Release</h1>
+                </div>
+
+				<div id="toc" class="toc">
+       	 		<ul class="sectlevel1">
+<li><a href="#_preparations">Preparations</a></li>
+<li><a href="#_first_steps">First steps</a></li>
+<li><a href="#_vote">Vote</a>
+<ul class="sectlevel1">
+<li><a href="#_start_the_vote">Start the vote</a></li>
+</ul>
+</li>
+<li><a href="#_announce_the_vote">Announce the vote</a></li>
+<li><a href="#_perform_the_final_release">Perform the final release</a>
+<ul class="sectlevel1">
+<li><a href="#_close_the_vote">Close the vote</a></li>
+<li><a href="#_upload_artifacts">Upload artifacts</a></li>
+<li><a href="#_update_download_links">Update download links</a></li>
+<li><a href="#_announce_the_release">Announce the Release</a>
+<ul class="sectlevel2">
+<li><a href="#_e_mails">E-Mails</a></li>
+<li><a href="#_twitter">Twitter</a></li>
+<li><a href="#_news">News</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+       	 		<hr>	
+       	 		
+				<div class="sect1">
+<h2 id="_preparations">Preparations</h2>
+<div class="sectionbody">
+<div class="ulist">
+<ul>
+<li>
+<p>Heads up on the mailing-lists</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>first steps for the next release
+
+hi @ all,
+
+if there are no objections, i'll start with the first steps for the next release (review, documentation,...).
+it would be great to start with the release procedure next week.
+
+regards,
+[name]</pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Check the documentation</p>
+</li>
+<li>
+<p>Check <a href="https://analysis.apache.org/dashboard/index/87921" class="bare">https://analysis.apache.org/dashboard/index/87921</a></p>
+</li>
+<li>
+<p>Check diff with tag of [version-1]</p>
+</li>
+<li>
+<p>Check the jenkins builds</p>
+</li>
+<li>
+<p>Create release notes and commit them to deltaspike/readme/ (format [ReleaseNotes][version].txt)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>test at least:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>mvn clean install -POWB
+mvn clean install -PWeld
+mvn clean install -Prat
+mvn clean install -Ptomee-build-managed
+mvn clean install -Pjbossas-build-managed-7
+mvn clean install -Pwildfly-build-managed
+mvn clean install -Pglassfish-build-managed-3</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>deploy a demo app esp. with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
+(<a href="https://github.com/os890/ee6-ds-demo" class="bare">https://github.com/os890/ee6-ds-demo</a> can be used for it e.g.)</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_first_steps">First steps</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre>//install a version of git which is compatible with the release-plugin (e.g. v1.8.3.2)
+git checkout -b deltaspike-[release version]
+
+mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
+
+//hint: don't use -DdryRun=true -- since it can break the next step
+mvn release:perform -Pdistribution -DreleaseProfiles=distribution
+
+//!!!check the created commits including user-name and email
+
+//login to https://repository.apache.org/ and go to "Staging Repositories"
+//check esp. .../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+//close the repository
+
+//push the release-branch and tag to a 3rd party git repo
+git remote add vote https://github.com/[user]/deltaspike-vote
+git push -u vote master
+git push vote deltaspike-[release version]
+git push vote --tags</pre>
+</div>
+</div>
+</div>
+</div>
+<h1 id="_vote" class="sect0">Vote</h1>
+<div class="sect1">
+<h2 id="_start_the_vote">Start the vote</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>[VOTE] Release of Apache DeltaSpike [version]
+
+
+Hi,
+
+I was running the needed tasks to get the ... release of Apache DeltaSpike out.
+The artifacts are deployed to Nexus [1] (and [2]).
+
+The tag is available at [3] and will get pushed to the ASF repository once the vote passed.
+
+Please take a look at the ... artifacts and vote!
+
+Please note:
+This vote is "majority approval" with a minimum of three +1 votes (see [4]).
+
+------------------------------------------------
+[ ] +1 for community members who have reviewed the bits
+[ ] +0
+[ ] -1 for fatal flaws that should cause these bits not to be released, and why..............
+------------------------------------------------
+
+Thanks,
+[name]
+
+[1] https://repository.apache.org/content/repositories/...
+[2] https://repository.apache.org/content/repositories/.../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+[3] https://github.com/[user]/deltaspike-vote/tree/deltaspike-project-[version]
+[4] http://www.apache.org/foundation/voting.html#ReleaseVotes</pre>
+</div>
+</div>
+</div>
+</div>
+<h1 id="_announce_the_vote" class="sect0">Announce the vote</h1>
+<div class="ulist">
+<ul>
+<li>
+<p>Create a link to the release notes at <a href="http://s.apache.org" class="bare">http://s.apache.org</a> (format DeltaSpike_[version])</p>
+</li>
+<li>
+<p>Tweet about the vote via @DeltaSpikeTeam.</p>
+</li>
+</ul>
+</div>
+<h1 id="_perform_the_final_release" class="sect0">Perform the final release</h1>
+<div class="sect1">
+<h2 id="_close_the_vote">Close the vote</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>After 72 hours close the vote.</p>
+</div>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>Result (was: Re: [VOTE] Release of Apache DeltaSpike [version])
+
+thank you for voting!
+
+X binding +1 votes (pmc):
+[list]
+
+Y non-binding +1 votes:
+[list]
+
+Z -1 votes
+[list]</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If the binding majority approved the vote continue.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Login to <a href="https://repository.apache.org/" class="bare">https://repository.apache.org/</a> and release the repository</p>
+</li>
+<li>
+<p>Merge release branch into master and push the branch and tag to the ASF repository</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Always do a merge in this case (not a rebase):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>git checkout master
+git merge deltaspike-[version]
+git push origin deltaspike-[version]
+git push origin deltaspike-project-[version]
+git push origin master</pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Create the release at jira</p>
+</li>
+<li>
+<p>Close the corresponding tickets of the version</p>
+</li>
+<li>
+<p>Wait some hours and check <a href="http://repo2.maven.org/maven2/org/apache/deltaspike" class="bare">http://repo2.maven.org/maven2/org/apache/deltaspike</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_upload_artifacts">Upload artifacts</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre>svn co https://dist.apache.org/repos/dist/release/deltaspike
+mkdir [version]
+//add and commit the artifacts (at least *source-release.zip + asc, md5, sha1)</pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_update_download_links">Update download links</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>/deltaspike/site/trunk/content/download.mdtext</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_announce_the_release">Announce the Release</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_e_mails">E-Mails</h3>
+<div class="listingblock">
+<div class="content">
+<pre>[ANNOUNCE] Release of Apache DeltaSpike [version]
+
+The Apache DeltaSpike team is pleased to announce the 6th release of DeltaSpike.
+
+Apache DeltaSpike is not a CDI-container, but a portable CDI extension.
+
+Documentation:
+http://deltaspike.apache.org/documentation.html
+
+Download:
+http://deltaspike.apache.org/download.html
+
+Release Notes:
+http://s.apache.org/DeltaSpike_06
+
+Enjoy!
+
+[name]</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Write the e-mails to:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="mailto:announce@apache.org">announce@apache.org</a></p>
+</li>
+<li>
+<p><a href="mailto:dev@deltaspike.apache.org">dev@deltaspike.apache.org</a></p>
+</li>
+<li>
+<p><a href="mailto:users@deltaspike.apache.org">users@deltaspike.apache.org</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_twitter">Twitter</h3>
+<div class="paragraph">
+<p>e.g.:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>[ANNOUNCE] The Apache #DeltaSpike team is pleased to announce http://s.apache.org/DeltaSpike_[version]. Feel free to test it! Feedback is very welcome!</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_news">News</h3>
+<div class="paragraph">
+<p>Add the release to <a href="http://deltaspike.apache.org/news.html" class="bare">http://deltaspike.apache.org/news.html</a></p>
+</div>
+</div>
+</div>
+</div>
+			</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: websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html Sat Dec  6 11:55:30 2014
@@ -110,6 +110,7 @@ body {
 	padding-bottom: 40px;
 }
 </style>
+
 <script type="text/javascript">
 
 	  var _gaq = _gaq || [];
@@ -134,8 +135,7 @@ body {
 					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>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
@@ -758,6 +758,5 @@ Currently DeltaSpike provides:</p>
 
 		</div>
 		<!-- /.container -->
-
 </body>
 </html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/suggested-git-workflows.html (original)
+++ websites/staging/deltaspike/trunk/content/suggested-git-workflows.html Sat Dec  6 11:55:30 2014
@@ -20,12 +20,14 @@
     <!--<link href="./resources/css/prettify.css" rel="stylesheet" /> -->
     <link href="./resources/css/codehilite.css" rel="stylesheet" />
     <link href="./resources/css/bootstrap-responsive.css" rel="stylesheet">
+
     <style type="text/css">
         body {
             padding-top: 60px;
             padding-bottom: 40px;
         }
     </style>
+
 	<script type="text/javascript">
 
 	  var _gaq = _gaq || [];



Mime
View raw message