Modified: 
websites/staging/deltaspike/trunk/content/retired/release-preparation.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/release-preparation.html 
(original)
+++ websites/staging/deltaspike/trunk/content/retired/release-preparation.html 
Sat Aug  1 21:44:56 2015
@@ -80,13 +80,24 @@
               <div class="page-title">
                 <h1>Reviewing an Apache Release</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#introduction">Introduction</a></li>
 </ul>
 </div>
 <hr />
-<h1 id="introduction">Introduction</h1>
+<h1 id="introduction">Introduction<a class="headerlink" href="#introduction" 
title="Permanent link">&para;</a></h1>
 <p>Once a Release has been staged on <a 
href="http://repository.apache.org";>http://repository.apache.org</a> it must be 
reviewed by each PMC member <strong>before</strong> casting his VOTE.</p>
 <p>The following points need to be checked:</p>
 <ul>
@@ -106,7 +117,7 @@
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/scheduler.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/scheduler.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/scheduler.html Sat Aug  1 
21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>Scheduler Module</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#intro">Intro</a></li>
 <li><a href="#external-dependencies">External Dependencies</a></li>
@@ -90,9 +101,9 @@
 </ul>
 </div>
 <hr />
-<h1 id="intro">Intro</h1>
+<h1 id="intro">Intro<a class="headerlink" href="#intro" title="Permanent 
link">&para;</a></h1>
 <p>This module provides a simple integration with Quartz v2 (per default) or 
any other scheduler which supports cron-expressions for job-classes.</p>
-<h1 id="external-dependencies">External Dependencies</h1>
+<h1 id="external-dependencies">External Dependencies<a class="headerlink" 
href="#external-dependencies" title="Permanent link">&para;</a></h1>
 <p>If you would like to use the default-integration with quartz (which is 
optional), you have to add quartz 2.x.</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.quartz-scheduler<span 
class="nt">&lt;/groupId&gt;</span>
@@ -102,7 +113,7 @@
 </pre></div>
 
 
-<h1 id="scheduled">@Scheduled</h1>
+<h1 id="scheduled">@Scheduled<a class="headerlink" href="#scheduled" 
title="Permanent link">&para;</a></h1>
 <p>Just annotate your Quartz-Jobs with <code>@Scheduled</code> and they will 
get picked up and passed to the scheduler automatically (during the 
bootstrapping process).</p>
 <div class="codehilite"><pre><span class="nd">@Scheduled</span><span 
class="o">(</span><span class="n">cronExpression</span> <span 
class="o">=</span> <span class="s">&quot;0 0/10 * * * ?&quot;</span><span 
class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span 
class="nc">CdiAwareQuartzJob</span> <span class="kd">implements</span> <span 
class="n">org</span><span class="o">.</span><span class="na">quartz</span><span 
class="o">.</span><span class="na">Job</span>
@@ -156,7 +167,7 @@ That can be controlled via <code>@Schedu
 </pre></div>
 
 
-<h1 id="manual-scheduler-control">Manual Scheduler Control</h1>
+<h1 id="manual-scheduler-control">Manual Scheduler Control<a 
class="headerlink" href="#manual-scheduler-control" title="Permanent 
link">&para;</a></h1>
 <p>This SPI allows to control the scheduler (or integrate any other compatible 
scheduler as an alternative to Quartz2)</p>
 <p>Via std. injection like</p>
 <div class="codehilite"><pre><span class="nd">@Inject</span>
@@ -187,7 +198,7 @@ That can be controlled via <code>@Schedu
 
 
 <p>to use a typed injection-point. Otherwise the deployment will fail.</p>
-<h1 id="custom-scheduler">Custom Scheduler</h1>
+<h1 id="custom-scheduler">Custom Scheduler<a class="headerlink" 
href="#custom-scheduler" title="Permanent link">&para;</a></h1>
 <p>It's possible to replace the default integration with Quartz. Any other 
scheduler which supports cron-expressions for job-classes can be used. Please 
have a look at <code>org.apache.deltaspike.test.scheduler.custom</code> for 
further details.</p>
           </div>
       </div>
@@ -195,7 +206,7 @@ That can be controlled via <code>@Schedu
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/security.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/security.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/security.html Sat Aug  1 
21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>DeltaSpike Security Module</h1>
               </div>
-              <p>Title: DeltaSpike Security Module
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<p>Title: DeltaSpike Security Module
 Notice:    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
@@ -130,7 +141,7 @@ If you are using features described by t
 </pre></div>
 
 
-<h1 id="securitybinding-for-class-and-method-invocations">SecurityBinding for 
class and method invocations</h1>
+<h1 id="securitybinding-for-class-and-method-invocations">SecurityBinding for 
class and method invocations<a class="headerlink" 
href="#securitybinding-for-class-and-method-invocations" title="Permanent 
link">&para;</a></h1>
 <p>This feature of the security module functions by intercepting method calls, 
and performing a security check before invocation is allowed to proceed.</p>
 <p>In order to use the DeltaSpike security module, you must first have 
installed the proper dependencies into your POM file. Once this is complete, 
you may proceed to create a security parameter binding annotation. This is what 
we will use to add security behavior to our business classes and methods.</p>
 <p>Create the SecurityBinding:</p>
@@ -257,8 +268,8 @@ Update the Authorizer to use a secured r
 
 
 <p>Our method is now secured, and we are able to use given parameter values as 
part of our security authorizer!</p>
-<h1 id="integrating-3rd-party-security-frameworks">Integrating 3rd party 
security frameworks</h1>
-<h2 id="secured">@Secured</h2>
+<h1 id="integrating-3rd-party-security-frameworks">Integrating 3rd party 
security frameworks<a class="headerlink" 
href="#integrating-3rd-party-security-frameworks" title="Permanent 
link">&para;</a></h1>
+<h2 id="secured">@Secured<a class="headerlink" href="#secured" 
title="Permanent link">&para;</a></h2>
 <p><code>@Secured</code> is build on <code>@SecurityBindingType</code> and a 
very simple alternative to the rest of the security module.
 It's a basic hook to integrate a custom security concept, 3rd party 
frameworks,... . It doesn't provide a full blown security concept like the rest 
of the security module, but other DeltaSpike modules ensure that the security 
concepts are integrated properly (e.g. correct behaviour within custom scope 
implementations,...). It just allows to integrate other security frameworks 
easily.</p>
 <p>(In MyFaces CODI it was originally a CDI interceptor. This part changed a 
bit, because between the interceptor and <code>@Secured</code> is the 
<code>@SecurityBindingType</code> concept which triggers <code>@Secured</code> 
as on possible approach. Therefore the basic behaviour remains the same and you 
can think about it like an interceptor.)</p>
@@ -286,7 +297,7 @@ It's a basic hook to integrate a custom
 </pre></div>
 
 
-<h2 id="accessdecisionvoter">AccessDecisionVoter</h2>
+<h2 id="accessdecisionvoter">AccessDecisionVoter<a class="headerlink" 
href="#accessdecisionvoter" title="Permanent link">&para;</a></h2>
 <p>This interface is (besides the <code>Secured</code> annotation) the most 
important part of the concept. Both artifact types are also the only required 
parts:</p>
 <div class="codehilite"><pre><span class="kd">public</span> <span 
class="kd">class</span> <span class="nc">CustomAccessDecisionVoter</span> <span 
class="kd">implements</span> <span class="n">AccessDecisionVoter</span>
 <span class="o">{</span>
@@ -302,9 +313,9 @@ It's a basic hook to integrate a custom
 
 
 <p>[TODO] hint about the changed parameter/s</p>
-<h2 id="securityviolation">SecurityViolation</h2>
+<h2 id="securityviolation">SecurityViolation<a class="headerlink" 
href="#securityviolation" title="Permanent link">&para;</a></h2>
 <p>In case of a detected violation a <code>SecurityViolation</code> has to be 
added to the result returned by the <code>AccessDecisionVoter</code>.</p>
-<h2 id="abstractaccessdecisionvoter">AbstractAccessDecisionVoter</h2>
+<h2 id="abstractaccessdecisionvoter">AbstractAccessDecisionVoter<a 
class="headerlink" href="#abstractaccessdecisionvoter" title="Permanent 
link">&para;</a></h2>
 <p>You can also implement the abstract class 
<code>AbstractAccessDecisionVoter</code>. This is a convenience class which 
allows an easier usage:</p>
 <p>Example:
     :::java
@@ -321,7 +332,7 @@ It's a basic hook to integrate a custom
 </pre></div>
 
 
-<h2 id="secured-and-stereotypes-with-custom-meta-data">@Secured and 
Stereotypes with custom Meta-data</h2>
+<h2 id="secured-and-stereotypes-with-custom-meta-data">@Secured and 
Stereotypes with custom Meta-data<a class="headerlink" 
href="#secured-and-stereotypes-with-custom-meta-data" title="Permanent 
link">&para;</a></h2>
 <p>If there are multiple <code>AccessDecisionVoter</code> and maybe in 
different constellations, it's easier to provide an expressive CDI stereotypes 
for it. Later on that also allows to change the behaviour in a central 
place.</p>
 <p>Stereotype support of @Secured:</p>
 <div class="codehilite"><pre><span class="nd">@Named</span>
@@ -372,9 +383,9 @@ It's a basic hook to integrate a custom
 </pre></div>
 
 
-<h1 
id="making-intitially-requested-and-secured-page-available-for-redirect-after-login">Making
 intitially requested and secured page available for redirect after login</h1>
+<h1 
id="making-intitially-requested-and-secured-page-available-for-redirect-after-login">Making
 intitially requested and secured page available for redirect after login<a 
class="headerlink" 
href="#making-intitially-requested-and-secured-page-available-for-redirect-after-login"
 title="Permanent link">&para;</a></h1>
 <p>DeltaSpike can be combined with pure CDI or with any other security 
frameworks (like PicketLink) to track the denied page and make it available 
after user logs in.</p>
-<h2 id="cdi-implementation-to-redirect-the-login-to-the-first-denied-page">CDI 
Implementation to redirect the login to the first denied page</h2>
+<h2 id="cdi-implementation-to-redirect-the-login-to-the-first-denied-page">CDI 
Implementation to redirect the login to the first denied page<a 
class="headerlink" 
href="#cdi-implementation-to-redirect-the-login-to-the-first-denied-page" 
title="Permanent link">&para;</a></h2>
 <p>Your LoginService will fire a custom <code>UserLoggedInEvent</code></p>
 <div class="codehilite"><pre><span class="kd">public</span> <span 
class="kd">class</span> <span class="nc">LoginService</span> <span 
class="kd">implements</span> <span class="n">Serializable</span> <span 
class="o">{</span>
 
@@ -437,7 +448,7 @@ It's a basic hook to integrate a custom
 </pre></div>
 
 
-<h2 
id="picketlink-implementation-to-redirect-the-login-to-the-first-denied-page">PicketLink
 Implementation to redirect the login to the first denied page</h2>
+<h2 
id="picketlink-implementation-to-redirect-the-login-to-the-first-denied-page">PicketLink
 Implementation to redirect the login to the first denied page<a 
class="headerlink" 
href="#picketlink-implementation-to-redirect-the-login-to-the-first-denied-page"
 title="Permanent link">&para;</a></h2>
 <p>Once that PicketLink handles the authentication for you, you only need to 
store the denied page and observe PicketLink <code>LoggedInEvent</code> to 
redirect you back to the denied page.</p>
 <p>Use @SessionScoped or @WindowScoped for AdminAccessDecisionVoter and store 
the denied page on your own.</p>
 <div class="codehilite"><pre><span class="nd">@SessionScoped</span> <span 
class="c1">//or @WindowScoped</span>
@@ -490,7 +501,7 @@ It's a basic hook to integrate a custom
 </pre></div>
 
 
-<h1 id="accessdecisionvotercontext">AccessDecisionVoterContext</h1>
+<h1 id="accessdecisionvotercontext">AccessDecisionVoterContext<a 
class="headerlink" href="#accessdecisionvotercontext" title="Permanent 
link">&para;</a></h1>
 <p>Because the <code>AccessDecisionVoter</code> can be chained, 
<code>AccessDecisionVoterContext</code> allows to get the current state as well 
as the results of the security check.</p>
 <p>There are several methods that can be useful</p>
 <ul>
@@ -500,7 +511,7 @@ It's a basic hook to integrate a custom
 <li><code>getMetaData()</code> - Exposes the found meta-data e.g. the 
view-config-class if <code>@Secured</code> is used in combination with 
type-safe view-configs</li>
 <li><code>getMetaDataFor(String, Class&lt;T&gt;)</code> - Exposes meta-data 
for the given key</li>
 </ul>
-<h2 id="securitystrategy-spi">SecurityStrategy SPI</h2>
+<h2 id="securitystrategy-spi">SecurityStrategy SPI<a class="headerlink" 
href="#securitystrategy-spi" title="Permanent link">&para;</a></h2>
 <p>The <code>SecurityStrategy</code> interface allows to provide a custom 
implementation which should be used for <code>@Secured</code>.
 Provide a custom implementation as bean-class in combination with 
<code>@Alternative</code> or <code>@Specializes</code> (or as 
global-alternative).</p>
 <p>In case of global-alternatives an additional config needs to be added to 
<code>/META-INF/apache-deltaspike.properties</code> - e.g.:</p>
@@ -512,7 +523,7 @@ Provide a custom implementation as bean-
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/servlet.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/servlet.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/servlet.html Sat Aug  1 
21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>Servlet module</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#configuration">Configuration</a></li>
 <li><a href="#injectable-servlet-objects">Injectable Servlet objects</a><ul>
@@ -100,7 +111,7 @@
 </ul>
 </div>
 <hr />
-<h1 id="configuration">Configuration</h1>
+<h1 id="configuration">Configuration<a class="headerlink" 
href="#configuration" title="Permanent link">&para;</a></h1>
 <p>In most cases there is no need for any additional configuration beside 
adding the required 
 dependencies to your project, because all required listeners and filters are 
automatically 
 registered in the container.</p>
@@ -154,7 +165,7 @@ listeners and filters in your <code>web.
 </pre></div>
 
 
-<h1 id="injectable-servlet-objects">Injectable Servlet objects</h1>
+<h1 id="injectable-servlet-objects">Injectable Servlet objects<a 
class="headerlink" href="#injectable-servlet-objects" title="Permanent 
link">&para;</a></h1>
 <p>The DeltaSpike Servlet module contains producers for many objects of a 
Servlet environment. 
 All produces are using the special qualifier <code>@DeltaSpike</code> for 
compatibility with CDI 1.1, 
 which supports the injection of some Servlet objects out of the box.</p>
@@ -164,7 +175,7 @@ which supports the injection of some Ser
 </pre></div>
 
 
-<h2 id="servletcontext">ServletContext</h2>
+<h2 id="servletcontext">ServletContext<a class="headerlink" 
href="#servletcontext" title="Permanent link">&para;</a></h2>
 <p>The <code>ServletContext</code> is made available in the application scope. 
It can be injected into any CDI bean 
 like this:</p>
 <div class="codehilite"><pre><span class="p">@</span><span 
class="n">Inject</span> <span class="p">@</span><span 
class="n">DeltaSpike</span>
@@ -172,7 +183,7 @@ like this:</p>
 </pre></div>
 
 
-<h2 id="servletrequest-httpservletrequest">ServletRequest / 
HttpServletRequest</h2>
+<h2 id="servletrequest-httpservletrequest">ServletRequest / 
HttpServletRequest<a class="headerlink" 
href="#servletrequest-httpservletrequest" title="Permanent link">&para;</a></h2>
 <p>The <code>ServletRequest</code> is made available in the request scope. The 
current request can be injected 
 into a CDI bean like this:</p>
 <div class="codehilite"><pre><span class="p">@</span><span 
class="n">Inject</span> <span class="p">@</span><span 
class="n">DeltaSpike</span>
@@ -186,7 +197,7 @@ into a CDI bean like this:</p>
 </pre></div>
 
 
-<h2 id="servletresponse-httpservletresponse">ServletResponse / 
HttpServletResponse</h2>
+<h2 id="servletresponse-httpservletresponse">ServletResponse / 
HttpServletResponse<a class="headerlink" 
href="#servletresponse-httpservletresponse" title="Permanent 
link">&para;</a></h2>
 <p>The <code>ServletResponse</code> is made available in the request scope. 
The current response can be 
 injected into a CDI bean like this:</p>
 <div class="codehilite"><pre><span class="p">@</span><span 
class="n">Inject</span> <span class="p">@</span><span 
class="n">DeltaSpike</span>
@@ -200,7 +211,7 @@ injected into a CDI bean like this:</p>
 </pre></div>
 
 
-<h2 id="httpsession">HttpSession</h2>
+<h2 id="httpsession">HttpSession<a class="headerlink" href="#httpsession" 
title="Permanent link">&para;</a></h2>
 <p>The <code>HttpSession</code> is made available in the session scope. You 
can inject the current session 
 of a user into a CDI bean like this:</p>
 <div class="codehilite"><pre><span class="p">@</span><span 
class="n">Inject</span> <span class="p">@</span><span 
class="n">DeltaSpike</span>
@@ -209,7 +220,7 @@ of a user into a CDI bean like this:</p>
 
 
 <p>Please note that injecting the session this way will force the creation of 
a session. </p>
-<h2 id="principal">Principal</h2>
+<h2 id="principal">Principal<a class="headerlink" href="#principal" 
title="Permanent link">&para;</a></h2>
 <p>The <code>Principal</code> is made available in the request scope. The 
current principal can be 
 injected into a CDI bean like this:</p>
 <div class="codehilite"><pre><span class="p">@</span><span 
class="n">Inject</span> <span class="p">@</span><span 
class="n">DeltaSpike</span>
@@ -218,7 +229,7 @@ injected into a CDI bean like this:</p>
 
 
 <p>The <code>Principal</code> is obtained by calling 
<code>getUserPrincipal()</code> on the <code>HttpServletRequest</code>.</p>
-<h1 id="servlet-event-propagation">Servlet event propagation</h1>
+<h1 id="servlet-event-propagation">Servlet event propagation<a 
class="headerlink" href="#servlet-event-propagation" title="Permanent 
link">&para;</a></h1>
 <p>The DeltaSpike Servlet module will propagate a number of Servlet object 
lifecycle events to 
 the CDI event bus. This allows regular CDI beans to observe these events and 
react accordingly.</p>
 <p>In most cases the event type is the object whose lifecycle is observed. To 
distinguish 
@@ -226,7 +237,7 @@ between construction and destruction of
 qualifiers <code>@Initialized</code> and <code>@Destroyed</code>.</p>
 <p>The following sections will show which concrete Servlet objects are 
supported and how their 
 lifecycle can be observed.</p>
-<h2 id="servlet-context-lifecycle-events">Servlet context lifecycle events</h2>
+<h2 id="servlet-context-lifecycle-events">Servlet context lifecycle events<a 
class="headerlink" href="#servlet-context-lifecycle-events" title="Permanent 
link">&para;</a></h2>
 <p>The Servlet module supports initialization and destruction events for the 
<code>ServletContext</code>. These events
 can for example be used to detect application startup or shutdown. The 
following code shows
 how these events can be observed:</p>
@@ -248,7 +259,7 @@ disable lifecycle events for the <code>S
 
 <p>If you manually registered the required filters and listeners, you can also 
simply remove the
 entry for the <code>EventBridgeContextListener</code> from your 
<code>web.xml</code> to disable the events.</p>
-<h2 id="request-and-response-lifecycle-events">Request and response lifecycle 
events</h2>
+<h2 id="request-and-response-lifecycle-events">Request and response lifecycle 
events<a class="headerlink" href="#request-and-response-lifecycle-events" 
title="Permanent link">&para;</a></h2>
 <p>The Servlet module also supports initialization and destruction events for 
the <code>HttpServletRequest</code>
 and <code>HttpServletResponse</code>. These events can for example be used for 
initialization work like invoking
 <code>setCharacterEncoding</code> on the request.</p>
@@ -283,7 +294,7 @@ to deactivate the following class:</p>
 
 <p>If you manually registered the required filters and listeners you can also 
simply remove the
 entry for the <code>EventBridgeFilter</code> from your <code>web.xml</code> to 
disable the events.</p>
-<h2 id="session-lifecycle-events">Session lifecycle events</h2>
+<h2 id="session-lifecycle-events">Session lifecycle events<a 
class="headerlink" href="#session-lifecycle-events" title="Permanent 
link">&para;</a></h2>
 <p>The last category of events supported by the DeltaSpike Servlet module are 
the lifecycle events
 for the user's HTTP session. The following example shows how these events can 
be observed from
 a regular CDI bean.</p>
@@ -312,7 +323,7 @@ entry for the <code>EventBridgeSessionLi
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/source.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/source.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/source.html Sat Aug  1 
21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>Get Source and compile it</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#scm-repository">SCM / Repository</a><ul>
@@ -102,39 +113,39 @@
 </ul>
 </div>
 <hr />
-<h1 id="introduction">Introduction</h1>
-<h1 id="scm-repository">SCM / Repository</h1>
+<h1 id="introduction">Introduction<a class="headerlink" href="#introduction" 
title="Permanent link">&para;</a></h1>
+<h1 id="scm-repository">SCM / Repository<a class="headerlink" 
href="#scm-repository" title="Permanent link">&para;</a></h1>
 <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>
-<h3 id="initial-checkout">Initial 'checkout'</h3>
+<h3 id="initial-checkout">Initial 'checkout'<a class="headerlink" 
href="#initial-checkout" title="Permanent link">&para;</a></h3>
 <div class="codehilite"><pre><span class="n">git</span> <span 
class="n">clone</span> <span class="n">https</span><span 
class="p">:</span><span class="o">//</span><span class="n">git</span><span 
class="o">-</span><span class="n">wip</span><span class="o">-</span><span 
class="n">us</span><span class="p">.</span><span class="n">apache</span><span 
class="p">.</span><span class="n">org</span><span class="o">/</span><span 
class="n">repos</span><span class="o">/</span><span class="n">asf</span><span 
class="o">/</span><span class="n">deltaspike</span><span 
class="p">.</span><span class="n">git</span>
 </pre></div>
 
 
-<h3 id="update-existing-clone">Update existing clone</h3>
+<h3 id="update-existing-clone">Update existing clone<a class="headerlink" 
href="#update-existing-clone" title="Permanent link">&para;</a></h3>
 <div class="codehilite"><pre><span class="n">git</span> <span 
class="n">pull</span> <span class="o">--</span><span class="n">rebase</span>
 </pre></div>
 
 
-<h2 id="read-only-mirrors">Read-only Mirrors</h2>
-<h3 id="github-mirror">GitHub-Mirror</h3>
+<h2 id="read-only-mirrors">Read-only Mirrors<a class="headerlink" 
href="#read-only-mirrors" title="Permanent link">&para;</a></h2>
+<h3 id="github-mirror">GitHub-Mirror<a class="headerlink" 
href="#github-mirror" title="Permanent link">&para;</a></h3>
 <div class="codehilite"><pre><span class="n">git</span> <span 
class="n">clone</span> <span class="n">https</span><span 
class="p">:</span><span class="o">//</span><span class="n">github</span><span 
class="p">.</span><span class="n">com</span><span class="o">/</span><span 
class="n">apache</span><span class="o">/</span><span class="n">deltaspike</span>
 </pre></div>
 
 
 <p>More information can be found <a 
href="https://help.github.com/articles/which-remote-url-should-i-use";>here</a>.</p>
-<h2 id="git-workflow">GIT Workflow</h2>
+<h2 id="git-workflow">GIT Workflow<a class="headerlink" href="#git-workflow" 
title="Permanent link">&para;</a></h2>
 <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";>http://git-wip-us.apache.org</a>.</p>
 <p><strong>Hint:</strong></p>
 <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>
-<h1 id="build">Build</h1>
+<h1 id="build">Build<a class="headerlink" href="#build" title="Permanent 
link">&para;</a></h1>
 <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>
-<h1 id="tools-ide">Tools / IDE</h1>
+<h1 id="tools-ide">Tools / IDE<a class="headerlink" href="#tools-ide" 
title="Permanent link">&para;</a></h1>
 <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>
-<h2 id="intellij">IntelliJ</h2>
+<h2 id="intellij">IntelliJ<a class="headerlink" href="#intellij" 
title="Permanent link">&para;</a></h2>
 <p><a href="resources/files/settings.jar">Attached</a> you can find the 
settings for formatting the source code. Import them via File | Import 
Settings...</p>
-<h2 id="eclipse">Eclipse</h2>
+<h2 id="eclipse">Eclipse<a class="headerlink" href="#eclipse" title="Permanent 
link">&para;</a></h2>
 <p>For Eclipse you can use this <a 
href="resources/files/deltaspike-code-conventions.xml">Code Formatter 
Profile</a>. Import it via Window | Preferences | Java | Code Style | 
Formatter</p>
           </div>
       </div>
@@ -142,7 +153,7 @@ The following section provides settings
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/spi.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/spi.html Sat Aug  1 
21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>DeltaSpike Service Provider Interface (SPI)</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#deactivatable">Deactivatable</a><ul>
@@ -97,8 +108,8 @@
 </ul>
 </div>
 <hr />
-<h1 id="introduction">Introduction</h1>
-<h1 id="deactivatable">Deactivatable</h1>
+<h1 id="introduction">Introduction<a class="headerlink" href="#introduction" 
title="Permanent link">&para;</a></h1>
+<h1 id="deactivatable">Deactivatable<a class="headerlink" 
href="#deactivatable" title="Permanent link">&para;</a></h1>
 <p>This mechanism is only used for artifacts <strong>like</strong> 
implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which 
<strong>can't</strong> be deactivated with std. CDI mechanisms.</p>
 <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't needed, to provide a custom 
implementation if the default implementation isn'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>
 <p>To deactivate a class it's required to implement 
<code>ClassDeactivator</code>. Returning 'false' or 'true' allows to 
de-/activate the class in question.
@@ -107,7 +118,7 @@ Since <code>ClassDeactivator</code> impl
 DeltaSpike itself doesn'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>
 <p><strong>Attention</strong>: due to the ordinal feature of the low-level 
config approach it'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't be used any 
longer.</p>
-<h2 id="classdeactivator">ClassDeactivator</h2>
+<h2 id="classdeactivator">ClassDeactivator<a class="headerlink" 
href="#classdeactivator" title="Permanent link">&para;</a></h2>
 <p>A class-deactivator allows to specify deactivated classes.</p>
 <div class="codehilite"><pre><span class="c1">//This class needs to be 
configured via one of the supported config sources!</span>
 <span class="n">public</span> <span class="k">class</span> <span 
class="n">CustomClassDeactivator</span> <span class="n">implements</span> <span 
class="n">ClassDeactivator</span>
@@ -127,15 +138,15 @@ DeltaSpike itself doesn't deactivate an
 
 <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>
-<h1 id="configsource">ConfigSource</h1>
+<h1 id="configsource">ConfigSource<a class="headerlink" href="#configsource" 
title="Permanent link">&para;</a></h1>
 <p>[TODO]</p>
-<h2 id="configsourceprovider">ConfigSourceProvider</h2>
+<h2 id="configsourceprovider">ConfigSourceProvider<a class="headerlink" 
href="#configsourceprovider" title="Permanent link">&para;</a></h2>
 <p>[TODO]</p>
-<h2 id="baseconfigpropertyproducer">BaseConfigPropertyProducer</h2>
+<h2 id="baseconfigpropertyproducer">BaseConfigPropertyProducer<a 
class="headerlink" href="#baseconfigpropertyproducer" title="Permanent 
link">&para;</a></h2>
 <p>[TODO]</p>
-<h1 id="interceptorstrategy">InterceptorStrategy</h1>
+<h1 id="interceptorstrategy">InterceptorStrategy<a class="headerlink" 
href="#interceptorstrategy" title="Permanent link">&para;</a></h1>
 <p>[TODO]</p>
-<h1 id="global-alternative">Global Alternative</h1>
+<h1 id="global-alternative">Global Alternative<a class="headerlink" 
href="#global-alternative" title="Permanent link">&para;</a></h1>
 <p>There are several application servers (using CDI 1.0) which can'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><strong>Std. CDI alternative implementation (without the required XML 
config)</strong></p>
 <div class="codehilite"><pre><span class="n">public</span> <span 
class="n">class</span> <span class="n">CustomBean</span>
@@ -159,7 +170,7 @@ DeltaSpike itself doesn't deactivate an
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: 
websites/staging/deltaspike/trunk/content/retired/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/steps_for_a_release.html 
(original)
+++ websites/staging/deltaspike/trunk/content/retired/steps_for_a_release.html 
Sat Aug  1 21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1></h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#preparations">Preparations</a></li>
 <li><a href="#first-steps">First steps</a></li>
@@ -104,7 +115,7 @@
 </ul>
 </div>
 <hr />
-<h1 id="preparations">Preparations</h1>
+<h1 id="preparations">Preparations<a class="headerlink" href="#preparations" 
title="Permanent link">&para;</a></h1>
 <ul>
 <li>Heads up on the mailing-lists </li>
 </ul>
@@ -142,7 +153,7 @@
 </pre></div>
 
 
-<h1 id="first-steps">First steps</h1>
+<h1 id="first-steps">First steps<a class="headerlink" href="#first-steps" 
title="Permanent link">&para;</a></h1>
 <div class="codehilite"><pre><span class="c1">//install a version of git which 
is compatible with the release-plugin (e.g. v1.8.3.2)</span>
 <span class="n">git</span> <span class="n">checkout</span> <span 
class="o">-</span><span class="n">b</span> <span 
class="n">deltaspike</span><span class="o">-</span><span 
class="p">[</span><span class="k">release</span> <span 
class="n">version</span><span class="p">]</span>
 
@@ -165,8 +176,8 @@
 </pre></div>
 
 
-<h1 id="vote">Vote</h1>
-<h2 id="start-the-vote">Start the vote</h2>
+<h1 id="vote">Vote<a class="headerlink" href="#vote" title="Permanent 
link">&para;</a></h1>
+<h2 id="start-the-vote">Start the vote<a class="headerlink" 
href="#start-the-vote" title="Permanent link">&para;</a></h2>
 <p>e.g.:</p>
 <div class="codehilite"><pre><span class="k">[VOTE] Release of Apache 
DeltaSpike [version]</span>
 
@@ -199,13 +210,13 @@
 </pre></div>
 
 
-<h1 id="announce-the-vote">Announce the vote</h1>
+<h1 id="announce-the-vote">Announce the vote<a class="headerlink" 
href="#announce-the-vote" title="Permanent link">&para;</a></h1>
 <ul>
 <li>Create a link to the release notes at http://s.apache.org (format 
DeltaSpike_[version])</li>
 <li>Tweet about the vote via @DeltaSpikeTeam.</li>
 </ul>
-<h1 id="perform-the-final-release">Perform the final release</h1>
-<h2 id="close-the-vote">Close the vote</h2>
+<h1 id="perform-the-final-release">Perform the final release<a 
class="headerlink" href="#perform-the-final-release" title="Permanent 
link">&para;</a></h1>
+<h2 id="close-the-vote">Close the vote<a class="headerlink" 
href="#close-the-vote" title="Permanent link">&para;</a></h2>
 <p>After 72 hours close the vote.</p>
 <p>e.g.:</p>
 <div class="codehilite"><pre><span class="n">Result</span> <span 
class="p">(</span><span class="n">was</span><span class="p">:</span> <span 
class="n">Re</span><span class="p">:</span> <span class="p">[</span><span 
class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> 
<span class="n">of</span> <span class="n">Apache</span> <span 
class="n">DeltaSpike</span> <span class="p">[</span><span 
class="n">version</span><span class="p">])</span>
@@ -242,20 +253,20 @@
 <li>Close the corresponding tickets of the version</li>
 <li>Wait some hours and check 
http://repo2.maven.org/maven2/org/apache/deltaspike</li>
 </ul>
-<h2 id="upload-artifacts">Upload artifacts</h2>
+<h2 id="upload-artifacts">Upload artifacts<a class="headerlink" 
href="#upload-artifacts" title="Permanent link">&para;</a></h2>
 <div class="codehilite"><pre><span class="n">svn</span> <span 
class="n">co</span> <span class="n">https</span><span class="p">:</span><span 
class="o">//</span><span class="n">dist</span><span class="p">.</span><span 
class="n">apache</span><span class="p">.</span><span class="n">org</span><span 
class="o">/</span><span class="n">repos</span><span class="o">/</span><span 
class="n">dist</span><span class="o">/</span><span 
class="n">release</span><span class="o">/</span><span 
class="n">deltaspike</span>
 <span class="n">mkdir</span> <span class="p">[</span><span 
class="n">version</span><span class="p">]</span>
 <span class="o">//</span><span class="n">add</span> <span class="n">and</span> 
<span class="n">commit</span> <span class="n">the</span> <span 
class="n">artifacts</span> <span class="p">(</span><span class="n">at</span> 
<span class="n">least</span> <span class="o">*</span><span 
class="n">source</span><span class="o">-</span><span 
class="n">release</span><span class="p">.</span><span class="n">zip</span> 
<span class="o">+</span> <span class="n">asc</span><span class="p">,</span> 
<span class="n">md5</span><span class="p">,</span> <span 
class="n">sha1</span><span class="p">)</span>
 </pre></div>
 
 
-<h2 id="update-download-links">Update download links</h2>
+<h2 id="update-download-links">Update download links<a class="headerlink" 
href="#update-download-links" title="Permanent link">&para;</a></h2>
 <div class="codehilite"><pre><span class="o">/</span><span 
class="n">deltaspike</span><span class="o">/</span><span 
class="n">site</span><span class="o">/</span><span class="n">trunk</span><span 
class="o">/</span><span class="n">content</span><span class="o">/</span><span 
class="n">download</span><span class="p">.</span><span class="n">mdtext</span>
 </pre></div>
 
 
-<h2 id="announce-the-release">Announce the Release</h2>
-<h3 id="e-mails">E-Mails</h3>
+<h2 id="announce-the-release">Announce the Release<a class="headerlink" 
href="#announce-the-release" title="Permanent link">&para;</a></h2>
+<h3 id="e-mails">E-Mails<a class="headerlink" href="#e-mails" title="Permanent 
link">&para;</a></h3>
 <div class="codehilite"><pre><span class="k">[ANNOUNCE] Release of Apache 
DeltaSpike [version]</span>
 
 <span class="err">The</span> <span class="err">Apache</span> <span 
class="err">DeltaSpike</span> <span class="err">team</span> <span 
class="err">is</span> <span class="err">pleased</span> <span 
class="err">to</span> <span class="err">announce</span> <span 
class="err">the</span> <span class="err">6th</span> <span 
class="err">release</span> <span class="err">of</span> <span 
class="err">DeltaSpike.</span>
@@ -283,13 +294,13 @@
 <li>[email protected]</li>
 <li>[email protected]</li>
 </ul>
-<h3 id="twitter">Twitter</h3>
+<h3 id="twitter">Twitter<a class="headerlink" href="#twitter" title="Permanent 
link">&para;</a></h3>
 <p>e.g.:</p>
 <div class="codehilite"><pre><span class="p">[</span><span 
class="n">ANNOUNCE</span><span class="p">]</span> <span class="n">The</span> 
<span class="n">Apache</span> #<span class="n">DeltaSpike</span> <span 
class="n">team</span> <span class="n">is</span> <span class="n">pleased</span> 
<span class="n">to</span> <span class="n">announce</span> <span 
class="n">http</span><span class="p">:</span><span class="o">//</span><span 
class="n">s</span><span class="p">.</span><span class="n">apache</span><span 
class="p">.</span><span class="n">org</span><span class="o">/</span><span 
class="n">DeltaSpike_</span><span class="p">[</span><span 
class="n">version</span><span class="p">].</span> <span class="n">Feel</span> 
<span class="n">free</span> <span class="n">to</span> <span 
class="n">test</span> <span class="n">it</span>! <span 
class="n">Feedback</span> <span class="n">is</span> <span class="n">very</span> 
<span class="n">welcome</span>!
 </pre></div>
 
 
-<h3 id="news">News</h3>
+<h3 id="news">News<a class="headerlink" href="#news" title="Permanent 
link">&para;</a></h3>
 <p>Add the release to http://deltaspike.apache.org/news.html</p>
           </div>
       </div>
@@ -297,7 +308,7 @@
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: 
websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html
==============================================================================
--- 
websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html 
(original)
+++ 
websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html 
Sat Aug  1 21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1></h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#suggested-git-workflows">Suggested GIT workflows</a><ul>
 <li><a href="#avoid-git-pull">Avoid git-pull!</a></li>
@@ -99,22 +110,22 @@
 </ul>
 </div>
 <hr />
-<h1 id="suggested-git-workflows">Suggested GIT workflows</h1>
-<h2 id="avoid-git-pull">Avoid git-pull!</h2>
+<h1 id="suggested-git-workflows">Suggested GIT workflows<a class="headerlink" 
href="#suggested-git-workflows" title="Permanent link">&para;</a></h1>
+<h2 id="avoid-git-pull">Avoid git-pull!<a class="headerlink" 
href="#avoid-git-pull" title="Permanent link">&para;</a></h2>
 <p>git-pull should never get invoked if you have dirty files lying around or 
if your branch is ahead of master.
 This will always lead to some dirty artifacts in the commit history:</p>
 <div class="codehilite"><pre><span class="n">Merge</span> <span 
class="n">branch</span> <span class="s">&#39;master&#39;</span> <span 
class="n">of</span> <span class="n">http</span><span class="p">:</span><span 
class="o">//</span><span class="n">git</span><span class="o">-</span><span 
class="n">wip</span><span class="o">-</span><span class="n">us</span><span 
class="p">.</span><span class="n">apache</span><span class="p">.</span><span 
class="n">org</span><span class="o">/</span><span class="n">deltaspike</span> 
<span class="n">into</span> <span class="n">master</span>
 </pre></div>
 
 
-<h2 id="git-pull-rebase">git pull --rebase</h2>
+<h2 id="git-pull-rebase">git pull --rebase<a class="headerlink" 
href="#git-pull-rebase" title="Permanent link">&para;</a></h2>
 <p>An easy version for getting rid of the auto-merges is using </p>
 <div class="codehilite"><pre><span class="c">%&gt; git pull --rebase</span>
 </pre></div>
 
 
 <p>Please note that this sometimes trashes your working tree if there are 
unmergeable files around. Cleaning this up with a forced manual rebase is not 
something we would recommend for a git beginner.</p>
-<h3 id="working-in-an-own-branch">Working in an own branch</h3>
+<h3 id="working-in-an-own-branch">Working in an own branch<a 
class="headerlink" href="#working-in-an-own-branch" title="Permanent 
link">&para;</a></h3>
 <p>This is actually the suggested way to prevent auto-merges.</p>
 <p>Create an own branch where you do your feature work. Either do all your 
work in one branch or create one branch per feature you are working on.</p>
 <div class="codehilite"><pre><span class="c">%&gt; git branch mybranch</span>
@@ -149,8 +160,8 @@ If all is well, go back to the master br
 </pre></div>
 
 
-<h2 id="contribution-workflow">Contribution workflow</h2>
-<h3 id="creating-patches">Creating patches</h3>
+<h2 id="contribution-workflow">Contribution workflow<a class="headerlink" 
href="#contribution-workflow" title="Permanent link">&para;</a></h2>
+<h3 id="creating-patches">Creating patches<a class="headerlink" 
href="#creating-patches" title="Permanent link">&para;</a></h3>
 <p>You should use the following workflow, if you plan to contribute patches or 
new features to DeltaSpike.</p>
 <p>First update you local copy of the repository:</p>
 <div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
@@ -184,7 +195,7 @@ If all is well, go back to the master br
 
 
 <p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
-<h3 id="applying-patches">Applying patches</h3>
+<h3 id="applying-patches">Applying patches<a class="headerlink" 
href="#applying-patches" title="Permanent link">&para;</a></h3>
 <p>If you are a committer and want to apply a patch you should do so in a 
separate branch.</p>
 <div class="codehilite"><pre><span class="c">%&gt; git checkout -b 
DELTASPIKE-XXX</span>
 </pre></div>
@@ -203,7 +214,7 @@ If all is well, go back to the master br
 </pre></div>
 
 
-<h2 id="discussion-workflow-optional">Discussion workflow (optional)</h2>
+<h2 id="discussion-workflow-optional">Discussion workflow (optional)<a 
class="headerlink" href="#discussion-workflow-optional" title="Permanent 
link">&para;</a></h2>
 <p>All discussions which lead to a decision take place on the mailing list. 
Sometimes it's required to show-case an idea esp. if the solution is more than 
few lines. As shown above it makes sense to use local branches for developing 
new parts. Git allows to push such local branches to a public repository. So 
it's easier to share it with the community for discussing it. The following 
listings show an example in combination with GitHub - for sure it works with 
any hosting platform like BitBucket, Google-Code,... The only important part 
here is that such branches <em>NEVER</em> get pushed to the main Apache 
repository to keep the commit history as clean as possible.</p>
 <p><strong>Initial setup</strong></p>
 <div class="codehilite"><pre><span class="c">%&gt; git clone 
https://git-wip-us.apache.org/repos/asf/deltaspike.git ./</span>
@@ -231,7 +242,7 @@ If all is well, go back to the master br
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/support.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/support.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/support.html Sat Aug  1 
21:44:56 2015
@@ -87,7 +87,7 @@
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/supporters.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/supporters.html (original)
+++ websites/staging/deltaspike/trunk/content/retired/supporters.html Sat Aug  
1 21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>DeltaSpike supporters</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#support-deltaspike">Support DeltaSpike</a><ul>
 <li><a href="#git-mirrors">Git Mirrors</a></li>
@@ -91,19 +102,19 @@
 </ul>
 </div>
 <hr />
-<h1 id="support-deltaspike">Support DeltaSpike</h1>
+<h1 id="support-deltaspike">Support DeltaSpike<a class="headerlink" 
href="#support-deltaspike" title="Permanent link">&para;</a></h1>
 <p>Apache DeltaSpike gets support from many community members.</p>
-<h2 id="git-mirrors">Git Mirrors</h2>
+<h2 id="git-mirrors">Git Mirrors<a class="headerlink" href="#git-mirrors" 
title="Permanent link">&para;</a></h2>
 <p>Besides the official GitHub mirror there are the following mirrors:</p>
 <ul>
 <li><a 
href="https://github.com/DeltaSpike/Mirror";>https://github.com/DeltaSpike/Mirror</a>
 (+ the corresponding internal <a href="http://www.irian.at";>Irian</a> mirror 
for the sync.)</li>
 </ul>
-<h2 id="mailing-list-mirrors">Mailing-list Mirrors</h2>
+<h2 id="mailing-list-mirrors">Mailing-list Mirrors<a class="headerlink" 
href="#mailing-list-mirrors" title="Permanent link">&para;</a></h2>
 <ul>
 <li><a 
href="http://www.markmail.org/search/?q=list%3Aorg.apache.deltaspike-dev";>Markmail</a></li>
 <li><a href="https://s.apache.org/deltaspike-dev_nabble";>Nabble</a></li>
 </ul>
-<h2 id="integration-tests">(Integration) Tests</h2>
+<h2 id="integration-tests">(Integration) Tests<a class="headerlink" 
href="#integration-tests" title="Permanent link">&para;</a></h2>
 <p>So far we test the following environments on a regular basis (daily ci 
build)</p>
 <ul>
 <li>Apache OpenWebBeans (embedded):  Apache build server</li>
@@ -128,7 +139,7 @@
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 

Modified: websites/staging/deltaspike/trunk/content/retired/test-control.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/test-control.html 
(original)
+++ websites/staging/deltaspike/trunk/content/retired/test-control.html Sat Aug 
 1 21:44:56 2015
@@ -80,7 +80,18 @@
               <div class="page-title">
                 <h1>Test-Control Module</h1>
               </div>
-              <div class="toc">
+              <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }</style>
+<div class="toc">
 <ul>
 <li><a href="#intro">Intro</a></li>
 <li><a href="#setup">Setup</a><ul>
@@ -111,9 +122,9 @@
 </ul>
 </div>
 <hr />
-<h1 id="intro">Intro</h1>
+<h1 id="intro">Intro<a class="headerlink" href="#intro" title="Permanent 
link">&para;</a></h1>
 <p>This module is available since version 0.6 and allows to write CDI based 
tests easily.</p>
-<h1 id="setup">Setup</h1>
+<h1 id="setup">Setup<a class="headerlink" href="#setup" title="Permanent 
link">&para;</a></h1>
 <p>Setup for the CDI implementation of your choice and the following 
test-dependencies:</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.deltaspike.modules<span 
class="nt">&lt;/groupId&gt;</span>
@@ -130,7 +141,7 @@
 </pre></div>
 
 
-<h2 id="openwebbeans">OpenWebBeans</h2>
+<h2 id="openwebbeans">OpenWebBeans<a class="headerlink" href="#openwebbeans" 
title="Permanent link">&para;</a></h2>
 <p>If you are using OpenWebBeans also add the following test-dependency</p>
 <div class="codehilite"><pre> <span class="nt">&lt;dependency&gt;</span>
      <span class="nt">&lt;groupId&gt;</span>org.apache.deltaspike.cdictrl<span 
class="nt">&lt;/groupId&gt;</span>
@@ -141,7 +152,7 @@
 </pre></div>
 
 
-<h2 id="weld">Weld</h2>
+<h2 id="weld">Weld<a class="headerlink" href="#weld" title="Permanent 
link">&para;</a></h2>
 <p>If you are using Weld also add the following test-dependency</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.deltaspike.cdictrl<span 
class="nt">&lt;/groupId&gt;</span>
@@ -152,7 +163,7 @@
 </pre></div>
 
 
-<h1 id="cditestrunner">CdiTestRunner</h1>
+<h1 id="cditestrunner">CdiTestRunner<a class="headerlink" 
href="#cditestrunner" title="Permanent link">&para;</a></h1>
 <p>JUnit Test-Runner to start/stop the CDI-Container autom. (per test-class) 
and one request and session per test-method:</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
 <span class="kd">public</span> <span class="kd">class</span> <span 
class="nc">ContainerAndInjectionControl</span>
@@ -171,7 +182,7 @@
 </pre></div>
 
 
-<h1 id="testcontrol">@TestControl</h1>
+<h1 id="testcontrol">@TestControl<a class="headerlink" href="#testcontrol" 
title="Permanent link">&para;</a></h1>
 <p>@TestControl allows to change the default-behavior. In the following case 
only one session for all test-methods (of the test-class) will be created:</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
 <span class="nd">@TestControl</span><span class="o">(</span><span 
class="n">startScopes</span> <span class="o">=</span> <span 
class="n">SessionScoped</span><span class="o">.</span><span 
class="na">class</span><span class="o">)</span>
@@ -182,7 +193,7 @@
 </pre></div>
 
 
-<h1 id="cditestsuiterunner">CdiTestSuiteRunner</h1>
+<h1 id="cditestsuiterunner">CdiTestSuiteRunner<a class="headerlink" 
href="#cditestsuiterunner" title="Permanent link">&para;</a></h1>
 <p>JUnit Test-Suite-Runner to start/stop the CDI-Container autom. (per 
test-suite):</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestSuiteRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
 <span class="nd">@Suite.SuiteClasses</span><span class="o">({</span>
@@ -195,7 +206,7 @@
 </pre></div>
 
 
-<h1 id="project-stage-control">Project-Stage Control</h1>
+<h1 id="project-stage-control">Project-Stage Control<a class="headerlink" 
href="#project-stage-control" title="Permanent link">&para;</a></h1>
 <p>It's possible to overrule the default-project-stage for unit-tests 
(ProjectStage.UnitTest.class):</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
 <span class="nd">@TestControl</span><span class="o">(</span><span 
class="n">projectStage</span> <span class="o">=</span> <span 
class="n">CustomTestStage</span><span class="o">.</span><span 
class="na">class</span><span class="o">)</span>
@@ -214,13 +225,13 @@
 </pre></div>
 
 
-<h1 id="optional-config">Optional Config</h1>
+<h1 id="optional-config">Optional Config<a class="headerlink" 
href="#optional-config" title="Permanent link">&para;</a></h1>
 <p>It's possible to set "deltaspike.testcontrol.stop_container" to "false" 
(via the std. DeltaSpike config). With that the CDI-Container will be started 
just once for all tests.</p>
-<h1 id="hints">Hints</h1>
+<h1 id="hints">Hints<a class="headerlink" href="#hints" title="Permanent 
link">&para;</a></h1>
 <p>Don't forget to add a beans.xml in the test-module (e.g. 
src/test/resources/META-INF/beans.xml).</p>
 <p>If you are using OpenWebBeans as CDI implementation and you need to test 
EJBs as well, you can use deltaspike-cdictrl-openejb + 
org.apache.openejb:openejb-core (instead of deltaspike-cdictrl-owb).</p>
-<h1 id="optional-integrations">Optional Integrations</h1>
-<h2 id="mock-frameworks">Mock Frameworks</h2>
+<h1 id="optional-integrations">Optional Integrations<a class="headerlink" 
href="#optional-integrations" title="Permanent link">&para;</a></h1>
+<h2 id="mock-frameworks">Mock Frameworks<a class="headerlink" 
href="#mock-frameworks" title="Permanent link">&para;</a></h2>
 <p>With v0.8+ it's possible to mock CDI-Beans. Usually @Exclude (+ 
project-stage) is enough, however, for some cases mocked beans might be easier. 
Therefore it's possible to create (mock-)instances manually or via a mocking 
framework and add them e.g. via <code>DynamicMockManager</code>.</p>
 <p>If you need dependency-injection in the mocked instances, you can use 
<code>BeanProvider.injectFields(myMockedBean);</code>.</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
@@ -376,7 +387,7 @@
 
 <p>In some cases it's needed to use 
<code>@javax.enterprise.inject.Typed</code>. Mocking such typed beans can 
result in an <code>AmbiguousResolutionException</code>.
 Therefore it's needed to exclude the mocked implementation via 
<code>@Exclude</code> or <code>@Typed()</code> (or a parametrized constructor) 
and specify the target-type via <code>@TypedMock</code>.</p>
-<h2 id="jsf-via-myfaces-test">JSF (via MyFaces-Test)</h2>
+<h2 id="jsf-via-myfaces-test">JSF (via MyFaces-Test)<a class="headerlink" 
href="#jsf-via-myfaces-test" title="Permanent link">&para;</a></h2>
 <p>add on of</p>
 <ul>
 <li>org.apache.deltaspike.testcontrol.impl.jsf.MockedJsf2TestContainer</li>
@@ -387,7 +398,7 @@ Therefore it's needed to exclude the moc
 <p>as content to</p>
 
<p>/META-INF/services/org.apache.deltaspike.testcontrol.spi.ExternalContainer</p>
 <p>(in your config-folder for tests e.g.: test/resources)</p>
-<h1 id="mixed-tests">Mixed Tests</h1>
+<h1 id="mixed-tests">Mixed Tests<a class="headerlink" href="#mixed-tests" 
title="Permanent link">&para;</a></h1>
 <p>Usually you should have one kind of tests per test-module.
 However, if you need to add e.g. a test without an external-container to your 
test-module which uses external-containers, you can annotate your test with:</p>
 <div class="codehilite"><pre><span class="nd">@RunWith</span><span 
class="o">(</span><span class="n">CdiTestRunner</span><span 
class="o">.</span><span class="na">class</span><span class="o">)</span>
@@ -399,8 +410,8 @@ However, if you need to add e.g. a test
 </pre></div>
 
 
-<h1 id="known-restrictions">Known Restrictions</h1>
-<h2 id="liquibase">Liquibase</h2>
+<h1 id="known-restrictions">Known Restrictions<a class="headerlink" 
href="#known-restrictions" title="Permanent link">&para;</a></h1>
+<h2 id="liquibase">Liquibase<a class="headerlink" href="#liquibase" 
title="Permanent link">&para;</a></h2>
 <p>Liquibase invokes <code>#toString</code> in a 
<code>AfterDeploymentValidation</code> observer.
 <strong>that isn't portable</strong> and therefore you have to deactivate the 
mocking-support via:</p>
 <div class="codehilite"><pre><span class="kd">public</span> <span 
class="kd">class</span> <span class="nc">LiquibaseAwareClassDeactivator</span> 
<span class="kd">implements</span> <span class="n">ClassDeactivator</span> 
<span class="o">{</span>
@@ -418,8 +429,8 @@ However, if you need to add e.g. a test
 
 
 <p>Further details are available at <a 
href="spi.html#deactivatable">deactivatable</a>.</p>
-<h1 id="spi">SPI</h1>
-<h2 id="externalcontainer">ExternalContainer</h2>
+<h1 id="spi">SPI<a class="headerlink" href="#spi" title="Permanent 
link">&para;</a></h1>
+<h2 id="externalcontainer">ExternalContainer<a class="headerlink" 
href="#externalcontainer" title="Permanent link">&para;</a></h2>
 <p>org.apache.deltaspike.testcontrol.spi.ExternalContainer allows to integrate 
containers which get started after the CDI container.
 Currently DeltaSpike provides:</p>
 <ul>
@@ -432,7 +443,7 @@ Currently DeltaSpike provides:</p>
       <hr>
 
       <footer>
-        <p>Copyright © 2011-2014 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.</p>
+        <p>Copyright © 2011-2015 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>
 


Reply via email to