Weld SVN: r4491 - core/trunk/bom.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-31 12:21:56 -0400 (Sat, 31 Oct 2009)
New Revision: 4491
Modified:
core/trunk/bom/pom.xml
Log:
Revert api version to SNAPSHOT
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-31 14:43:45 UTC (rev 4490)
+++ core/trunk/bom/pom.xml 2009-10-31 16:21:56 UTC (rev 4491)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>4-SNAPSHOT</version>
</parent>
<name>Weld Core BOM</name>
@@ -71,7 +71,7 @@
</repositories>
<properties>
- <weld.api.version>1.0-CR2</weld.api.version>
+ <weld.api.version>1.0-SNAPSHOT</weld.api.version>
<google.collections.version>1.0-rc2</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
<cdi.tck.version>1.0.0-SNAPSHOT</cdi.tck.version>
15 years
Weld SVN: r4490 - api/trunk/cdi/src/main/java/javax/decorator.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:43:45 -0400 (Sat, 31 Oct 2009)
New Revision: 4490
Modified:
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
Log:
sync with spec
Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-31 14:40:49 UTC (rev 4489)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-31 14:43:45 UTC (rev 4490)
@@ -20,7 +20,7 @@
* <h3>Decorated types</h3>
*
* <p>The set of decorated types of a decorator includes all
- * interfaces implemented directly or indirectly by the bean class,
+ * bean types of the managed bean that are Java interfaces,
* except for {@link java.io.Serializable}. The decorator bean
* class and its superclasses are not decorated types of the
* decorator. The decorator class may be abstract.</p>
15 years
Weld SVN: r4489 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:40:49 -0400 (Sat, 31 Oct 2009)
New Revision: 4489
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-10-31 14:37:24 UTC (rev 4488)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-10-31 14:40:49 UTC (rev 4489)
@@ -46,7 +46,7 @@
* </p>
*
* @author David Allen
- * @see javax.enterprise.inject.spi.AnnotatedType
+ * @see AnnotatedType
* @param <X> The class being annotated
*/
public interface ProcessAnnotatedType<X>
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-10-31 14:37:24 UTC (rev 4488)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-10-31 14:40:49 UTC (rev 4489)
@@ -45,6 +45,7 @@
* the exception is treated as a definition error by the container.
* </p>
*
+ * @see Bean
* @author David Allen
* @param <X> The class of the bean
*/
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java 2009-10-31 14:37:24 UTC (rev 4488)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java 2009-10-31 14:40:49 UTC (rev 4489)
@@ -46,6 +46,7 @@
* the exception is treated as a definition error by the container.
* </p>
*
+ * @see InjectionTarget
* @author David Allen
* @param <X> The managed bean class, session bean class or Java EE component
* class supporting injection
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java 2009-10-31 14:37:24 UTC (rev 4488)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java 2009-10-31 14:40:49 UTC (rev 4489)
@@ -29,6 +29,7 @@
* exception, the exception is treated as a definition error by the container.
* </p>
*
+ * @see ObserverMethod
* @author Gavin King
* @author David Allen
* @param <X> The bean type containing the observer method
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java 2009-10-31 14:37:24 UTC (rev 4488)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java 2009-10-31 14:40:49 UTC (rev 4489)
@@ -44,6 +44,7 @@
* exception is treated as a definition error by the container.
* </p>
*
+ * @see Producer
* @author David Allen
* @param <T> The bean class of the bean that declares the producer method or
* field
15 years
Weld SVN: r4488 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:37:24 -0400 (Sat, 31 Oct 2009)
New Revision: 4488
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
Log:
better links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-10-31 14:33:37 UTC (rev 4487)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-10-31 14:37:24 UTC (rev 4488)
@@ -24,10 +24,13 @@
/**
- * <p>Provides access to metadata about an
- * {@linkplain javax.inject.Inject injection point}. May represent an
- * injected field or a parameter of a bean constructor, initializer method,
- * producer method, disposer method or observer method.</p>
+ * <p>Provides access to metadata about an injection point. May represent an
+ * {@linkplain javax.inject.Inject injected field} or a parameter of a
+ * {@linkplain javax.inject.Inject bean constructor},
+ * {@linkplain javax.inject.Inject initializer method},
+ * {@linkplain javax.enterprise.inject.Produces producer method},
+ * {@linkplain javax.enterprise.inject.Disposes disposer method} or
+ * {@linkplain javax.enterprise.event.Observes observer method}.</p>
*
* <p>Occasionally, a bean with scope
* {@link javax.enterprise.context.Dependent @Dependent} needs to access
15 years
Weld SVN: r4487 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:33:37 -0400 (Sat, 31 Oct 2009)
New Revision: 4487
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-10-31 14:29:08 UTC (rev 4486)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java 2009-10-31 14:33:37 UTC (rev 4487)
@@ -24,7 +24,8 @@
/**
- * <p>Provides access to metadata about an injection point. May represent an
+ * <p>Provides access to metadata about an
+ * {@linkplain javax.inject.Inject injection point}. May represent an
* injected field or a parameter of a bean constructor, initializer method,
* producer method, disposer method or observer method.</p>
*
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-31 14:29:08 UTC (rev 4486)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java 2009-10-31 14:33:37 UTC (rev 4487)
@@ -20,10 +20,14 @@
/**
* <p>
- * Provides operations for performing dependency injection and
+ * Provides operations for performing
+ * {@linkplain javax.enterprise.inject dependency injection} and
* lifecycle callbacks on an instance of a type.
* </p>
*
+ * @see javax.annotation.PostConstruct
+ * @see javax.annotation.PreDestroy
+ *
* @author Pete Muir
* @author David Allen
* @param <T> The class of the instance
15 years
Weld SVN: r4486 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:29:08 -0400 (Sat, 31 Oct 2009)
New Revision: 4486
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Bean.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Bean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-10-31 14:27:27 UTC (rev 4485)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Bean.java 2009-10-31 14:29:08 UTC (rev 4486)
@@ -24,8 +24,9 @@
import javax.enterprise.context.spi.Contextual;
/**
- * <p>Represents an enabled bean. This interface defines everything
- * the container needs to manage instances of the bean.</p>
+ * <p>Represents an {@linkplain javax.enterprise.inject enabled bean}. This
+ * interface defines everything the container needs to manage instances of
+ * the bean.</p>
*
* @author Gavin King
* @author David Allen
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-31 14:27:27 UTC (rev 4485)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-31 14:29:08 UTC (rev 4486)
@@ -8,8 +8,9 @@
import javax.enterprise.event.TransactionPhase;
/**
- * <p>Represents an observer method of an enabled bean. Defines
- * everything the container needs to know about an observer method.</p>
+ * <p>Represents an {@linkplain javax.enterprise.event.Observes observer method}
+ * of an {@linkplain javax.enterprise.inject enabled bean}. Defines everything
+ * the container needs to know about an observer method.</p>
*
* @author Gavin King
* @author David Allen
15 years
Weld SVN: r4485 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:27:27 -0400 (Sat, 31 Oct 2009)
New Revision: 4485
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Decorator.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Interceptor.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
Log:
links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Decorator.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-10-31 14:05:35 UTC (rev 4484)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Decorator.java 2009-10-31 14:27:27 UTC (rev 4485)
@@ -22,7 +22,7 @@
import java.util.Set;
/**
- * <p>Represents an enabled decorator.</p>
+ * <p>Represents an enabled {@linkplain javax.decorator decorator}.</p>
*
* @author Gavin King
* @author Pete Muir
@@ -33,22 +33,23 @@
{
/**
- * <p>Obtains the delegate {@linkplain Type type}.</p>
+ * <p>Obtains the {@linkplain Type type} of the
+ * {@linkplain javax.decorator.Delegate delegate injection point}.</p>
*
* @return the delegate {@linkplain Type type}
*/
public Type getDelegateType();
/**
- * <p>Obtains the {@linkplain javax.inject.Qualifier qualifiers} of the delegate
- * injection point.</p>
+ * <p>Obtains the {@linkplain javax.inject.Qualifier qualifiers} of the
+ * {@linkplain javax.decorator.Delegate delegate injection point}.</p>
*
* @return the delegate {@linkplain javax.inject.Qualifier qualifiers}
*/
public Set<Annotation> getDelegateQualifiers();
/**
- * <p>Obtains the decorated {@linkplain Type types}.</p>
+ * <p>Obtains the {@linkplain javax.decorator decorated types}.</p>
*
* @return the set of decorated {@linkplain Type types}
*/
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Interceptor.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Interceptor.java 2009-10-31 14:05:35 UTC (rev 4484)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/Interceptor.java 2009-10-31 14:27:27 UTC (rev 4485)
@@ -23,7 +23,7 @@
import javax.interceptor.InvocationContext;
/**
- * <p>Represents an enabled interceptor.</p>
+ * <p>Represents an enabled {@linkplain javax.interceptor interceptor}.</p>
*
* @author Gavin King
* @author Pete Muir
@@ -46,7 +46,7 @@
* <p>Determines if the interceptor intercepts the specified
* {@linkplain InterceptionType kind of lifecycle callback or method invocation}.</p>
*
- * @param type the type of interception
+ * @param type the {@linkplain InterceptionType kind of interception}
* @return returns <tt>true</tt> if the interceptor intercepts callbacks
* or business methods of the given type, and <tt>false</tt> otherwise.
*/
@@ -56,10 +56,10 @@
* <p>Invokes the specified {@linkplain InterceptionType kind of lifecycle
* callback or method invocation interception} upon the given interceptor instance.</p>
*
- * @param type the interception type
+ * @param type the {@linkplain InterceptionType kind of interception}
* @param instance the interceptor instance to invoke
* @param ctx the context for the invocation
- * @return the return value from the invocation
+ * @return the invocation return value
*/
public Object intercept(InterceptionType type, T instance, InvocationContext ctx);
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-31 14:05:35 UTC (rev 4484)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java 2009-10-31 14:27:27 UTC (rev 4485)
@@ -18,21 +18,22 @@
public interface ObserverMethod<T>
{
/**
- * Obtains the {@linkplain Class class} of bean defining the observer method.
+ * Obtains the bean {@linkplain Class class} of the bean that declares the
+ * observer method.
*
* @return the defining {@linkplain Class class}
*/
public Class<?> getBeanClass();
/**
- * Obtains the observed event {@linkplain Type type}.
+ * Obtains the {@linkplain javax.enterprise.event observed event type}.
*
* @return the observed event {@linkplain Type type}
*/
public Type getObservedType();
/**
- * Obtains the set of observed event {@linkplain javax.inject.Qualifier qualifiers}.
+ * Obtains the set of {@linkplain javax.enterprise.event observed event qualifiers}.
*
* @return the observed event {@linkplain javax.inject.Qualifier qualifiers}
*/
@@ -54,7 +55,7 @@
public TransactionPhase getTransactionPhase();
/**
- * Calls the observer method passing the given event object.
+ * Calls the observer method, passing the given event object.
*
* @param event the event object
*/
15 years
Weld SVN: r4484 - api/trunk/cdi/src/main/javadoc.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-10-31 10:05:35 -0400 (Sat, 31 Oct 2009)
New Revision: 4484
Modified:
api/trunk/cdi/src/main/javadoc/overview.html
Log:
better first sentence
Modified: api/trunk/cdi/src/main/javadoc/overview.html
===================================================================
--- api/trunk/cdi/src/main/javadoc/overview.html 2009-10-31 11:30:37 UTC (rev 4483)
+++ api/trunk/cdi/src/main/javadoc/overview.html 2009-10-31 14:05:35 UTC (rev 4484)
@@ -2,11 +2,12 @@
<body>
-<p>Contexts and Dependency Injection (CDI) defines the following
-complementary services:</p>
+<p>Contexts and Dependency Injection (CDI) defines a set of
+complementary services that help improve the structure of application
+code.</p>
<ul>
-<li>The lifecycle and interactions of stateful
+<li>A well-defined lifecycle for stateful
{@linkplain javax.enterprise.inject beans} bound to well-defined
lifecycle {@linkplain javax.enterprise.context contexts}, where
the set of contexts is {@linkplain javax.enterprise.context.spi
@@ -16,14 +17,15 @@
{@linkplain javax.enterprise.inject.Alternative facility} for
choosing between various beans that implement the same Java
interface at deployment time</li>
+<li>Integration with the Java EE module and component architecture</li>
<li>{@linkplain javax.enterprise.inject Integration} with the
Unified Expression Language, allowing any bean to be used directly
within a JSF or JSP page</li>
<li>The ability to {@linkplain javax.decorator decorate} injected
-components</li>
+beans</li>
<li>The ability to associate
-{@linkplain javax.interceptor interceptors} with beans via
-{@linkplain javax.enterprise.inject typesafe interceptor bindings}</li>
+{@linkplain javax.interceptor interceptors} with beans via typesafe
+{@linkplain javax.enterprise.inject interceptor bindings}</li>
<li>An {@linkplain javax.enterprise.event event} notification model</li>
<li>A web {@linkplain javax.enterprise.context.ConversationScoped
conversation context} in addition to the three standard
@@ -39,7 +41,7 @@
{@linkplain javax.enterprise.event.Observes observing} events.
{@linkplain javax.enterprise.inject Various kinds} of objects are
injectable, including EJB 3 session beans, managed beans,
-{@linkplain javax.enterprise.inject.Produces producer methods } and
+{@linkplain javax.enterprise.inject.Produces producer methods} and
Java EE resources. We refer to these objects in general terms as beans
and to instances of beans that are bound to contexts as contextual
instances.</p>
15 years
Weld SVN: r4483 - core/tags/glassfish-integration/1.0.0-build1.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-10-31 07:30:37 -0400 (Sat, 31 Oct 2009)
New Revision: 4483
Modified:
core/tags/glassfish-integration/1.0.0-build1/pom.xml
Log:
mods
Modified: core/tags/glassfish-integration/1.0.0-build1/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build1/pom.xml 2009-10-31 05:44:34 UTC (rev 4482)
+++ core/tags/glassfish-integration/1.0.0-build1/pom.xml 2009-10-31 11:30:37 UTC (rev 4483)
@@ -33,10 +33,10 @@
<module>bom</module>
<module>parent</module>
<module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
+<!-- <module>tests</module> -->
+<!-- <module>porting-package</module> -->
+<!-- <module>inject-tck-runner</module> -->
+<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
</profile>
15 years