From 8f61cb4599599489782483168ad8c01b386dfc7c Mon Sep 17 00:00:00 2001 From: Tomas Remes Date: Tue, 4 Apr 2017 19:57:34 +0200 Subject: [PATCH] WELD-2370 update doc links to CDI 2.0 spec --- .../Weld_-_JSR-299_Reference_Implementation.asciidoc | 4 ++-- docs/reference/src/main/asciidoc/configure.asciidoc | 2 +- docs/reference/src/main/asciidoc/ee.asciidoc | 2 +- docs/reference/src/main/asciidoc/extend.asciidoc | 2 +- docs/reference/src/main/asciidoc/ri-spi.asciidoc | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/reference/src/main/asciidoc/Weld_-_JSR-299_Reference_Implementation.asciidoc b/docs/reference/src/main/asciidoc/Weld_-_JSR-299_Reference_Implementation.asciidoc index 2d676d9d0cc..2660e64aa7c 100644 --- a/docs/reference/src/main/asciidoc/Weld_-_JSR-299_Reference_Implementation.asciidoc +++ b/docs/reference/src/main/asciidoc/Weld_-_JSR-299_Reference_Implementation.asciidoc @@ -5,11 +5,11 @@ [preface] = A note about naming and nomenclature -Throughout this document, mentions of JSR-299 and JSR-346 appear. JSR is +Throughout this document, mentions of JSR-299, JSR-346 and JSR-365 appear. JSR is a document of a proposed specification used in the Java Community Process (JCP). JSRs are somewhat analogous to RFCs used by IETF. JSR-299 and JSR-346 are the JCP specification names for the 1.0 and 1.1 versions -of CDI, respectively. +of CDI, respectively. JSR-365 is the JCP specification name for the CDI 2.0 version. Shortly before the final draft of JSR-299 was submitted, the specification changed its name from "Web Beans" to "Java Contexts and diff --git a/docs/reference/src/main/asciidoc/configure.asciidoc b/docs/reference/src/main/asciidoc/configure.asciidoc index 30eb8e40c42..14955ee97ac 100644 --- a/docs/reference/src/main/asciidoc/configure.asciidoc +++ b/docs/reference/src/main/asciidoc/configure.asciidoc @@ -310,7 +310,7 @@ to deployment problem. CDI 1.1 allows you to exclude classes in your archive from being scanned, having container lifecycle events fired, and being deployed as beans. See also -http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#exclude_filters[12.4.2 +http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#exclude_filters[12.4.2 Exclude filters]. NOTE: Weld still supports the original non-portable way of excluding classes diff --git a/docs/reference/src/main/asciidoc/ee.asciidoc b/docs/reference/src/main/asciidoc/ee.asciidoc index 9cd24be8d72..7f803c4032e 100644 --- a/docs/reference/src/main/asciidoc/ee.asciidoc +++ b/docs/reference/src/main/asciidoc/ee.asciidoc @@ -277,7 +277,7 @@ The set of bean defining annotations contains: * and the `@Dependent` scope annotation. However, `@Singleton` is not a bean defining annotation. -See http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#bean_defining_annotations[2.5.1. Bean defining annotations] to learn more. +See http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#bean_defining_annotations[2.5.1. Bean defining annotations] to learn more. ==== ==== Which archive is not a bean archive diff --git a/docs/reference/src/main/asciidoc/extend.asciidoc b/docs/reference/src/main/asciidoc/extend.asciidoc index b38aefd68ff..82db250ea68 100644 --- a/docs/reference/src/main/asciidoc/extend.asciidoc +++ b/docs/reference/src/main/asciidoc/extend.asciidoc @@ -143,7 +143,7 @@ An extension observer method is not allowed to inject any other object. CDI 2.0 introduced the Configurators API - a new way to easily configure some parts of the SPI during container lifecycle event notification. E.g. to add a qualifier to a bean an extension can observe `ProcessBeanAttributes`, then obtain a configurator instance through `ProcessBeanAttributes.configureBeanAttributes()` and finally use `BeanAttributesConfigurator.addQualifier(Annotation)`. No need to wrap/delegate to the original `BeanAttributes`. -See also chapter http://docs.jboss.org/cdi/spec/2.0-PRD/cdi-spec.html#configurators[Configurators interfaces] of the CDI specification. +See also chapter http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#configurators[Configurators interfaces] of the CDI specification. === The `BeanManager` object diff --git a/docs/reference/src/main/asciidoc/ri-spi.asciidoc b/docs/reference/src/main/asciidoc/ri-spi.asciidoc index f504c176bb0..713cdb411fd 100644 --- a/docs/reference/src/main/asciidoc/ri-spi.asciidoc +++ b/docs/reference/src/main/asciidoc/ri-spi.asciidoc @@ -166,7 +166,7 @@ provided per-BDA. BDA services are provided using they are provided. The contract for `Deployment` requires the container to specify the -portable extensions (http://docs.jboss.org/cdi/spec/2.0-PRD/cdi-spec.html#packaging_deployment[see chapter _Packaging and deployment_ of the CDI specification]) which +portable extensions (http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#packaging_deployment[see chapter _Packaging and deployment_ of the CDI specification]) which should be loaded by the application. To aid the container integrator, Weld provides the method `Bootstrap.loadExtensions(ClassLoader)` which will load the extensions for the specified classloader. @@ -505,7 +505,7 @@ bytecode-scanning capabilities to Weld. If present, Weld will try to use the service to avoid loading of classes that do not need to be loaded. These are classes that: -* are not http://docs.jboss.org/cdi/spec/2.0-PFD/cdi-spec.html#what_classes_are_beans[CDI managed beans] and +* are not http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#what_classes_are_beans[CDI managed beans] and * are not assignable to any ProcessAnnotatedType observer This usually yields improved bootstrap performance especially in large @@ -921,7 +921,7 @@ order to satisfy Weld's dependencies: ==== Migration from Weld 2.1 to 2.2 * The definition of a _bean defining annotation_ was altered in CDI 1.2. -See the http://cdi-spec.org[specification] for more information. +See the http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#bean_defining_annotations[specification] for more information. * A new http://docs.jboss.org/weld/javadoc/2.2/weld-spi/org/jboss/weld/manager/api/WeldInjectionTargetBuilder.html[WeldInjectionTargetBuilder] SPI was added. The SPI allows an integrator to obtain a customized @@ -976,7 +976,7 @@ Instead, this dependency needs to be deployed separately to the OSGi container. Weld 3.0 implements CDI 2.0 so this is a huge update which contains bunch of new features. However, this document only covers part which might prove problematic while moving existing application from Weld 2.4 to Weld 3.0. -For more information on the CDI 2.0 itself, please consult http://docs.jboss.org/cdi/spec/2.0-PRD/cdi-spec.html[the specification]. +For more information on the CDI 2.0 itself, please consult http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html[the specification]. ===== Java 8