You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by bu...@apache.org on 2015/04/15 17:06:45 UTC
svn commit: r947732 - in /websites/staging/deltaspike/trunk/content: ./
staging/documentation/
Author: buildbot
Date: Wed Apr 15 15:06:45 2015
New Revision: 947732
Log:
Staging update by buildbot for deltaspike
Modified:
websites/staging/deltaspike/trunk/content/ (props changed)
websites/staging/deltaspike/trunk/content/staging/documentation/build.html
websites/staging/deltaspike/trunk/content/staging/documentation/cdiimp.html
websites/staging/deltaspike/trunk/content/staging/documentation/configure.html
websites/staging/deltaspike/trunk/content/staging/documentation/container-control.html
websites/staging/deltaspike/trunk/content/staging/documentation/core.html
websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html
websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html
websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html
websites/staging/deltaspike/trunk/content/staging/documentation/security.html
websites/staging/deltaspike/trunk/content/staging/documentation/snapshots.html
websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html
Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 15 15:06:45 2015
@@ -1 +1 @@
-1671851
+1673814
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/build.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/build.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/build.html Wed Apr 15 15:06:45 2015
@@ -204,7 +204,7 @@ body {
<p>The DeltaSpike source (modules and examples) is provided for inspection, contribution and testing purposes. The source must be built with Maven, which has been used to automate the compilation, testing and packaging processes. Arquillian tests are included with the source and a CDI implementation or container can be specified with which to carry out the tests.</p>
</div>
<div class="paragraph">
-<p>In all cases, to obtain the DeltaSpike source, <a href="https://deltaspike.apache.org/download.html">download</a> <code>deltaspike-project-1.2.1-source-release.zip</code> and extract the contents.</p>
+<p>In all cases, to obtain the DeltaSpike source, <a href="https://deltaspike.apache.org/download.html">download</a> <code>deltaspike-project-1.3.0-source-release.zip</code> and extract the contents.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -228,7 +228,7 @@ You can also obtain the DeltaSpike sourc
</div>
<div class="listingblock">
<div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">$ cd /path/to/deltaspike-project-1.2.1/
+<pre class="CodeRay highlight"><code data-lang="shell">$ cd /path/to/deltaspike-project-1.3.0/
$ mvn clean install</code></pre>
</div>
</div>
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/cdiimp.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/cdiimp.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/cdiimp.html Wed Apr 15 15:06:45 2015
@@ -196,13 +196,12 @@ body {
<li><a href="#_java_ee5_and_servlet_containers">Java EE5 and Servlet Containers</a></li>
<li><a href="#javase6">Java SE6+</a>
<ul class="sectlevel2">
-<li><a href="#_1_declare_cdi_dependencies">1. Declare CDI Dependencies</a>
+<li><a href="#_declare_cdi_dependencies">Declare CDI Dependencies</a>
<ul class="sectlevel3">
<li><a href="#_option_a_declare_dependencies_for_maven_based_projects">Option A: Declare Dependencies for Maven-based Projects</a></li>
<li><a href="#_option_b_declare_dependencies_for_maven_independent_projects">Option B: Declare Dependencies for Maven-independent Projects</a></li>
</ul>
</li>
-<li><a href="#_2_start_the_cdi_container_from_your_project">2. Start the CDI Container from Your Project</a></li>
</ul>
</li>
<li><a href="#_next">Next</a></li>
@@ -250,7 +249,7 @@ body {
<p>Instructions are provided here for adding the required resources to both Maven-based and Maven-independent projects and subsequently booting the CDI container from your project source code.</p>
</div>
<div class="sect2">
-<h3 id="_1_declare_cdi_dependencies">1. Declare CDI Dependencies</h3>
+<h3 id="_declare_cdi_dependencies">Declare CDI Dependencies</h3>
<div class="sect3">
<h4 id="_option_a_declare_dependencies_for_maven_based_projects">Option A: Declare Dependencies for Maven-based Projects</h4>
<div class="paragraph">
@@ -387,66 +386,6 @@ body {
</div>
</div>
</div>
-<div class="sect2">
-<h3 id="_2_start_the_cdi_container_from_your_project">2. Start the CDI Container from Your Project</h3>
-<div class="paragraph">
-<p>To start a CDI container in your application, you must instantiate a <code>CdiContainer</code> object and call the <code>#boot</code> method. When <code>#boot</code> is called, the <code>CdiContainer</code> scans CDI-enabled
-archives for beans and CDI extensions. Before the application exits, <code>#shutdown</code> must be called to correctly destroy all beans. An example is given in the code snippet here.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainer</span>;
-<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainerLoader</span>;
-
-<span class="directive">public</span> <span class="type">class</span> <span class="class">MainApp</span> {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> main(<span class="predefined-type">String</span><span class="type">[]</span> args) {
-
- CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
- cdiContainer.boot();
-
- <span class="comment">// You can use CDI here</span>
-
- cdiContainer.shutdown();
- }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Starting the container does not automatically start all CDI Contexts. Contexts must be started independently using the provided <code>ContextControl</code> class. An example of starting the Context for <code>@ApplicationScoped</code> beans is added to the code snippet here.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainer</span>;
-<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainerLoader</span>;
-<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.ContextControl</span>;
-<span class="keyword">import</span> <span class="include">javax.enterprise.context.ApplicationScoped</span>;
-
-<span class="directive">public</span> <span class="type">class</span> <span class="class">MainApp</span> {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> main(<span class="predefined-type">String</span><span class="type">[]</span> args) {
-
- CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
- cdiContainer.boot();
-
- <span class="comment">// Starting the application-context enables use of @ApplicationScoped beans</span>
- ContextControl contextControl = cdiContainer.getContextControl();
- contextControl.startContext(ApplicationScoped.class);
-
- <span class="comment">// You can use CDI here</span>
-
- cdiContainer.shutdown();
- }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>To resolve project beans, you can use the DeltaSpike <code>BeanProvider</code> class. Whether <code>EchoService</code> is a concrete implementation or just an interface depends on the application. In the case that it is an interface, the corresponding implementation is resolved. The resolved bean is a standard CDI bean and it can be used for all CDI concepts, such as <code>@Inject</code>, in the class without further uses of <code>BeanProvider</code>. An example of resolving the bean without qualifiers is given in the code snippet here.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">EchoService echoService = BeanProvider.getContextualReference(EchoService.class, <span class="predefined-constant">false</span>);</code></pre>
-</div>
-</div>
-</div>
</div>
</div>
<div class="sect1">
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/configure.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/configure.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/configure.html Wed Apr 15 15:06:45 2015
@@ -235,7 +235,7 @@ You can also opt to use the lastest Delt
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
- <span class="tag"><deltaspike.version></span>1.2.1<span class="tag"></deltaspike.version></span>
+ <span class="tag"><deltaspike.version></span>1.3.0<span class="tag"></deltaspike.version></span>
<span class="tag"></properties></span></code></pre>
</div>
</div>
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/container-control.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/container-control.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/container-control.html Wed Apr 15 15:06:45 2015
@@ -195,11 +195,13 @@ body {
<li><a href="#_overview">Overview</a></li>
<li><a href="#_configure_your_projects">Configure Your Projects</a>
<ul class="sectlevel2">
+<li><a href="#_enable_cdi_for_your_java_environment">Enable CDI For Your Java Environment</a></li>
<li><a href="#_declare_container_control_module_dependencies">Declare Container Control Module Dependencies</a></li>
</ul>
</li>
<li><a href="#_use_the_module_features">Use the Module Features</a>
<ul class="sectlevel2">
+<li><a href="#_start_the_cdi_container_from_your_project">Start the CDI Container from Your Project</a></li>
<li><a href="#_cdicontainer">CdiContainer</a></li>
<li><a href="#_contextcontrol_usage">ContextControl Usage</a></li>
<li><a href="#_procedure_for_builing_uber_jar">Procedure for builing Uber jar</a>
@@ -234,6 +236,12 @@ body {
<p>The configuration information provided here is for Maven-based projects and it assumes that you have already declared the DeltaSpike version and DeltaSpike Core module for your projects, as detailed in <a href="configure.html">Configure DeltaSpike in Your Projects</a>. For Maven-independent projects, see <a href="configure.html#config-maven-indep">Configure DeltaSpike in Maven-independent Projects</a>.</p>
</div>
<div class="sect2">
+<h3 id="_enable_cdi_for_your_java_environment">Enable CDI For Your Java Environment</h3>
+<div class="paragraph">
+<p>This module requires a CDI implementation to be available in the Java environment where your projects are deployed. Dependent on the Java environment you choose, some setup may be necessary as detailed at the <a href="cdiimp.html">Enable CDI For Your Java Environment</a> page.</p>
+</div>
+</div>
+<div class="sect2">
<h3 id="_declare_container_control_module_dependencies">Declare Container Control Module Dependencies</h3>
<div class="paragraph">
<p>Add the Container Control module to the list of dependencies in the project <code>pom.xml</code> file using this code snippet:</p>
@@ -255,6 +263,66 @@ body {
<h2 id="_use_the_module_features">Use the Module Features</h2>
<div class="sectionbody">
<div class="sect2">
+<h3 id="_start_the_cdi_container_from_your_project">Start the CDI Container from Your Project</h3>
+<div class="paragraph">
+<p>To start a CDI container in your application, you must instantiate a <code>CdiContainer</code> object and call the <code>#boot</code> method. When <code>#boot</code> is called, the <code>CdiContainer</code> scans CDI-enabled
+archives for beans and CDI extensions. Before the application exits, <code>#shutdown</code> must be called to correctly destroy all beans. An example is given in the code snippet here.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainer</span>;
+<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainerLoader</span>;
+
+<span class="directive">public</span> <span class="type">class</span> <span class="class">MainApp</span> {
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> main(<span class="predefined-type">String</span><span class="type">[]</span> args) {
+
+ CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
+ cdiContainer.boot();
+
+ <span class="comment">// You can use CDI here</span>
+
+ cdiContainer.shutdown();
+ }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Starting the container does not automatically start all CDI Contexts. Contexts must be started independently using the provided <code>ContextControl</code> class. An example of starting the Context for <code>@ApplicationScoped</code> beans is added to the code snippet here.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainer</span>;
+<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.CdiContainerLoader</span>;
+<span class="keyword">import</span> <span class="include">org.apache.deltaspike.cdise.api.ContextControl</span>;
+<span class="keyword">import</span> <span class="include">javax.enterprise.context.ApplicationScoped</span>;
+
+<span class="directive">public</span> <span class="type">class</span> <span class="class">MainApp</span> {
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> main(<span class="predefined-type">String</span><span class="type">[]</span> args) {
+
+ CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
+ cdiContainer.boot();
+
+ <span class="comment">// Starting the application-context enables use of @ApplicationScoped beans</span>
+ ContextControl contextControl = cdiContainer.getContextControl();
+ contextControl.startContext(ApplicationScoped.class);
+
+ <span class="comment">// You can use CDI here</span>
+
+ cdiContainer.shutdown();
+ }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>To resolve project beans, you can use the DeltaSpike <code>BeanProvider</code> class. Whether <code>EchoService</code> is a concrete implementation or just an interface depends on the application. In the case that it is an interface, the corresponding implementation is resolved. The resolved bean is a standard CDI bean and it can be used for all CDI concepts, such as <code>@Inject</code>, in the class without further uses of <code>BeanProvider</code>. An example of resolving the bean without qualifiers is given in the code snippet here.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java">EchoService echoService = BeanProvider.getContextualReference(EchoService.class, <span class="predefined-constant">false</span>);</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
<h3 id="_cdicontainer">CdiContainer</h3>
<div class="paragraph">
<p>The <code>CdiContainer</code> interface provides booting and shutdown of the CDI containers from deployed applications, with <code>CdiContainerLoader</code> a simple factory providing access to the underlying <code>CdiContainer</code> implementation.</p>
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/core.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/core.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/core.html Wed Apr 15 15:06:45 2015
@@ -240,6 +240,7 @@ body {
<ul class="sectlevel3">
<li><a href="#_arraysutils">ArraysUtils</a></li>
<li><a href="#_beanutils">BeanUtils</a></li>
+<li><a href="#_contextutils">ContextUtils</a></li>
<li><a href="#_classdeactivationutils">ClassDeactivationUtils</a></li>
<li><a href="#_exceptionutils">ExceptionUtils</a></li>
<li><a href="#_propertyfileutils">PropertyFileUtils</a></li>
@@ -1557,6 +1558,19 @@ objects, the last object in the array wi
</li>
</ul>
</div>
+</div>
+<div class="sect3">
+<h4 id="_contextutils">ContextUtils</h4>
+<div class="paragraph">
+<p>A set of utility methods for working with contexts.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>#isContextActive</code> - Checks if the context for the scope annotation is active.</p>
+</li>
+</ul>
+</div>
</div>
<div class="sect3">
<h4 id="_classdeactivationutils">ClassDeactivationUtils</h4>
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 Wed Apr 15 15:06:45 2015
@@ -200,6 +200,7 @@ body {
</li>
<li><a href="#_use_the_module_features">Use the Module Features</a>
<ul class="sectlevel2">
+<li><a href="#_jsf_messages">JSF Messages</a></li>
<li><a href="#_multi_window_handling">Multi-Window Handling</a>
<ul class="sectlevel3">
<li><a href="#_background">Background</a>
@@ -237,6 +238,7 @@ body {
<li><a href="#__groupedconversationscoped_from_deltaspike_0_6">@GroupedConversationScoped (From DeltaSpike 0.6)</a></li>
<li><a href="#__viewscoped">@ViewScoped</a></li>
<li><a href="#_jsf_2_0_scopes">JSF 2.0 Scopes</a></li>
+<li><a href="#_observing_jsf_requests">Observing JSF requests</a></li>
</ul>
</li>
<li><a href="#_integration_with_deltaspike_type_safe_messages">Integration with DeltaSpike Type-safe Messages</a></li>
@@ -390,6 +392,45 @@ the corresponding impact.
</table>
</div>
<div class="sect2">
+<h3 id="_jsf_messages">JSF Messages</h3>
+<div class="paragraph">
+<p>DeltaSpike provides an injectable component for typesafe FacesMessages.</p>
+</div>
+<div class="paragraph">
+<p>Is provides an integration with <a href="core.html#_messages_and_i18n">MessageBundle</a> making the use of JSF messages and I18N simple and type-safe.</p>
+</div>
+<div class="paragraph">
+<p>Usage:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@MessageBundle</span>
+<span class="directive">public</span> <span class="type">interface</span> <span class="class">Messages</span>
+{
+ <span class="annotation">@MessageTemplate</span>(<span class="string"><span class="delimiter">"</span><span class="content">Welcome to DeltaSpike</span><span class="delimiter">"</span></span>)
+ <span class="predefined-type">String</span> welcomeToDeltaSpike();
+}
+
+ <span class="annotation">@Model</span>
+ <span class="directive">public</span> <span class="type">class</span> <span class="class">MyJSFBean</span>
+ {
+ <span class="annotation">@Inject</span>
+ <span class="directive">private</span> JsfMessage<Messages> messages;
+
+ ...
+ messages.addInfo().welcomeToDeltaSpike();
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>MessageBundle methods which are used as JsfMessage can return a <code>org.apache.deltaspike.core.api.message.Message</code> or a String.
+In case of a String we use it for both the summary and detail information on the FacesMessage.</p>
+</div>
+<div class="paragraph">
+<p>If a Message is returned, we lookup the 'detail' and 'summary' categories (see <code>org.apache.deltaspike.core.api.message.Message#toString(String)</code> for creating the FacesMessage.</p>
+</div>
+</div>
+<div class="sect2">
<h3 id="_multi_window_handling">Multi-Window Handling</h3>
<div class="sect3">
<h4 id="_background">Background</h4>
@@ -791,7 +832,7 @@ as possible - which are terminated autom
In such an use-case you can use this scope. The simple rule is, as long
as the bean is referenced by a page - the bean will be available for the
next page (if it is used again the bean will be forwarded again). It is
-important that it is based on the view-id of a page (it isis not based on
+important that it is based on the view-id of a page (it is not based on
the request) so, for example, Ajax requests do not trigger a cleanup if the
request doesis not access all view-access scoped beans of the page. That’s
also the reason for the name @<em>View</em>AccessScoped.</p>
@@ -869,6 +910,57 @@ issues, if you import a JSF 2 annotation
CDI annotation.</p>
</div>
</div>
+<div class="sect3">
+<h4 id="_observing_jsf_requests">Observing JSF requests</h4>
+<div class="paragraph">
+<p>DeltaSpike allows to observe JSF requests using <code>@org.apache.deltaspike.core.api.lifecycle.Initialized</code> and <code>@org.apache.deltaspike.core.api.lifecycle.Destroyed</code></p>
+</div>
+<div class="paragraph">
+<p>Example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"> <span class="directive">protected</span> <span class="type">void</span> onFacesRequestStart(<span class="annotation">@Observes</span> <span class="annotation">@org</span>.apache.deltaspike.core.api.lifecycle.Initialized FacesContext facesContext) {
+ <span class="comment">//...</span>
+ }
+
+ <span class="directive">protected</span> <span class="type">void</span> onFacesRequestEnd(<span class="annotation">@Observes</span> <span class="annotation">@org</span>.apache.deltaspike.core.api.lifecycle.Destroyed FacesContext facesContext) {
+ <span class="comment">//...</span>
+ }</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In CDI 1.1+ there are annotations with the same name (different packages). DeltaSpike makes possible to use these annotations to access the FacesContext.</p>
+</div>
+<div class="paragraph">
+<p>CDI 1.1+ out-of-the-box support:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"> <span class="directive">protected</span> <span class="type">void</span> onRequestStart(<span class="annotation">@Observes</span> <span class="annotation">@javax</span>.enterprise.context.Initialized(javax.enterprise.context.RequestScoped.class) <span class="predefined-type">Object</span> payload) {
+ <span class="comment">//...</span>
+ }
+
+ <span class="directive">protected</span> <span class="type">void</span> onRequestEnd(<span class="annotation">@Observes</span> <span class="annotation">@javax</span>.enterprise.context.Destroyed(javax.enterprise.context.RequestScoped.class) <span class="predefined-type">Object</span> payload) {
+ <span class="comment">//...</span>
+ }</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Feature introduced by DeltaSpike for CDI 1.1+:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"> <span class="directive">protected</span> <span class="type">void</span> onFacesRequestStart(<span class="annotation">@Observes</span> <span class="annotation">@javax</span>.enterprise.context.Initialized(javax.faces.bean.RequestScoped.class) FacesContext facesContext) {
+ <span class="comment">//...</span>
+ }
+
+ <span class="directive">protected</span> <span class="type">void</span> onFacesRequestEnd(<span class="annotation">@Observes</span> <span class="annotation">@javax</span>.enterprise.context.Destroyed(javax.faces.bean.RequestScoped.class) FacesContext facesContext) {
+ <span class="comment">//...</span>
+ }</code></pre>
+</div>
+</div>
+</div>
</div>
<div class="sect2">
<h3 id="_integration_with_deltaspike_type_safe_messages">Integration with DeltaSpike Type-safe Messages</h3>
@@ -1196,10 +1288,10 @@ needed for using a different folder-name
if they do not inherit from
<code>org.apache.deltaspike.core.api.config.view.ViewConfig</code> <strong>nor</strong> have a
view-config for a page nested into them (like Pages.Wizard1.Step1). If
-it isis not used explicitly, it gets added automatically (so you can query
+it is not used explicitly, it gets added automatically (so you can query
the meta-data at runtime even in cases you haveis not placed the
annotations explicitly). <code>@View</code> allows to customize a bit more and it
-also gets added automatically if it isis not used explicitly. Whereas
+also gets added automatically if it is not used explicitly. Whereas
<code>@Folder</code> gets added to all nested interfaces (above a view-config class
- like Pages and Pages.Wizard1), <code>@View</code> only gets added to classes
which in-/directly inherit from
@@ -1412,7 +1504,7 @@ inherited along the inheritance path.</p
<p>Since the view-config is static, an approach to add parameters is
needed. The following part shows different possibilities to add
parameters which end up in the final URL after '?' (in case of the
-integration with JSF). It isis not needed to add all (types of) parameters
+integration with JSF). It is not needed to add all (types of) parameters
that way. Some get added automatically based on special meta-data (e.g.
<code>@View#navigation</code> and <code>@View#viewParams</code>). Instead of adding
<code>"faces-redirect=true"</code> manually it is done for you as soon as you are
@@ -2650,7 +2742,7 @@ public class ApplicationExceptionHandler
FacesContext.getCurrentInstance().getApplication().getNavigationHandler().handleNavigation(...); <span class="comment">// or ExternalContext etc.</span>
<span class="comment">// required - "stops" the JSF lifecycle</span>
- FacesContext.getCurrentInstance().setResponseComplete();
+ FacesContext.getCurrentInstance().responseComplete();
<span class="comment">// no other JSF ExceptionHandler should handle this exception...</span>
event.handled();
@@ -2693,7 +2785,7 @@ normal exceptions. This is possible via
FacesContext.getCurrentInstance().getApplication().getNavigationHandler().handleNavigation(...); <span class="comment">// or ExternalContext etc.</span>
<span class="comment">// required - "stops" the JSF lifecycle</span>
- FacesContext.getCurrentInstance().setResponseComplete();
+ FacesContext.getCurrentInstance().responseComplete();
<span class="comment">// no other JSF ExceptionHandler should handle this exception...</span>
event.handled();
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 Wed Apr 15 15:06:45 2015
@@ -254,7 +254,7 @@ body {
<i class="fa icon-important" title="Important"></i>
</td>
<td class="content">
-Currently CDI Interceptors cannot be used for partial-beans.
+Currently CDI Interceptors applied via @Interceptors and @Decorator are not supported by partial beans!
</td>
</tr>
</table>
@@ -272,20 +272,25 @@ interface (/abstract class) to generic h
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@PartialBeanBinding</span>
-
<span class="annotation">@Retention</span>(RUNTIME)
<span class="annotation">@Target</span>(TYPE)
-<span class="directive">public</span> <span class="annotation">@interface</span> MyPartialBeanBinding {}
-
+<span class="directive">public</span> <span class="annotation">@interface</span> MyPartialBeanBinding {}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//scope is optional</span>
<span class="annotation">@MyPartialBeanBinding</span>
-<span class="comment">//scope is optional</span>
<span class="directive">public</span> <span class="type">interface</span> <span class="class">PartialBean</span>
{
<span class="predefined-type">String</span> getValue();
-}
-
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//scope is optional</span>
<span class="annotation">@MyPartialBeanBinding</span>
-<span class="annotation">@Dependent</span>
<span class="directive">public</span> <span class="type">class</span> <span class="class">MyPartialBeanHandler</span> <span class="directive">implements</span> java.lang.reflect.InvocationHandler
{
<span class="directive">public</span> <span class="predefined-type">Object</span> invoke(<span class="predefined-type">Object</span> proxy, <span class="predefined-type">Method</span> method, <span class="predefined-type">Object</span><span class="type">[]</span> args) <span class="directive">throws</span> <span class="predefined-type">Throwable</span>
@@ -295,10 +300,6 @@ interface (/abstract class) to generic h
}</code></pre>
</div>
</div>
-<div class="paragraph">
-<p>Using an abstract class as partial-bean requires javassist as an
-additional dependency and allows to implement some methods manually.</p>
-</div>
</div>
</div>
</div>
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 Wed Apr 15 15:06:45 2015
@@ -197,6 +197,7 @@ body {
<ul class="sectlevel2">
<li><a href="#_1_declare_scheduler_module_dependencies">1. Declare Scheduler Module Dependencies</a></li>
<li><a href="#_2_declare_external_dependencies">2. Declare External Dependencies</a></li>
+<li><a href="#_3_declare_container_control_dependency">3. Declare Container Control dependency</a></li>
</ul>
</li>
<li><a href="#_use_the_module_features">Use the Module Features</a>
@@ -260,6 +261,29 @@ body {
</div>
</div>
</div>
+<div class="sect2">
+<h3 id="_3_declare_container_control_dependency">3. Declare Container Control dependency</h3>
+<div class="paragraph">
+<p>Scheduled jobs can have built-in CDI contexts started for the duration of their execution using <code>@Scheduled#startScopes</code> which internally uses the <a href="container-control.html">Container Control module</a>. The dependency on the API and the appropriate implementation needs to be declared manually even if the feature is not used. An example for the Weld implementation:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><dependency></span>
+ <span class="tag"><groupId></span>org.apache.deltaspike.cdictrl<span class="tag"></groupId></span>
+ <span class="tag"><artifactId></span>deltaspike-cdictrl-api<span class="tag"></artifactId></span>
+ <span class="tag"><version></span>${deltaspike.version}<span class="tag"></version></span>
+ <span class="tag"><scope></span>compile<span class="tag"></scope></span>
+<span class="tag"></dependency></span>
+
+<span class="tag"><dependency></span>
+ <span class="tag"><groupId></span>org.apache.deltaspike.cdictrl<span class="tag"></groupId></span>
+ <span class="tag"><artifactId></span>deltaspike-cdictrl-weld<span class="tag"></artifactId></span>
+ <span class="tag"><version></span>${deltaspike.version}<span class="tag"></version></span>
+ <span class="tag"><scope></span>runtime<span class="tag"></scope></span>
+<span class="tag"></dependency></span></code></pre>
+</div>
+</div>
+</div>
</div>
</div>
<div class="sect1">
@@ -317,7 +341,7 @@ schedule/install jobs dynamically.</p>
<span class="keyword">if</span> (ProjectStage.Production.equals(<span class="local-variable">this</span>.projectStage))
{
<span class="comment">//see 'false' for @Scheduled#onStartup</span>
- <span class="local-variable">this</span>.jobScheduler.scheduleJob(ManualCdiAwareQuartzJob.class);
+ <span class="local-variable">this</span>.jobScheduler.registerNewJob(ManualCdiAwareQuartzJob.class);
}
}
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 Wed Apr 15 15:06:45 2015
@@ -330,9 +330,9 @@ list of our @Secures method.</p>
{
<span class="annotation">@Secures</span>
<span class="annotation">@CustomSecurityBinding</span>
- <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(InvocationContext invocationContext, BeanManager manager, <span class="annotation">@LoggedIn</span> User user) <span class="directive">throws</span> <span class="exception">Exception</span>
+ <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(InvocationContext invocationContext, BeanManager manager, <span class="predefined-type">Identity</span> identity) <span class="directive">throws</span> <span class="exception">Exception</span>
{
- <span class="keyword">return</span> user.isLoggedIn(); <span class="comment">// perform security check</span>
+ <span class="keyword">return</span> identity.isLoggedIn(); <span class="comment">// perform security check</span>
}
}</code></pre>
</div>
@@ -385,9 +385,9 @@ security in our applications:</p>
{
<span class="annotation">@Secures</span>
<span class="annotation">@CustomSecurityBinding</span>
- <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(InvocationContext invocationContext, BeanManager manager, <span class="annotation">@LoggedIn</span> User user, <span class="annotation">@CurrentThing</span> Thing thing) <span class="directive">throws</span> <span class="exception">Exception</span>
+ <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(InvocationContext invocationContext, BeanManager manager, <span class="predefined-type">Identity</span> identity, <span class="annotation">@CurrentThing</span> Thing thing) <span class="directive">throws</span> <span class="exception">Exception</span>
{
- <span class="keyword">return</span> thing.hasMember(user); <span class="comment">// perform security check against our method parameter</span>
+ <span class="keyword">return</span> thing.hasMember(identity); <span class="comment">// perform security check against our method parameter</span>
}
}</code></pre>
</div>
@@ -444,9 +444,9 @@ to use a secured return value:</p>
{
<span class="annotation">@Secures</span>
<span class="annotation">@CustomSecurityBinding</span>
- <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(<span class="annotation">@SecuredReturn</span> Thing thing, <span class="annotation">@LoggedIn</span> User user) <span class="directive">throws</span> <span class="exception">Exception</span>
+ <span class="directive">public</span> <span class="type">boolean</span> doSecuredCheck(<span class="annotation">@SecuredReturn</span> Thing thing, <span class="predefined-type">Identity</span> identity) <span class="directive">throws</span> <span class="exception">Exception</span>
{
- <span class="keyword">return</span> thing.hasMember(user); <span class="comment">// perform security check against the return value</span>
+ <span class="keyword">return</span> thing.hasMember(identity); <span class="comment">// perform security check against the return value</span>
}</code></pre>
</div>
</div>
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 Wed Apr 15 15:06:45 2015
@@ -268,7 +268,7 @@ Snapshots provide previews of DeltaSpike
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
- <span class="tag"><deltaspike.version></span>1.2.2-SNAPSHOT<span class="tag"></deltaspike.version></span>
+ <span class="tag"><deltaspike.version></span>1.3.1-SNAPSHOT<span class="tag"></deltaspike.version></span>
<span class="tag"></properties></span></code></pre>
</div>
</div>
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 Wed Apr 15 15:06:45 2015
@@ -196,7 +196,7 @@ body {
<li><a href="#_configure_your_projects">Configure Your Projects</a>
<ul class="sectlevel2">
<li><a href="#_1_declare_test_control_module_dependencies">1. Declare Test-Control Module Dependencies</a></li>
-<li><a href="#_2_declare_cdi_implemetation_specific_test_control_module_dependencies">2. Declare CDI Implemetation-specific Test-Control Module Dependencies</a>
+<li><a href="#_2_declare_cdi_implementation_specific_dependencies">2. Declare CDI-implementation-specific dependencies</a>
<ul class="sectlevel3">
<li><a href="#_openwebbeans">OpenWebBeans</a></li>
<li><a href="#_weld">Weld</a></li>
@@ -287,14 +287,14 @@ body {
</div>
</div>
<div class="sect2">
-<h3 id="_2_declare_cdi_implemetation_specific_test_control_module_dependencies">2. Declare CDI Implemetation-specific Test-Control Module Dependencies</h3>
+<h3 id="_2_declare_cdi_implementation_specific_dependencies">2. Declare CDI-implementation-specific dependencies</h3>
<div class="paragraph">
-<p>The Test-Control module uses the Container-Control module, requiring a implementation-specific Container Control module to be declared in the project <code>pom.xml</code> file. Choose the appropriate option from those listed here.</p>
+<p>The Test-Control module depends on the Container-Control module, which provides adapters for several major CDI implementations. Therefore, to use Test-Control, declare dependency on a CDI implementation and a corresponding Container Control implementation in the <code>pom.xml</code>.</p>
</div>
<div class="sect3">
<h4 id="_openwebbeans">OpenWebBeans</h4>
<div class="paragraph">
-<p>If you are using OpenWebBeans, add the OpenWebBeans-specific Container Control module to the list of dependencies:</p>
+<p>If you are using OpenWebBeans, add an OpenWebBeans implementation and the OpenWebBeans-specific Container Control module to the list of dependencies:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -303,14 +303,21 @@ body {
<span class="tag"><artifactId></span>deltaspike-cdictrl-owb<span class="tag"></artifactId></span>
<span class="tag"><version></span>${deltaspike.version}<span class="tag"></version></span>
<span class="tag"><scope></span>test<span class="tag"></scope></span>
- <span class="tag"></dependency></span></code></pre>
+ <span class="tag"></dependency></span>
+
+<span class="tag"><dependency></span>
+ <span class="tag"><groupId></span>org.apache.openwebbeans<span class="tag"></groupId></span>
+ <span class="tag"><artifactId></span>openwebbeans-impl<span class="tag"></artifactId></span>
+ <span class="tag"><version></span>${owb.version}<span class="tag"></version></span>
+ <span class="tag"><scope></span>test<span class="tag"></scope></span>
+<span class="tag"></dependency></span></code></pre>
</div>
</div>
</div>
<div class="sect3">
<h4 id="_weld">Weld</h4>
<div class="paragraph">
-<p>If you are using Weld, add the Weld-specific Container Control module to the list of dependencies:</p>
+<p>If you are using Weld, add a Weld implementation and the Weld-specific Container Control module to the list of dependencies:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -319,6 +326,13 @@ body {
<span class="tag"><artifactId></span>deltaspike-cdictrl-weld<span class="tag"></artifactId></span>
<span class="tag"><version></span>${deltaspike.version}<span class="tag"></version></span>
<span class="tag"><scope></span>test<span class="tag"></scope></span>
+<span class="tag"></dependency></span>
+
+<span class="tag"><dependency></span>
+ <span class="tag"><groupId></span>org.jboss.weld.se<span class="tag"></groupId></span>
+ <span class="tag"><artifactId></span>weld-se-core<span class="tag"></artifactId></span>
+ <span class="tag"><version></span>${weld.version}<span class="tag"></version></span>
+ <span class="tag"><scope></span>test<span class="tag"></scope></span>
<span class="tag"></dependency></span></code></pre>
</div>
</div>
@@ -470,7 +484,7 @@ To pass properties to the underlying tes
you have to add <code>/META-INF/apache-deltaspike_test-container.properties</code>
to the resources-directory of your test-classpath.
The content of the file are key/value pairs which get passed to the container.
-Therefore, it is a configuration which isis not used by DeltaSpike itself
+Therefore, it is a configuration which is not used by DeltaSpike itself
(it is just forwarded (as it is) to the underlying test-container).</p>
</div>
<div class="sect3">
@@ -507,7 +521,7 @@ easier. Therefore it is possible to crea
via a mocking framework and add them, for example, via <code>DynamicMockManager</code>.</p>
</div>
<div class="paragraph">
-<p><strong>Attention:</strong> Mocking CDI beans isis not supported for every feature of CDI and/or
+<p><strong>Attention:</strong> Mocking CDI beans is not supported for every feature of CDI and/or
every implementation version. For example, we cais not mock intercepted CDI beans and
with some implementations mocking specialized beans fails.
Usually all features are active by default, however,
@@ -736,14 +750,15 @@ constructor) and specify the target-type
<div class="sect2">
<h3 id="_using_jersey_test_with_test_control">Using jersey-test with test-control</h3>
<div class="paragraph">
-<p>jersey-test starts jetty which answers requests in a separated thread. since ds test-control just handles the thread of the test itself, it’s needed to integrate jetty and jersey with the cdi-container. usually that’s done via a ServletRequestListener - the following part describes an alternative approach for jersey-test:</p>
+<p>Jersey-test starts jetty which answers requests in a separated thread. Since ds test-control just handles the thread of the test itself, it’s needed to integrate jetty and jersey with the cdi-container. Usually that’s done via a ServletRequestListener - the following part describes an alternative approach for jersey-test:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//use: -Djersey.config.test.container.factory=custom.CdiAwareJettyTestContainerFactory</span>
<span class="annotation">@RunWith</span>(CdiTestRunner.class)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">SimpleCdiAndJaxRsTest</span> <span class="directive">extends</span> JerseyTest {
+<span class="directive">public</span> <span class="type">class</span> <span class="class">SimpleCdiAndJaxRsTest</span> <span class="directive">extends</span> JerseyTest
+{
<span class="comment">//...</span>
}</code></pre>
</div>
@@ -753,23 +768,28 @@ constructor) and specify the target-type
</div>
<div class="listingblock">
<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareJerseyTest</span> <span class="directive">extends</span> JerseyTest {
- <span class="directive">static</span> {
- <span class="predefined-type">System</span>.setProperty(<span class="string"><span class="delimiter">"</span><span class="content">jersey.config.test.container.factory</span><span class="delimiter">"</span></span>,CdiAwareJettyTestContainerFactory.class.getName());
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareJerseyTest</span> <span class="directive">extends</span> JerseyTest
+{
+ <span class="directive">static</span>
+ {
+ <span class="predefined-type">System</span>.setProperty(<span class="string"><span class="delimiter">"</span><span class="content">jersey.config.test.container.factory</span><span class="delimiter">"</span></span>, CdiAwareJettyTestContainerFactory.class.getName());
}
}
<span class="annotation">@RunWith</span>(CdiTestRunner.class)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">SimpleCdiAndJaxRsTest</span> <span class="directive">extends</span> CdiAwareJerseyTest {
+<span class="directive">public</span> <span class="type">class</span> <span class="class">SimpleCdiAndJaxRsTest</span> <span class="directive">extends</span> CdiAwareJerseyTest
+{
<span class="comment">//...</span>
}</code></pre>
</div>
</div>
<div class="listingblock">
<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareJettyTestContainerFactory</span> <span class="directive">implements</span> TestContainerFactory {
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareJettyTestContainerFactory</span> <span class="directive">implements</span> TestContainerFactory
+{
<span class="annotation">@Override</span>
- <span class="directive">public</span> TestContainer create(<span class="directive">final</span> <span class="predefined-type">URI</span> baseUri, <span class="directive">final</span> DeploymentContext context) <span class="directive">throws</span> <span class="exception">IllegalArgumentException</span> {
+ <span class="directive">public</span> TestContainer create(<span class="directive">final</span> <span class="predefined-type">URI</span> baseUri, <span class="directive">final</span> DeploymentContext context) <span class="directive">throws</span> <span class="exception">IllegalArgumentException</span>
+ {
<span class="keyword">return</span> <span class="keyword">new</span> CdiAwareJettyTestContainer(baseUri, context);
}
}</code></pre>
@@ -791,15 +811,20 @@ cdiHandlerWrapper.setHandler(<span class
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">//activate the request-context e.g. via:</span>
-<span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareHandlerWrapper</span> <span class="directive">extends</span> HandlerWrapper {
+<span class="directive">public</span> <span class="type">class</span> <span class="class">CdiAwareHandlerWrapper</span> <span class="directive">extends</span> HandlerWrapper
+{
<span class="annotation">@Override</span>
- <span class="directive">public</span> <span class="type">void</span> handle(<span class="predefined-type">String</span> target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) <span class="directive">throws</span> <span class="exception">IOException</span>, ServletException {
+ <span class="directive">public</span> <span class="type">void</span> handle(<span class="predefined-type">String</span> target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) <span class="directive">throws</span> <span class="exception">IOException</span>, ServletException
+ {
CdiContainer cdiContainer = CdiContainerLoader.getCdiContainer();
- <span class="keyword">try</span> {
+ <span class="keyword">try</span>
+ {
cdiContainer.getContextControl().startContext(RequestScoped.class);
<span class="local-variable">super</span>.handle(target, baseRequest, request, response);
- } <span class="keyword">finally</span> {
+ }
+ <span class="keyword">finally</span>
+ {
cdiContainer.getContextControl().stopContext(RequestScoped.class);
}
}
@@ -832,7 +857,7 @@ with:</p>
<h4 id="_liquibase">Liquibase</h4>
<div class="paragraph">
<p>Liquibase invokes <code>#toString</code> in a <code>AfterDeploymentValidation</code> observer.
-<strong>that isis not portable</strong> and therefore you have to deactivate the
+<strong>that is not portable</strong> and therefore you have to deactivate the
mocking-support via:</p>
</div>
<div class="listingblock">