Modified:
websites/staging/deltaspike/trunk/content/staging/documentation/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/spi.html
(original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/spi.html
Tue May 5 18:23:13 2015
@@ -220,13 +220,17 @@ body {
<h2 id="_deactivatable">Deactivatable</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>This mechanism is only used for artifacts <strong>like</strong>
implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which
<strong>cais not</strong> be deactivated with standard CDI mechanisms.</p>
+<p>This mechanism is only used for artifacts <strong>like</strong>
implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which
+<strong>can not</strong> be deactivated with standard CDI mechanisms.</p>
</div>
<div class="paragraph">
<p>This interface is just a marker interface which is implemented by all
pre-configured DeltaSpike artifacts which can be deactivated manually (e.g. to
improve the performance if a part isis not needed, to provide a custom
implementation if the default implementation isis not pluggable by default or
to bypass an implementation which causes an issue (in this case please also
<strong>contact us</strong> and we will fix it)).</p>
</div>
<div class="paragraph">
-<p>To deactivate a class it is required to implement
<code>ClassDeactivator</code>. Returning 'false' or 'true' allows to
de-/activate the class in question. Retuning null means that the current
class-deactivator doesis not have information about the class in question and
cais not provide a result. Since <code>ClassDeactivator</code> implementations
are configured with the low-level configuration of DeltaSpike, the
class-deactivator with the highest ordinal has the final decision. DeltaSpike
itself doesis not deactivate an implementation, however, an add-on or a
third-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>To deactivate a class it is required to implement
<code>ClassDeactivator</code>. Returning 'false' or 'true' allows to
+de-/activate the class in question. Retuning null means that the current
class-deactivator does not have
+information about the class in question and can not provide a result. Since
<code>ClassDeactivator</code> implementations are
+configured with the low-level configuration of DeltaSpike, the
class-deactivator with the highest ordinal has the final decision. DeltaSpike
itself does not deactivate an implementation, however, an add-on or a
third-party portable CDI extension based on DeltaSpike (Core+) can use the
concept to deactivate a default implementation of DeltaSpike in favour of its
own implementation.</p>
</div>
<div class="admonitionblock important">
<table>
@@ -295,7 +299,8 @@ as soon as everything is initialized the
<h2 id="_global_alternative">Global Alternative</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>There are several application servers (using CDI 1.0) which cais not handle
alternative CDI beans correctly (e.g. due to a too strict interpretation or a
broken implementation). Therefore, DeltaSpike allows to use the standard
<code>@Alternative</code> annotation and an additional configuration entry for
DeltaSpike which allows to use the alternative implementation as a global
alternative.</p>
+<p>There are several application servers (using CDI 1.0) which can not handle
alternative CDI beans correctly (e.g. due to
+a too strict interpretation or a broken implementation). Therefore, DeltaSpike
allows to use the standard <code>@Alternative</code> annotation and an
additional configuration entry for DeltaSpike which allows to use the
alternative implementation as a global alternative.</p>
</div>
<div class="listingblock">
<div class="title">Standard CDI alternative implementation (without the
required XML config)</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
Tue May 5 18:23:13 2015
@@ -524,7 +524,7 @@ via a mocking framework and add them, fo
</div>
<div class="paragraph">
<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
+every implementation version. For example, we can not mock intercepted CDI
beans and
with some implementations mocking specialized beans fails.
Usually all features are active by default, however,
due to those reasons we deactivated this feature by default.
