Skip to content

Commit

Permalink
WELD-2370 update doc links to CDI 2.0 spec
Browse files Browse the repository at this point in the history
  • Loading branch information
tremes authored and mkouba committed May 10, 2017
1 parent d11a9d8 commit 8f61cb4
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/main/asciidoc/configure.asciidoc
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/main/asciidoc/ee.asciidoc
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/main/asciidoc/extend.asciidoc
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions docs/reference/src/main/asciidoc/ri-spi.asciidoc
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 8f61cb4

Please sign in to comment.