This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/tomee-site-pub.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0ab2f6e [site-publish] source tomee-site-generator
https://github.com/apache/tomee-site-generator
https://ci-builds.apache.org/job/Tomee/job/site-publish
0ab2f6e is described below
commit 0ab2f6e76247d72f1bddb96e3821b4d1c647ddf4
Author: jenkins <[email protected]>
AuthorDate: Fri Oct 22 00:41:10 2021 +0000
[site-publish] source tomee-site-generator
https://github.com/apache/tomee-site-generator
https://ci-builds.apache.org/job/Tomee/job/site-publish
---
.../concurrent/ContextServiceDefinition.html | 22 +++++++-
.../concurrent/ManagedExecutorDefinition.html | 65 +++++++++++++++-------
.../ManagedScheduledExecutorDefinition.html | 65 +++++++++++++++-------
.../concurrent/ManagedThreadFactoryDefinition.html | 40 +++++++++----
.../concurrent/spi/ThreadContextProvider.html | 13 ++---
5 files changed, 148 insertions(+), 57 deletions(-)
diff --git
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ContextServiceDefinition.html
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ContextServiceDefinition.html
index 466e56c..13e2966 100644
---
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ContextServiceDefinition.html
+++
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ContextServiceDefinition.html
@@ -140,7 +140,27 @@ public @interface <span
class="memberNameLabel">ContextServiceDefinition</span><
<p>Overlap of the same context type across multiple lists is an error and
prevents the <code>ContextService</code> instance from being created.
If <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html#ALL_REMAINING"><code>ALL_REMAINING</code></a>
is not present in any of the lists, it is
- implicitly appended to the <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html#cleared--"><code>cleared()</code></a>
context types.</p></div>
+ implicitly appended to the <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html#cleared--"><code>cleared()</code></a>
context types.</p>
+
+ You can also define a <code>ContextService</code> with the
+ <code><context-service></code> deployment descriptor element.
+ For example,
+
+ <pre>
+ <context-service>
+ <name>java:app/concurrent/MyContext</name>
+ <cleared>Security</cleared>
+ <cleared>Transaction</cleared>
+ <propagated>Application</propagated>
+ <unchanged>Remaining</unchanged>
+ </context-service>
+ </pre>
+
+ If a <code>context-service</code> and <code>ContextServiceDefinition</code>
+ have the same name, their attributes are merged to define a single
+ <code>ContextService</code> definition, with each attribute that is specified
+ in the <code>context-service</code> deployment descriptor entry taking
+ precedence over the corresponding attribute of the annotation.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
diff --git
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedExecutorDefinition.html
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedExecutorDefinition.html
index 88ebe0e..74b74c8 100644
---
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedExecutorDefinition.html
+++
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedExecutorDefinition.html
@@ -105,14 +105,16 @@ public @interface <span
class="memberNameLabel">ManagedExecutorDefinition</span>
<a
href="../../../jakarta/annotation/Resource.html#lookup--"><code>lookup</code></a>
attribute of a
<a href="../../../jakarta/annotation/Resource.html" title="annotation in
jakarta.annotation"><code>Resource</code></a> annotation,</p>
- <pre> @ManagedExecutorDefinition(
+ <pre>
+ @ManagedExecutorDefinition(
name = "java:module/concurrent/MyExecutor",
+ context = "java:module/concurrent/MyExecutorContext",
hungTaskThreshold = 120000,
- maxAsync = 5,
- context = @ContextServiceDefinition(
- name = "java:module/concurrent/MyExecutorContext",
- propagated = { SECURITY, APPLICATION }))
- public class MyServlet extends HttpServlet {
+ maxAsync = 5)
+ @ContextServiceDefinition(
+ name = "java:module/concurrent/MyExecutorContext",
+ propagated = { SECURITY, APPLICATION })
+ public class MyServlet extends HttpServlet {
@Resource(lookup = "java:module/concurrent/MyExecutor",
name = "java:module/concurrent/env/MyExecutorRef")
ManagedExecutorService myExecutor;
@@ -127,7 +129,26 @@ public @interface <span
class="memberNameLabel">ManagedExecutorDefinition</span>
<resource-env-ref-type>jakarta.enterprise.concurrent.ManagedExecutorService</resource-env-ref-type>
<lookup-name>java:module/concurrent/MyExecutor</lookup-name>
</resource-env-ref>
- </pre></div>
+ </pre>
+
+ You can also define a <code>ManagedExecutorService</code> with the
+ <code><managed-executor></code> deployment descriptor element.
+ For example,
+
+ <pre>
+ <managed-executor>
+ <name>java:module/concurrent/MyExecutor</name>
+
<context-service-ref>java:module/concurrent/MyExecutorContext</context-service-ref>
+ <hung-task-threshold>120000</hung-task-threshold>
+ <max-async>5</max-async>
+ </managed-executor>
+ </pre>
+
+ If a <code>managed-executor</code> and <code>ManagedExecutorDefinition</code>
+ have the same name, their attributes are merged to define a single
+ <code>ManagedExecutorService</code> definition, with each attribute that is
specified
+ in the <code>managed-executor</code> deployment descriptor entry taking
+ precedence over the corresponding attribute of the annotation.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
@@ -172,9 +193,10 @@ public @interface <span
class="memberNameLabel">ManagedExecutorDefinition</span>
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code><a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../jakarta/enterprise/concurrent/ManagedExecutorDefinition.html#context--">context</a></span></code>
-<div class="block">Determines how context is applied to tasks and actions that
+<div class="block">The name of a <a
href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> instance which
+ determines how context is applied to tasks and actions that
run on this executor.</div>
</td>
</tr>
@@ -239,21 +261,26 @@ public @interface <span
class="memberNameLabel">ManagedExecutorDefinition</span>
<ul class="blockList">
<li class="blockList">
<h4>context</h4>
-<pre>public abstract <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a> context</pre>
-<div class="block"><p>Determines how context is applied to tasks and actions
that
- run on this executor.</p>
-
- <p>The default value indicates to use the default instance of
- <a href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> by specifying a
- <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent"><code>ContextServiceDefinition</code></a> with
the name
- <code>java:comp/DefaultContextService</code>.</p></div>
+<pre>public abstract java.lang.String context</pre>
+<div class="block">The name of a <a
href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> instance which
+ determines how context is applied to tasks and actions that
+ run on this executor.
+ <p>
+ The name can be the name of a <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent"><code>ContextServiceDefinition</code></a> or
+ the name of a <code>context-service</code> deployment descriptor element
+ or the JNDI name of the Jakarta EE default <code>ContextService</code>
+ instance, <code>java:comp/DefaultContextService</code>.
+ <p>
+ The default value, <code>java:comp/DefaultContextService</code>, is the
+ JNDI name of the Jakarta EE default <code>ContextService</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>instructions for capturing and propagating or clearing context.</dd>
+<dd>name of the <code>ContextService</code> for
+ capturing and propagating or clearing context.</dd>
</dl>
<dl>
<dt>Default:</dt>
-<dd>@jakarta.enterprise.concurrent.ContextServiceDefinition(name="java:comp/DefaultContextService")</dd>
+<dd>"java:comp/DefaultContextService"</dd>
</dl>
</li>
</ul>
diff --git
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedScheduledExecutorDefinition.html
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedScheduledExecutorDefinition.html
index 551fdd5..703c2fe 100644
---
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedScheduledExecutorDefinition.html
+++
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedScheduledExecutorDefinition.html
@@ -105,14 +105,16 @@ public @interface <span
class="memberNameLabel">ManagedScheduledExecutorDefiniti
<a
href="../../../jakarta/annotation/Resource.html#lookup--"><code>lookup</code></a>
attribute of a
<a href="../../../jakarta/annotation/Resource.html" title="annotation in
jakarta.annotation"><code>Resource</code></a> annotation,</p>
- <pre> @ManagedScheduledExecutorDefinition(
+ <pre>
+ @ManagedScheduledExecutorDefinition(
name = "java:comp/concurrent/MyScheduledExecutor",
+ context = "java:comp/concurrent/MyScheduledExecutorContext",
hungTaskThreshold = 30000,
- maxAsync = 3,
- context = @ContextServiceDefinition(
- name = "java:comp/concurrent/MyScheduledExecutorContext",
- propagated = APPLICATION))
- public class MyServlet extends HttpServlet {
+ maxAsync = 3)
+ @ContextServiceDefinition(
+ name = "java:comp/concurrent/MyScheduledExecutorContext",
+ propagated = APPLICATION)
+ public class MyServlet extends HttpServlet {
@Resource(lookup = "java:comp/concurrent/MyScheduledExecutor",
name = "java:comp/concurrent/env/MyScheduledExecutorRef")
ManagedScheduledExecutorService myScheduledExecutor;
@@ -127,7 +129,26 @@ public @interface <span
class="memberNameLabel">ManagedScheduledExecutorDefiniti
<resource-env-ref-type>jakarta.enterprise.concurrent.ManagedScheduledExecutorService</resource-env-ref-type>
<lookup-name>java:comp/concurrent/MyScheduledExecutor</lookup-name>
</resource-env-ref>
- </pre></div>
+ </pre>
+
+ You can also define a <code>ManagedScheduledExecutorService</code> with the
+ <code><managed-scheduled-executor></code> deployment descriptor element.
+ For example,
+
+ <pre>
+ <managed-scheduled-executor>
+ <name>java:module/concurrent/MyExecutor</name>
+
<context-service-ref>java:module/concurrent/MyExecutorContext</context-service-ref>
+ <hung-task-threshold>120000</hung-task-threshold>
+ <max-async>5</max-async>
+ </managed-scheduled-executor>
+ </pre>
+
+ If a <code>managed-scheduled-executor</code> and
<code>ManagedScheduledExecutorDefinition</code>
+ have the same name, their attributes are merged to define a single
+ <code>ManagedScheduledExecutorService</code> definition, with each attribute
that is specified
+ in the <code>managed-scheduled-executor</code> deployment descriptor entry
taking
+ precedence over the corresponding attribute of the annotation.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
@@ -172,9 +193,10 @@ public @interface <span
class="memberNameLabel">ManagedScheduledExecutorDefiniti
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code><a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../jakarta/enterprise/concurrent/ManagedScheduledExecutorDefinition.html#context--">context</a></span></code>
-<div class="block">Determines how context is applied to tasks and actions that
+<div class="block">The name of a <a
href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> instance which
+ determines how context is applied to tasks and actions that
run on this executor.</div>
</td>
</tr>
@@ -239,21 +261,26 @@ public @interface <span
class="memberNameLabel">ManagedScheduledExecutorDefiniti
<ul class="blockList">
<li class="blockList">
<h4>context</h4>
-<pre>public abstract <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a> context</pre>
-<div class="block"><p>Determines how context is applied to tasks and actions
that
- run on this executor.</p>
-
- <p>The default value indicates to use the default instance of
- <a href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> by specifying a
- <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent"><code>ContextServiceDefinition</code></a> with
the name
- <code>java:comp/DefaultContextService</code>.</p></div>
+<pre>public abstract java.lang.String context</pre>
+<div class="block">The name of a <a
href="../../../jakarta/enterprise/concurrent/ContextService.html"
title="interface in
jakarta.enterprise.concurrent"><code>ContextService</code></a> instance which
+ determines how context is applied to tasks and actions that
+ run on this executor.
+ <p>
+ The name can be the name of a <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent"><code>ContextServiceDefinition</code></a> or
+ the name of a <code>context-service</code> deployment descriptor element
+ or the JNDI name of the Jakarta EE default <code>ContextService</code>
+ instance, <code>java:comp/DefaultContextService</code>.
+ <p>
+ The default value, <code>java:comp/DefaultContextService</code>, is the
+ JNDI name of the Jakarta EE default <code>ContextService</code>.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>instructions for capturing and propagating or clearing context.</dd>
+<dd>name of the <code>ContextService</code> for
+ capturing and propagating or clearing context.</dd>
</dl>
<dl>
<dt>Default:</dt>
-<dd>@jakarta.enterprise.concurrent.ContextServiceDefinition(name="java:comp/DefaultContextService")</dd>
+<dd>"java:comp/DefaultContextService"</dd>
</dl>
</li>
</ul>
diff --git
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedThreadFactoryDefinition.html
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedThreadFactoryDefinition.html
index d32de42..44adb8a 100644
---
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedThreadFactoryDefinition.html
+++
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/ManagedThreadFactoryDefinition.html
@@ -105,13 +105,15 @@ public @interface <span
class="memberNameLabel">ManagedThreadFactoryDefinition</
<a
href="../../../jakarta/annotation/Resource.html#lookup--"><code>lookup</code></a>
attribute of a
<a href="../../../jakarta/annotation/Resource.html" title="annotation in
jakarta.annotation"><code>Resource</code></a> annotation,</p>
- <pre> @ManagedThreadFactoryDefinition(
+ <pre>
+ @ManagedThreadFactoryDefinition(
name = "java:global/concurrent/MyThreadFactory",
- priority = "4",
- context = @ContextServiceDefinition(
- name = "java:global/concurrent/MyThreadFactoryContext",
- propagated = APPLICATION))
- public class MyServlet extends HttpServlet {
+ context = "java:global/concurrent/MyThreadFactoryContext",
+ priority = 4)
+ @ContextServiceDefinition(
+ name = "java:global/concurrent/MyThreadFactoryContext",
+ propagated = APPLICATION)
+ public class MyServlet extends HttpServlet {
@Resource(lookup = "java:global/concurrent/MyThreadFactory",
name = "java:module/concurrent/env/MyThreadFactoryRef")
ManagedThreadFactory myThreadFactory;
@@ -126,7 +128,25 @@ public @interface <span
class="memberNameLabel">ManagedThreadFactoryDefinition</
<resource-env-ref-type>jakarta.enterprise.concurrent.ManagedThreadFactory</resource-env-ref-type>
<lookup-name>java:global/concurrent/MyThreadFactory</lookup-name>
</resource-env-ref>
- </pre></div>
+ </pre>
+
+ You can also define a <code>ManagedThreadFactory</code> with the
+ <code><managed-thread-factory></code> deployment descriptor element.
+ For example,
+
+ <pre>
+ <managed-thread-factory>
+ <name>java:global/concurrent/MyThreadFactory</name>
+
<context-service-ref>java:global/concurrent/MyThreadFactoryContext</context-service-ref>
+ <priority>4</priority>
+ </managed-thread-factory>
+ </pre>
+
+ If a <code>managed-thread-factory</code> and
<code>ManagedThreadFactoryDefinition</code>
+ have the same name, their attributes are merged to define a single
+ <code>ManagedThreadFactory</code> definition, with each attribute that is
specified
+ in the <code>managed-thread-factory</code> deployment descriptor entry taking
+ precedence over the corresponding attribute of the annotation.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
@@ -171,7 +191,7 @@ public @interface <span
class="memberNameLabel">ManagedThreadFactoryDefinition</
<th class="colLast" scope="col">Optional Element and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code><a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a
href="../../../jakarta/enterprise/concurrent/ManagedThreadFactoryDefinition.html#context--">context</a></span></code>
<div class="block">Determines how context is applied to threads from this
thread factory.</div>
@@ -230,7 +250,7 @@ public @interface <span
class="memberNameLabel">ManagedThreadFactoryDefinition</
<ul class="blockList">
<li class="blockList">
<h4>context</h4>
-<pre>public abstract <a
href="../../../jakarta/enterprise/concurrent/ContextServiceDefinition.html"
title="annotation in
jakarta.enterprise.concurrent">ContextServiceDefinition</a> context</pre>
+<pre>public abstract java.lang.String context</pre>
<div class="block"><p>Determines how context is applied to threads from this
thread factory.</p>
@@ -244,7 +264,7 @@ public @interface <span
class="memberNameLabel">ManagedThreadFactoryDefinition</
</dl>
<dl>
<dt>Default:</dt>
-<dd>@jakarta.enterprise.concurrent.ContextServiceDefinition(name="java:comp/DefaultContextService")</dd>
+<dd>"java:comp/DefaultContextService"</dd>
</dl>
</li>
</ul>
diff --git
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/spi/ThreadContextProvider.html
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/spi/ThreadContextProvider.html
index 386814a..3275098 100644
---
a/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/spi/ThreadContextProvider.html
+++
b/jakartaee-9.0/javadoc/jakarta/enterprise/concurrent/spi/ThreadContextProvider.html
@@ -269,14 +269,11 @@ var activeTableTab = "activeTableTab";
<p>
For example:
<pre>
- <code> @ManagedExecutorDefinition(</code>
- name = "java:module/concurrent/MyCustomContextExecutor",
- maxAsync = 3,
- context = <code> @ContextServiceDefinition(</code>
- name = "java:module/concurrent/MyCustomContext",
- propagated = MyCustomContextProvider.CONTEXT_NAME,
- cleared = { ContextServiceDefinition.SECURITY,
ContextServiceDefinition.TRANSACTION },
- unchanged = ContextServiceDefinition.ALL_REMAINING))
+ <code> @ContextServiceDefinition(</code>
+ name = "java:module/concurrent/MyCustomContext",
+ propagated = MyCustomContextProvider.CONTEXT_NAME,
+ cleared = { ContextServiceDefinition.SECURITY,
ContextServiceDefinition.TRANSACTION },
+ unchanged = ContextServiceDefinition.ALL_REMAINING)
</pre>
<p>
It is an error for multiple thread context providers of an identical type to
be
