You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-pub@tomee.apache.org by gi...@apache.org on 2022/08/07 00:45:23 UTC
[tomee-site-pub] branch asf-site updated: [site-publish] source tomee-site-generator https://github.com/apache/tomee-site-generator https://ci-builds.apache.org/job/Tomee/job/site-publish
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 3753076dad [site-publish] source tomee-site-generator https://github.com/apache/tomee-site-generator https://ci-builds.apache.org/job/Tomee/job/site-publish
3753076dad is described below
commit 3753076dadcd13bd3759ebabb18f5e261dd7ee12
Author: jenkins <bu...@apache.org>
AuthorDate: Sun Aug 7 00:45:19 2022 +0000
[site-publish] source tomee-site-generator
https://github.com/apache/tomee-site-generator
https://ci-builds.apache.org/job/Tomee/job/site-publish
---
microprofile-6.0/javadoc/allclasses-frame.html | 3 +-
microprofile-6.0/javadoc/allclasses-noframe.html | 3 +-
microprofile-6.0/javadoc/constant-values.html | 33 +++
microprofile-6.0/javadoc/index-all.html | 43 ++--
.../microprofile/metrics/MetricRegistry.html | 122 +++++++---
.../eclipse/microprofile/metrics/MetricType.html | 4 +-
.../microprofile/metrics/annotation/Counted.html | 31 ++-
.../microprofile/metrics/annotation/Gauge.html | 29 ++-
.../microprofile/metrics/annotation/Metric.html | 35 ++-
.../metrics/annotation/RegistryScope.html | 248 +++++++++++++++++++++
.../microprofile/metrics/annotation/Timed.html | 35 ++-
.../metrics/annotation/package-frame.html | 2 +-
.../metrics/annotation/package-summary.html | 17 +-
.../metrics/annotation/package-tree.html | 2 +-
.../microprofile/metrics/package-frame.html | 1 -
.../microprofile/metrics/package-summary.html | 6 -
.../eclipse/microprofile/metrics/package-tree.html | 1 -
.../metrics/tck/MetricRegistryTest.html | 8 +-
microprofile-6.0/javadoc/overview-tree.html | 3 +-
19 files changed, 531 insertions(+), 95 deletions(-)
diff --git a/microprofile-6.0/javadoc/allclasses-frame.html b/microprofile-6.0/javadoc/allclasses-frame.html
index 3dc7807156..b7364cb1d8 100644
--- a/microprofile-6.0/javadoc/allclasses-frame.html
+++ b/microprofile-6.0/javadoc/allclasses-frame.html
@@ -155,7 +155,6 @@
<li><a href="org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics" target="classFrame">MetricID</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/MetricIDTest.html" title="class in org.eclipse.microprofile.metrics.tck" target="classFrame">MetricIDTest</a></li>
<li><a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics" target="classFrame"><span class="interfaceName">MetricRegistry</span></a></li>
-<li><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics" target="classFrame">MetricRegistry.Type</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck" target="classFrame">MetricRegistryTest</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/util/MetricsUtil.html" title="class in org.eclipse.microprofile.metrics.tck.util" target="classFrame">MetricsUtil</a></li>
<li><a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics" target="classFrame">MetricType</a></li>
@@ -199,7 +198,7 @@
<li><a href="org/eclipse/microprofile/rest/client/annotation/RegisterProvider.html" title="annotation in org.eclipse.microprofile.rest.client.annotation" target="classFrame">RegisterProvider</a></li>
<li><a href="org/eclipse/microprofile/rest/client/annotation/RegisterProviders.html" title="annotation in org.eclipse.microprofile.rest.client.annotation" target="classFrame">RegisterProviders</a></li>
<li><a href="org/eclipse/microprofile/rest/client/inject/RegisterRestClient.html" title="annotation in org.eclipse.microprofile.rest.client.inject" target="classFrame">RegisterRestClient</a></li>
-<li><a href="org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">RegistryType</a></li>
+<li><a href="org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">RegistryScope</a></li>
<li><a href="org/eclipse/microprofile/openapi/annotations/parameters/RequestBody.html" title="annotation in org.eclipse.microprofile.openapi.annotations.parameters" target="classFrame">RequestBody</a></li>
<li><a href="org/eclipse/microprofile/openapi/models/parameters/RequestBody.html" title="interface in org.eclipse.microprofile.openapi.models.parameters" target="classFrame"><span class="interfaceName">RequestBody</span></a></li>
<li><a href="org/eclipse/microprofile/openapi/annotations/parameters/RequestBodySchema.html" title="annotation in org.eclipse.microprofile.openapi.annotations.parameters" target="classFrame">RequestBodySchema</a></li>
diff --git a/microprofile-6.0/javadoc/allclasses-noframe.html b/microprofile-6.0/javadoc/allclasses-noframe.html
index f2cf223a7f..a27d1491ba 100644
--- a/microprofile-6.0/javadoc/allclasses-noframe.html
+++ b/microprofile-6.0/javadoc/allclasses-noframe.html
@@ -155,7 +155,6 @@
<li><a href="org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics">MetricID</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/MetricIDTest.html" title="class in org.eclipse.microprofile.metrics.tck">MetricIDTest</a></li>
<li><a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics"><span class="interfaceName">MetricRegistry</span></a></li>
-<li><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck">MetricRegistryTest</a></li>
<li><a href="org/eclipse/microprofile/metrics/tck/util/MetricsUtil.html" title="class in org.eclipse.microprofile.metrics.tck.util">MetricsUtil</a></li>
<li><a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics">MetricType</a></li>
@@ -199,7 +198,7 @@
<li><a href="org/eclipse/microprofile/rest/client/annotation/RegisterProvider.html" title="annotation in org.eclipse.microprofile.rest.client.annotation">RegisterProvider</a></li>
<li><a href="org/eclipse/microprofile/rest/client/annotation/RegisterProviders.html" title="annotation in org.eclipse.microprofile.rest.client.annotation">RegisterProviders</a></li>
<li><a href="org/eclipse/microprofile/rest/client/inject/RegisterRestClient.html" title="annotation in org.eclipse.microprofile.rest.client.inject">RegisterRestClient</a></li>
-<li><a href="org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation">RegistryType</a></li>
+<li><a href="org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation">RegistryScope</a></li>
<li><a href="org/eclipse/microprofile/openapi/annotations/parameters/RequestBody.html" title="annotation in org.eclipse.microprofile.openapi.annotations.parameters">RequestBody</a></li>
<li><a href="org/eclipse/microprofile/openapi/models/parameters/RequestBody.html" title="interface in org.eclipse.microprofile.openapi.models.parameters"><span class="interfaceName">RequestBody</span></a></li>
<li><a href="org/eclipse/microprofile/openapi/annotations/parameters/RequestBodySchema.html" title="annotation in org.eclipse.microprofile.openapi.annotations.parameters">RequestBodySchema</a></li>
diff --git a/microprofile-6.0/javadoc/constant-values.html b/microprofile-6.0/javadoc/constant-values.html
index a8832264ff..a8522a1c17 100644
--- a/microprofile-6.0/javadoc/constant-values.html
+++ b/microprofile-6.0/javadoc/constant-values.html
@@ -248,6 +248,39 @@
<ul class="blockList">
<li class="blockList">
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.eclipse.microprofile.metrics.MetricRegistry.APPLICATION_SCOPE">
+<!-- -->
+</a><code>public static final java.lang.String</code></td>
+<td><code><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#APPLICATION_SCOPE">APPLICATION_SCOPE</a></code></td>
+<td class="colLast"><code>"application"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.eclipse.microprofile.metrics.MetricRegistry.BASE_SCOPE">
+<!-- -->
+</a><code>public static final java.lang.String</code></td>
+<td><code><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#BASE_SCOPE">BASE_SCOPE</a></code></td>
+<td class="colLast"><code>"base"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="org.eclipse.microprofile.metrics.MetricRegistry.VENDOR_SCOPE">
+<!-- -->
+</a><code>public static final java.lang.String</code></td>
+<td><code><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#VENDOR_SCOPE">VENDOR_SCOPE</a></code></td>
+<td class="colLast"><code>"vendor"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
<caption><span>org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricUnits.html" title="class in org.eclipse.microprofile.metrics">MetricUnits</a></span><span class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/microprofile-6.0/javadoc/index-all.html b/microprofile-6.0/javadoc/index-all.html
index 1611f79376..7c727a2cf8 100644
--- a/microprofile-6.0/javadoc/index-all.html
+++ b/microprofile-6.0/javadoc/index-all.html
@@ -358,6 +358,10 @@
<div class="block">The APIResponseSchema annotation corresponds to an individual schema in the OpenAPI Response model object which
describes a single response from an API Operation.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#APPLICATION_SCOPE">APPLICATION_SCOPE</a></span> - Static variable in interface org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></dt>
+<dd>
+<div class="block">String constant to represent the scope value used for the application scope</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/cdi/ApplicationScopedTimedMethodBean.html#applicationScopedTimedMethod--">applicationScopedTimedMethod()</a></span> - Method in class org.eclipse.microprofile.metrics.tck.cdi.<a href="org/eclipse/microprofile/metrics/tck/cdi/ApplicationScopedTimedMethodBean.html" title="class in org.eclipse.microprofile.metrics.tck.cdi">ApplicationScopedTimedMethodBean</a></dt>
<dd> </dd>
<dt><a href="org/eclipse/microprofile/metrics/tck/cdi/ApplicationScopedTimedMethodBean.html" title="class in org.eclipse.microprofile.metrics.tck.cdi"><span class="typeNameLink">ApplicationScopedTimedMethodBean</span></a> - Class in <a href="org/eclipse/microprofile/metrics/tck/cdi/package-summary.html">org.eclipse.microprofile.metrics.tck.cdi</a></dt>
@@ -411,6 +415,10 @@
</a>
<h2 class="title">B</h2>
<dl>
+<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#BASE_SCOPE">BASE_SCOPE</a></span> - Static variable in interface org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></dt>
+<dd>
+<div class="block">String constant to represent the scope value used for the base scope</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/rest/client/RestClientBuilder.html#baseUri-java.net.URI-">baseUri(URI)</a></span> - Method in interface org.eclipse.microprofile.rest.client.<a href="org/eclipse/microprofile/rest/client/RestClientBuilder.html" title="interface in org.eclipse.microprofile.rest.client">RestClientBuilder</a></dt>
<dd>
<div class="block">Specifies the base URI to be used when making requests.</div>
@@ -2309,10 +2317,6 @@
<dd>
<div class="block">Returns the Metric name associated with this MetricID</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html#getName--">getName()</a></span> - Method in enum org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></dt>
-<dd>
-<div class="block">Returns the name of the MetricRegistry scope.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/openapi/models/info/Contact.html#getName--">getName()</a></span> - Method in interface org.eclipse.microprofile.openapi.models.info.<a href="org/eclipse/microprofile/openapi/models/info/Contact.html" title="interface in org.eclipse.microprofile.openapi.models.info">Contact</a></dt>
<dd>
<div class="block">Returns the identifying name of this Contact instance.</div>
@@ -2572,6 +2576,10 @@
<dd>
<div class="block">Returns a copy map (potentially immutable) of the schemes.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#getScope--">getScope()</a></span> - Method in interface org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></dt>
+<dd>
+<div class="block">Returns the scope of this metric registry.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/openapi/models/security/OAuthFlow.html#getScopes--">getScopes()</a></span> - Method in interface org.eclipse.microprofile.openapi.models.security.<a href="org/eclipse/microprofile/openapi/models/security/OAuthFlow.html" title="interface in org.eclipse.microprofile.openapi.models.security">OAuthFlow</a></dt>
<dd>
<div class="block">The available scopes for the OAuth2 security scheme.</div>
@@ -2732,10 +2740,6 @@
<dd>
<div class="block">Returns the String representation of the <a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics"><code>MetricType</code></a>.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#getType--">getType()</a></span> - Method in interface org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></dt>
-<dd>
-<div class="block">Returns the type of this metric registry.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/openapi/models/media/Schema.html#getType--">getType()</a></span> - Method in interface org.eclipse.microprofile.openapi.models.media.<a href="org/eclipse/microprofile/openapi/models/media/Schema.html" title="interface in org.eclipse.microprofile.openapi.models.media">Schema</a></dt>
<dd>
<div class="block">Returns the type property from this Schema.</div>
@@ -3352,10 +3356,6 @@
<dd>
<div class="block">The registry that stores metrics and their metadata.</div>
</dd>
-<dt><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">MetricRegistry.Type</span></a> - Enum in <a href="org/eclipse/microprofile/metrics/package-summary.html">org.eclipse.microprofile.metrics</a></dt>
-<dd>
-<div class="block">An enumeration representing the scopes of the MetricRegistry</div>
-</dd>
<dt><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck"><span class="typeNameLink">MetricRegistryTest</span></a> - Class in <a href="org/eclipse/microprofile/metrics/tck/package-summary.html">org.eclipse.microprofile.metrics.tck</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html#MetricRegistryTest--">MetricRegistryTest()</a></span> - Constructor for class org.eclipse.microprofile.metrics.tck.<a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck">MetricRegistryTest</a></dt>
@@ -4047,9 +4047,9 @@
<dd>
<div class="block">A marker annotation to register a rest client at runtime.</div>
</dd>
-<dt><a href="org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryType</span></a> - Annotation Type in <a href="org/eclipse/microprofile/metrics/annotation/package-summary.html">org.eclipse.microprofile.metrics.annotation</a></dt>
+<dt><a href="org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryScope</span></a> - Annotation Type in <a href="org/eclipse/microprofile/metrics/annotation/package-summary.html">org.eclipse.microprofile.metrics.annotation</a></dt>
<dd>
-<div class="block">Qualifies the type of Metric Registry to inject.</div>
+<div class="block">Specifies the scope of Metric Registry to inject.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/config/spi/ConfigProviderResolver.html#releaseConfig-org.eclipse.microprofile.config.Config-">releaseConfig(Config)</a></span> - Method in class org.eclipse.microprofile.config.spi.<a href="org/eclipse/microprofile/config/spi/ConfigProviderResolver.html" title="class in org.eclipse.microprofile.config.spi">ConfigProviderResolver</a></dt>
<dd>
@@ -5449,7 +5449,7 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/metrics/HistogramTest.html#testMetricRegistry--">testMetricRegistry()</a></span> - Method in class org.eclipse.microprofile.metrics.tck.metrics.<a href="org/eclipse/microprofile/metrics/tck/metrics/HistogramTest.html" title="class in org.eclipse.microprofile.metrics.tck.metrics">HistogramTest</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html#testMetricRegistryType--">testMetricRegistryType()</a></span> - Method in class org.eclipse.microprofile.metrics.tck.<a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck">MetricRegistryTest</a></dt>
+<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html#testMetricRegistryScope--">testMetricRegistryScope()</a></span> - Method in class org.eclipse.microprofile.metrics.tck.<a href="org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html" title="class in org.eclipse.microprofile.metrics.tck">MetricRegistryTest</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/tck/cdi/stereotype/StereotypeCountedClassBeanTest.html#testPlainAnnotation--">testPlainAnnotation()</a></span> - Method in class org.eclipse.microprofile.metrics.tck.cdi.stereotype.<a href="org/eclipse/microprofile/metrics/tck/cdi/stereotype/StereotypeCountedClassBeanTest.html" title="class in org.eclipse.microprofile.metrics.tck.cdi.stereotype">StereotypeCountedClassBeanTest</a></dt>
<dd> </dd>
@@ -5889,10 +5889,6 @@
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></dt>
-<dd>
-<div class="block">Returns the enum constant of this type with the specified name.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics">MetricType</a></dt>
<dd>
<div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -5967,11 +5963,6 @@ the order they are declared.</div>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared.</div>
</dd>
-<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html#values--">values()</a></span> - Static method in enum org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></dt>
-<dd>
-<div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.</div>
-</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricType.html#values--">values()</a></span> - Static method in enum org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics">MetricType</a></dt>
<dd>
<div class="block">Returns an array containing the constants of this enum type, in
@@ -6057,6 +6048,10 @@ the order they are declared.</div>
<div class="block">This method sets the variables property of Server instance to the given variables argument and returns the
modified instance.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/metrics/MetricRegistry.html#VENDOR_SCOPE">VENDOR_SCOPE</a></span> - Static variable in interface org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics">MetricRegistry</a></dt>
+<dd>
+<div class="block">String constant to represent the scope value used for the vendor scope</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/eclipse/microprofile/jwt/config/Names.html#VERIFIER_PUBLIC_KEY">VERIFIER_PUBLIC_KEY</a></span> - Static variable in interface org.eclipse.microprofile.jwt.config.<a href="org/eclipse/microprofile/jwt/config/Names.html" title="interface in org.eclipse.microprofile.jwt.config">Names</a></dt>
<dd>
<div class="block">The embedded key material of the verification public key for the MP-JWT signer in PKCS8 PEM or JWK(S) format.</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricRegistry.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricRegistry.html
index a85cf9b584..6c826686e2 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricRegistry.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricRegistry.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/eclipse/microprofile/metrics/MetricRegistry.html" target="_top">Frames</a></li>
@@ -73,14 +73,14 @@ var activeTableTab = "activeTableTab";
<div>
<ul class="subNavList">
<li>Summary: </li>
-<li><a href="#nested.class.summary">Nested</a> | </li>
-<li>Field | </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
<li>Constr | </li>
<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field.detail">Field</a> | </li>
<li>Constr | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
@@ -119,22 +119,34 @@ var activeTableTab = "activeTableTab";
<div class="summary">
<ul class="blockList">
<li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
+<!-- =========== FIELD SUMMARY =========== -->
<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a name="field.summary">
<!-- -->
</a>
-<h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
-<caption><span>Nested Classes</span><span class="tabEnd"> </span></caption>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Interface and Description</th>
+<th class="colLast" scope="col">Field and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>static class </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></span></code>
-<div class="block">An enumeration representing the scopes of the MetricRegistry</div>
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#APPLICATION_SCOPE">APPLICATION_SCOPE</a></span></code>
+<div class="block">String constant to represent the scope value used for the application scope</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#BASE_SCOPE">BASE_SCOPE</a></span></code>
+<div class="block">String constant to represent the scope value used for the base scope</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#VENDOR_SCOPE">VENDOR_SCOPE</a></span></code>
+<div class="block">String constant to represent the scope value used for the vendor scope</div>
</td>
</tr>
</table>
@@ -357,29 +369,29 @@ var activeTableTab = "activeTableTab";
</td>
</tr>
<tr id="i29" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#getScope--">getScope</a></span>()</code>
+<div class="block">Returns the scope of this metric registry.</div>
+</td>
+</tr>
+<tr id="i30" class="altColor">
<td class="colFirst"><code><a href="../../../../org/eclipse/microprofile/metrics/Timer.html" title="interface in org.eclipse.microprofile.metrics">Timer</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#getTimer-org.eclipse.microprofile.metrics.MetricID-">getTimer</a></span>(<a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics">MetricID</a> metricID)</code>
<div class="block">Return the <a href="../../../../org/eclipse/microprofile/metrics/Timer.html" title="interface in org.eclipse.microprofile.metrics"><code>Timer</code></a> registered for the provided <a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics"><code>MetricID</code></a>.</div>
</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i31" class="rowColor">
<td class="colFirst"><code>java.util.SortedMap<<a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics">MetricID</a>,<a href="../../../../org/eclipse/microprofile/metrics/Timer.html" title="interface in org.eclipse.microprofile.metrics">Timer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#getTimers--">getTimers</a></span>()</code>
<div class="block">Returns a map of all the timers in the registry and their <a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics"><code>MetricID</code></a>s.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code>java.util.SortedMap<<a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics">MetricID</a>,<a href="../../../../org/eclipse/microprofile/metrics/Timer.html" title="interface in org.eclipse.microprofile.metrics">Timer</a>></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#getTimers-org.eclipse.microprofile.metrics.MetricFilter-">getTimers</a></span>(<a href="../../../../org/eclipse/microprofile/metrics/MetricFilter.html" title="interface in org.eclipse.microprofile.metrics">MetricFilter</a> filter)</code>
<div class="block">Returns a map of all the timers in the registry and their <a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics"><code>MetricID</code></a>s which match the given filter.</div>
</td>
</tr>
-<tr id="i32" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#getType--">getType</a></span>()</code>
-<div class="block">Returns the type of this metric registry.</div>
-</td>
-</tr>
<tr id="i33" class="rowColor">
<td class="colFirst"><code><a href="../../../../org/eclipse/microprofile/metrics/Histogram.html" title="interface in org.eclipse.microprofile.metrics">Histogram</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html#histogram-org.eclipse.microprofile.metrics.Metadata-">histogram</a></span>(<a href="../../../../org/eclipse/microprofile/metrics/Metadata.html" title="interface in org.eclipse.microprofile.metrics">Metadata</a> metadata)</code>
@@ -495,6 +507,56 @@ var activeTableTab = "activeTableTab";
<div class="details">
<ul class="blockList">
<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="APPLICATION_SCOPE">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>APPLICATION_SCOPE</h4>
+<pre>static final java.lang.String APPLICATION_SCOPE</pre>
+<div class="block">String constant to represent the scope value used for the application scope</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.eclipse.microprofile.metrics.MetricRegistry.APPLICATION_SCOPE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="VENDOR_SCOPE">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>VENDOR_SCOPE</h4>
+<pre>static final java.lang.String VENDOR_SCOPE</pre>
+<div class="block">String constant to represent the scope value used for the vendor scope</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.eclipse.microprofile.metrics.MetricRegistry.VENDOR_SCOPE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="BASE_SCOPE">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>BASE_SCOPE</h4>
+<pre>static final java.lang.String BASE_SCOPE</pre>
+<div class="block">String constant to represent the scope value used for the base scope</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.eclipse.microprofile.metrics.MetricRegistry.BASE_SCOPE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
<!-- ============ METHOD DETAIL ========== -->
<ul class="blockList">
<li class="blockList"><a name="method.detail">
@@ -1492,17 +1554,17 @@ var activeTableTab = "activeTableTab";
</dl>
</li>
</ul>
-<a name="getType--">
+<a name="getScope--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>getType</h4>
-<pre><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a> getType()</pre>
-<div class="block">Returns the type of this metric registry.</div>
+<h4>getScope</h4>
+<pre>java.lang.String getScope()</pre>
+<div class="block">Returns the scope of this metric registry.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>Type of this registry (VENDOR, BASE, APPLICATION)</dd>
+<dd>Scope of this registry (VENDOR, BASE, APPLICATION)</dd>
</dl>
</li>
</ul>
@@ -1534,7 +1596,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/eclipse/microprofile/metrics/MetricID.html" title="class in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/eclipse/microprofile/metrics/MetricRegistry.html" target="_top">Frames</a></li>
@@ -1558,14 +1620,14 @@ var activeTableTab = "activeTableTab";
<div>
<ul class="subNavList">
<li>Summary: </li>
-<li><a href="#nested.class.summary">Nested</a> | </li>
-<li>Field | </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
<li>Constr | </li>
<li><a href="#method.summary">Method</a></li>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field.detail">Field</a> | </li>
<li>Constr | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricType.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricType.html
index 20e7b0797b..e06c7d0746 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricType.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/MetricType.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/eclipse/microprofile/metrics/MetricUnits.html" title="class in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -443,7 +443,7 @@ not permitted.)</div>
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/eclipse/microprofile/metrics/MetricUnits.html" title="class in org.eclipse.microprofile.metrics"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Counted.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Counted.html
index 6d58f161c3..4decc89fc5 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Counted.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Counted.html
@@ -189,12 +189,18 @@ public @interface <span class="memberNameLabel">Counted</span></pre>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Counted.html#scope--">scope</a></span></code>
+<div class="block">The scope that this counter belongs to.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>java.lang.String[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Counted.html#tags--">tags</a></span></code>
<div class="block">The tags of the counter.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Counted.html#unit--">unit</a></span></code>
<div class="block">The unit of the counter.</div>
@@ -331,7 +337,7 @@ public @interface <span class="memberNameLabel">Counted</span></pre>
<li class="blockList"><a name="unit--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>unit</h4>
<pre>public abstract java.lang.String unit</pre>
@@ -351,6 +357,27 @@ public @interface <span class="memberNameLabel">Counted</span></pre>
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="scope--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scope</h4>
+<pre>public abstract java.lang.String scope</pre>
+<div class="block">The scope that this counter belongs to.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The scope this counter belongs to. By default, the value is <code>MetricRegistry.APPLICATION_SCOPE</code>.</dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"application"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Gauge.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Gauge.html
index e378559e69..3d5f17e144 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Gauge.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Gauge.html
@@ -185,6 +185,12 @@ public @interface <span class="memberNameLabel">Gauge</span></pre>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Gauge.html#scope--">scope</a></span></code>
+<div class="block">The scope that this gauge belongs to.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>java.lang.String[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Gauge.html#tags--">tags</a></span></code>
<div class="block">The tags of the gauge.</div>
@@ -319,7 +325,7 @@ public @interface <span class="memberNameLabel">Gauge</span></pre>
<li class="blockList"><a name="description--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>description</h4>
<pre>public abstract java.lang.String description</pre>
@@ -338,6 +344,27 @@ public @interface <span class="memberNameLabel">Gauge</span></pre>
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="scope--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scope</h4>
+<pre>public abstract java.lang.String scope</pre>
+<div class="block">The scope that this gauge belongs to.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The scope this gauge belongs to. By default, the value is <code>MetricRegistry.APPLICATION_SCOPE</code>.</dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"application"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Metric.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Metric.html
index f3b0e91329..784d735094 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Metric.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Metric.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Gauge.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/eclipse/microprofile/metrics/annotation/Metric.html" target="_top">Frames</a></li>
@@ -164,12 +164,18 @@ public @interface <span class="memberNameLabel">Metric</span></pre>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Metric.html#scope--">scope</a></span></code>
+<div class="block">The scope that this metric belongs to.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>java.lang.String[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Metric.html#tags--">tags</a></span></code>
<div class="block">The tags of the metric.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Metric.html#unit--">unit</a></span></code>
<div class="block">The unit of the metric.</div>
@@ -306,7 +312,7 @@ public @interface <span class="memberNameLabel">Metric</span></pre>
<li class="blockList"><a name="unit--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>unit</h4>
<pre>public abstract java.lang.String unit</pre>
@@ -326,6 +332,27 @@ public @interface <span class="memberNameLabel">Metric</span></pre>
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="scope--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scope</h4>
+<pre>public abstract java.lang.String scope</pre>
+<div class="block">The scope that this metric belongs to.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The scope this metric belongs to. By default, the value is <code>MetricRegistry.APPLICATION_SCOPE</code>.</dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"application"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
@@ -352,7 +379,7 @@ public @interface <span class="memberNameLabel">Metric</span></pre>
<div class="subNav">
<ul class="navList">
<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Gauge.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../../index.html?org/eclipse/microprofile/metrics/annotation/Metric.html" target="_top">Frames</a></li>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/RegistryScope.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/RegistryScope.html
new file mode 100644
index 0000000000..90c41d51dd
--- /dev/null
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/RegistryScope.html
@@ -0,0 +1,248 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<title>RegistryScope</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+
+<link rel="shortcut icon" href="/img/microprofile-favicon.png">
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="RegistryScope";
+ }
+ }
+ catch(err) {
+ }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Metric.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/microprofile/metrics/annotation/RegistryScope.html" target="_top">Frames</a></li>
+<li><a href="RegistryScope.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Field | </li>
+<li>Required | </li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#annotation.type.element.detail">Element</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.eclipse.microprofile.metrics.annotation</div>
+<h2 title="Annotation Type RegistryScope" class="title">Annotation Type RegistryScope</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Documented
+ @Retention(value=RUNTIME)
+ @Target(value={METHOD,FIELD,PARAMETER,ANNOTATION_TYPE})
+public @interface <span class="memberNameLabel">RegistryScope</span></pre>
+<div class="block">Specifies the scope of Metric Registry to inject.
+ <p>
+ This can be used to obtain the respective scoped <a href="../../../../../org/eclipse/microprofile/metrics/MetricRegistry.html" title="interface in org.eclipse.microprofile.metrics"><code>MetricRegistry</code></a>:
+ </p>
+
+ <pre>
+ <code>
+ @Inject
+ @RegistryScope(scope=MetricRegistry.APPLICATION_SCOPE)
+ MetricRegistry appRegistry;
+
+ @Inject
+ @RegistryScope(scope="customScope")
+ MetricRegistry customRegistry;
+
+ </code>
+ </pre>
+
+ see <code>MetricRegistry.APPLICATION_SCOPE</code>, <code>MetricRegistry.BASE_SCOPE</code> and
+ <code>MetricRegistry.VENDOR_SCOPE</code></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.optional.element.summary">
+<!-- -->
+</a>
+<h3>Optional Element Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html#scope--">scope</a></span></code>
+<div class="block">The scope of the MetricRegistry.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation.type.element.detail">
+<!-- -->
+</a>
+<h3>Element Detail</h3>
+<a name="scope--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scope</h4>
+<pre>public abstract java.lang.String scope</pre>
+<div class="block">The scope of the MetricRegistry.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Indicates the scope of the MetricRegistry to be injected. The MicroProfile runtimes provides
+ <code>application</code>, <code>base</code> and <code>vendor</code> scopes automatically and creates user-defined scopes
+ as needed.
+
+ see <code>MetricRegistry.APPLICATION_SCOPE</code>, <code>MetricRegistry.BASE_SCOPE</code> and
+ <code>MetricRegistry.VENDOR_SCOPE</code></dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"application"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Metric.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/microprofile/metrics/annotation/RegistryScope.html" target="_top">Frames</a></li>
+<li><a href="RegistryScope.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Field | </li>
+<li>Required | </li>
+<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#annotation.type.element.detail">Element</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Timed.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Timed.html
index 5e6fe5a325..eeb7a3f533 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Timed.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/Timed.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
@@ -186,10 +186,16 @@ public @interface <span class="memberNameLabel">Timed</span></pre>
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html#scope--">scope</a></span></code>
+<div class="block">The scope that this Timer belongs to.</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><code>java.lang.String[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html#tags--">tags</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>java.lang.String</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html#unit--">unit</a></span></code>
<div class="block">The unit of the timer.</div>
@@ -325,7 +331,7 @@ public @interface <span class="memberNameLabel">Timed</span></pre>
<li class="blockList"><a name="unit--">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>unit</h4>
<pre>public abstract java.lang.String unit</pre>
@@ -345,6 +351,27 @@ public @interface <span class="memberNameLabel">Timed</span></pre>
</ul>
</li>
</ul>
+<ul class="blockList">
+<li class="blockList"><a name="scope--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>scope</h4>
+<pre>public abstract java.lang.String scope</pre>
+<div class="block">The scope that this Timer belongs to.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The scope this Timer belongs to. By default, the value is <code>MetricRegistry.APPLICATION_SCOPE</code>.</dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"application"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
</li>
</ul>
</div>
@@ -370,7 +397,7 @@ public @interface <span class="memberNameLabel">Timed</span></pre>
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-frame.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-frame.html
index 45da488597..233742af6d 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-frame.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-frame.html
@@ -16,7 +16,7 @@
<li><a href="Counted.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">Counted</a></li>
<li><a href="Gauge.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">Gauge</a></li>
<li><a href="Metric.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">Metric</a></li>
-<li><a href="RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">RegistryType</a></li>
+<li><a href="RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">RegistryScope</a></li>
<li><a href="Timed.html" title="annotation in org.eclipse.microprofile.metrics.annotation" target="classFrame">Timed</a></li>
</ul>
</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-summary.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-summary.html
index 54f72fe53b..fb279c664d 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-summary.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-summary.html
@@ -105,9 +105,9 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation">RegistryType</a></td>
+<td class="colFirst"><a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation">RegistryScope</a></td>
<td class="colLast">
-<div class="block">Qualifies the type of Metric Registry to inject.</div>
+<div class="block">Specifies the scope of Metric Registry to inject.</div>
</td>
</tr>
<tr class="altColor">
@@ -173,17 +173,18 @@
</pre>
- <h2>CDI Qualifier</h2>
+ <h2>RegistryScope annotation</h2>
<p>
- The <a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><code>RegistryType</code></a> is used to identify which
- <code>MetricRegistry</code> (Application, Base, or Vendor) should be injected. By default, no
- <code>RegistryType</code> will inject the application <code>MetricRegistry</code>.
+ The <a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><code>RegistryScope</code></a> is used to identify which
+ <code>MetricRegistry</code> (Application, Base, Vendor or a user-defined scope) should be injected. Injecting a
+ <code>MetricRegistry</code> without a <code>RegistryScope</code> annotation gives the application-scoped
+ <code>MetricRegistry</code>.
<pre>
<code>
@Inject
- @RegistryType(type=MetricRegistry.Type.BASE)
- MetricRegistry baseRegistry;
+ @RegistryScope(scope=MetricRegistry.APPLICATION_SCOPE)
+ MetricRegistry appRegistry;
</code>
</pre></div>
</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-tree.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-tree.html
index f5ca1298fb..cfd6396840 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-tree.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/annotation/package-tree.html
@@ -82,7 +82,7 @@
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="../../../../../org/eclipse/microprofile/metrics/annotation/Gauge.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Gauge</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="../../../../../org/eclipse/microprofile/metrics/annotation/Counted.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Counted</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="../../../../../org/eclipse/microprofile/metrics/annotation/Timed.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Timed</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryType</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="../../../../../org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryScope</span></a> (implements java.lang.annotation.Annotation)</li>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-frame.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-frame.html
index 7ece844b81..3aedaecad7 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-frame.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-frame.html
@@ -36,7 +36,6 @@
</ul>
<h2 title="Enums">Enums</h2>
<ul title="Enums">
-<li><a href="MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics" target="classFrame">MetricRegistry.Type</a></li>
<li><a href="MetricType.html" title="enum in org.eclipse.microprofile.metrics" target="classFrame">MetricType</a></li>
</ul>
</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-summary.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-summary.html
index 01bca0ea5d..0e27266327 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-summary.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-summary.html
@@ -217,12 +217,6 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics">MetricRegistry.Type</a></td>
-<td class="colLast">
-<div class="block">An enumeration representing the scopes of the MetricRegistry</div>
-</td>
-</tr>
-<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics">MetricType</a></td>
<td class="colLast">
<div class="block">An enumeration representing the different types of metrics.</div>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-tree.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-tree.html
index 7afedcd036..12ed09f0fb 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-tree.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/package-tree.html
@@ -130,7 +130,6 @@
<ul>
<li type="circle">java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
<ul>
-<li type="circle">org.eclipse.microprofile.metrics.<a href="../../../../org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">MetricRegistry.Type</span></a></li>
<li type="circle">org.eclipse.microprofile.metrics.<a href="../../../../org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">MetricType</span></a></li>
</ul>
</li>
diff --git a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html
index 32419f50de..090bd88f53 100644
--- a/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html
+++ b/microprofile-6.0/javadoc/org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html
@@ -173,7 +173,7 @@ extends java.lang.Object</pre>
</tr>
<tr id="i5" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html#testMetricRegistryType--">testMetricRegistryType</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/microprofile/metrics/tck/MetricRegistryTest.html#testMetricRegistryScope--">testMetricRegistryScope</a></span>()</code> </td>
</tr>
<tr id="i6" class="altColor">
<td class="colFirst"><code>void</code></td>
@@ -254,13 +254,13 @@ extends java.lang.Object</pre>
<pre>public void useExistingMetaDataTest()</pre>
</li>
</ul>
-<a name="testMetricRegistryType--">
+<a name="testMetricRegistryScope--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>testMetricRegistryType</h4>
-<pre>public void testMetricRegistryType()</pre>
+<h4>testMetricRegistryScope</h4>
+<pre>public void testMetricRegistryScope()</pre>
</li>
</ul>
<a name="sanitizeMetadataTest--">
diff --git a/microprofile-6.0/javadoc/overview-tree.html b/microprofile-6.0/javadoc/overview-tree.html
index 90aaeae626..b901f6d070 100644
--- a/microprofile-6.0/javadoc/overview-tree.html
+++ b/microprofile-6.0/javadoc/overview-tree.html
@@ -471,7 +471,7 @@
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="org/eclipse/microprofile/metrics/annotation/Gauge.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Gauge</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="org/eclipse/microprofile/metrics/annotation/Counted.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Counted</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="org/eclipse/microprofile/metrics/annotation/Timed.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">Timed</span></a> (implements java.lang.annotation.Annotation)</li>
-<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="org/eclipse/microprofile/metrics/annotation/RegistryType.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryType</span></a> (implements java.lang.annotation.Annotation)</li>
+<li type="circle">org.eclipse.microprofile.metrics.annotation.<a href="org/eclipse/microprofile/metrics/annotation/RegistryScope.html" title="annotation in org.eclipse.microprofile.metrics.annotation"><span class="typeNameLink">RegistryScope</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.jwt.<a href="org/eclipse/microprofile/jwt/Claim.html" title="annotation in org.eclipse.microprofile.jwt"><span class="typeNameLink">Claim</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.opentracing.<a href="org/eclipse/microprofile/opentracing/Traced.html" title="annotation in org.eclipse.microprofile.opentracing"><span class="typeNameLink">Traced</span></a> (implements java.lang.annotation.Annotation)</li>
<li type="circle">org.eclipse.microprofile.faulttolerance.<a href="org/eclipse/microprofile/faulttolerance/Bulkhead.html" title="annotation in org.eclipse.microprofile.faulttolerance"><span class="typeNameLink">Bulkhead</span></a> (implements java.lang.annotation.Annotation)</li>
@@ -512,7 +512,6 @@
<li type="circle">org.eclipse.microprofile.openapi.annotations.enums.<a href="org/eclipse/microprofile/openapi/annotations/enums/ParameterStyle.html" title="enum in org.eclipse.microprofile.openapi.annotations.enums"><span class="typeNameLink">ParameterStyle</span></a></li>
<li type="circle">org.eclipse.microprofile.openapi.annotations.enums.<a href="org/eclipse/microprofile/openapi/annotations/enums/ParameterIn.html" title="enum in org.eclipse.microprofile.openapi.annotations.enums"><span class="typeNameLink">ParameterIn</span></a></li>
<li type="circle">org.eclipse.microprofile.openapi.annotations.enums.<a href="org/eclipse/microprofile/openapi/annotations/enums/SecuritySchemeIn.html" title="enum in org.eclipse.microprofile.openapi.annotations.enums"><span class="typeNameLink">SecuritySchemeIn</span></a></li>
-<li type="circle">org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricRegistry.Type.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">MetricRegistry.Type</span></a></li>
<li type="circle">org.eclipse.microprofile.metrics.<a href="org/eclipse/microprofile/metrics/MetricType.html" title="enum in org.eclipse.microprofile.metrics"><span class="typeNameLink">MetricType</span></a></li>
<li type="circle">org.eclipse.microprofile.jwt.<a href="org/eclipse/microprofile/jwt/Claims.html" title="enum in org.eclipse.microprofile.jwt"><span class="typeNameLink">Claims</span></a></li>
<li type="circle">org.eclipse.microprofile.health.<a href="org/eclipse/microprofile/health/HealthCheckResponse.Status.html" title="enum in org.eclipse.microprofile.health"><span class="typeNameLink">HealthCheckResponse.Status</span></a></li>