Weld SVN: r4471 - core/tags/glassfish-integration.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-10-30 20:31:24 -0400 (Fri, 30 Oct 2009)
New Revision: 4471
Added:
core/tags/glassfish-integration/1.0.0-build1/
Log:
1.0.0-build1 tag
Copied: core/tags/glassfish-integration/1.0.0-build1 (from rev 4470, core/trunk)
14 years, 6 months
Weld SVN: r4470 - 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-30 17:01:09 -0400 (Fri, 30 Oct 2009)
New Revision: 4470
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/package-info.java
Log:
nicer links
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/package-info.java 2009-10-30 20:08:06 UTC (rev 4469)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/package-info.java 2009-10-30 21:01:09 UTC (rev 4470)
@@ -47,8 +47,10 @@
* a bean, interceptor, decorator or observer method.</p>
*
* <p>An instance of <tt>Bean</tt> exists for every
- * {@linkplain javax.enterprise.inject enabled bean}. A portable extension
- * may add support for new kinds of beans by implementing <tt>Bean</tt> and
+ * {@linkplain javax.enterprise.inject enabled bean}. A portable
+ * extension may add support for new kinds of beans by implementing
+ * <tt>Bean</tt>, observing the event
+ * {@link javax.enterprise.inject.spi.AfterBeanDiscovery} event
* {@linkplain javax.enterprise.inject.spi.AfterBeanDiscovery#addBean(Bean)
* registering beans} with the container. An instance of
* <tt>ObserverMethod</tt> exists for every
@@ -83,9 +85,9 @@
*
* <p>A portable extension provides its metadata to the
* container by observing the event
- * {@link javax.enterprise.inject.spi.ProcessAnnotatedType} and
- * calling
- * {@link javax.enterprise.inject.spi.ProcessAnnotatedType#setAnnotatedType(AnnotatedType)}.</p>
+ * {@link javax.enterprise.inject.spi.ProcessAnnotatedType} and
+ * {@linkplain javax.enterprise.inject.spi.ProcessAnnotatedType#setAnnotatedType(AnnotatedType)
+ * wrapping} the {@link javax.enterprise.inject.spi.AnnotatedType}.</p>
*
* <h3><tt>Producer</tt> and <tt>InjectionTarget</tt></h3>
*
@@ -96,8 +98,9 @@
* and lifecycle callbacks.</p>
*
* <p>An instance of {@link javax.enterprise.inject.spi.InjectionTarget}
- * may be obtained using
- * {@link javax.enterprise.inject.spi.BeanManager#createInjectionTarget(AnnotatedType)},
+ * may be
+ * {@linkplain javax.enterprise.inject.spi.BeanManager#createInjectionTarget(AnnotatedType)
+ * obtained} from the {@link javax.enterprise.inject.spi.BeanManager},
* allowing a portable extension to request these container services for
* objects under the control of the portable extension.</p>
*
14 years, 6 months
Weld SVN: r4469 - core/trunk/bom.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-30 16:08:06 -0400 (Fri, 30 Oct 2009)
New Revision: 4469
Modified:
core/trunk/bom/pom.xml
Log:
Use interceptors 1.0.0-CR5
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-30 20:03:54 UTC (rev 4468)
+++ core/trunk/bom/pom.xml 2009-10-30 20:08:06 UTC (rev 4469)
@@ -76,7 +76,7 @@
<javassist.version>3.11.0.GA</javassist.version>
<cdi.tck.version>1.0.0-SNAPSHOT</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-SNAPSHOT</jboss.interceptor.version>
+ <jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version>
<slf4j.version>1.5.9.RC1</slf4j.version>
</properties>
14 years, 6 months
Weld SVN: r4468 - api/trunk/bom.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-30 16:03:54 -0400 (Fri, 30 Oct 2009)
New Revision: 4468
Modified:
api/trunk/bom/pom.xml
Log:
Use interceptors-api 1.1-CR1 in the API
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-30 20:03:33 UTC (rev 4467)
+++ api/trunk/bom/pom.xml 2009-10-30 20:03:54 UTC (rev 4468)
@@ -85,7 +85,7 @@
<uel.api.version>2.1.2-b04</uel.api.version>
<jsf.api.version>1.2_13</jsf.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
- <interceptor.api.version>3.1.0-CR1</interceptor.api.version>
+ <interceptor.api.version>1.1-CR1</interceptor.api.version>
</properties>
<dependencyManagement>
14 years, 6 months
Weld SVN: r4467 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-30 16:03:33 -0400 (Fri, 30 Oct 2009)
New Revision: 4467
Modified:
cdi-tck/trunk/pom.xml
Log:
Use interceptors-api 1.1-CR1 in the TCK
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-10-30 18:25:18 UTC (rev 4466)
+++ cdi-tck/trunk/pom.xml 2009-10-30 20:03:33 UTC (rev 4467)
@@ -92,7 +92,7 @@
<uel.api.version>2.1.2-b04</uel.api.version>
<jsf.api.version>1.2_13</jsf.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
- <interceptor.api.version>3.1.0-CR1</interceptor.api.version>
+ <interceptor.api.version>1.1-CR1</interceptor.api.version>
<jws.api.version>1.0-MR1</jws.api.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<htmlunit.version>2.4</htmlunit.version>
14 years, 6 months
Weld SVN: r4466 - 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-30 14:25:18 -0400 (Fri, 30 Oct 2009)
New Revision: 4466
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/ProcessManagedBean.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
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
Log:
update process events to latest spec
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-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,8 +18,9 @@
/**
* <p>
- * The container fires this event for each Java class or interface it discovers,
- * before it reads the declared annotations.
+ * The container fires an event of this type for each Java class or interface
+ * it discovers in a bean deployment archive, before it reads the declared
+ * annotations.
* </p>
* <p>
* Any observer of this event is permitted to wrap and/or replace the
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-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessBean.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,8 +18,9 @@
/**
* <p>
- * The container fires an event of this type for each bean it discovers, before
- * registering the {@link javax.enterprise.inject.spi.Bean} object.
+ * The container fires an event of this type for each enabled bean, interceptor
+ * or decorator deployed in a bean deployment archive, before registering the
+ * {@link javax.enterprise.inject.spi.Bean} object.
* </p>
* <p>
* The event object type depends upon what kind of bean was discovered:
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-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,8 +18,10 @@
/**
* <p>
- * The container will fire an event of this type for each managed bean, session
- * bean, Java EE component class supporting injection.
+ * The container fires an event of this type for every Java EE component class supporting
+ * injection that may be instantiated by the container at runtime, including every
+ * managed bean declared using {@code javax.annotation.ManagedBean}, EJB session
+ * or message-driven bean, enabled bean, enabled interceptor or enabled decorator.
* </p>
* <p>
* Any observer of this event is permitted to wrap and/or replace the
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java 2009-10-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,7 +18,7 @@
/**
* <p>
- * The container fires an event of this type for each managed bean it discovers,
+ * The container fires an event of this type for each enabled managed bean,
* before registering the {@link javax.enterprise.inject.spi.Bean} object.
* </p>
* <p>
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-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -20,8 +20,9 @@
/**
* <p>
* The container fires an event of this type for each
- * {@linkplain javax.enterprise.inject.spi.ObserverMethod observer method} that
- * is registered.
+ * {@linkplain javax.enterprise.event.Observes observer method}
+ * of each enabled bean, before registering the
+ * {@link javax.enterprise.inject.spi.ObserverMethod} object.
* </p>
* <p>
* If any observer method of a {@code ProcessObserverMethod} event throws an
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-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -19,9 +19,9 @@
/**
* <p>
- * The container will fire an event of this type for each
- * {@linkplain javax.enterprise.inject.Produces producer method or field},
- * including resources.
+ * The container fires an event of this type for each
+ * {@linkplain javax.enterprise.inject.Produces producer method or field}
+ * of each enabled bean, including resources.
* </p>
* <p>
* Any observer of this event is permitted to wrap and/or replace the {@code
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java 2009-10-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,9 +18,9 @@
/**
* <p>
- * The container fires an event of this type for each producer field it
- * discovers, before registering the corresponding
- * {@link javax.enterprise.inject.spi.Bean} object.
+ * The container fires an event of this type for each enabled producer field,
+ * before registering the {@link javax.enterprise.inject.spi.Bean} object.
+ * Resources are considered to be producer fields.
* </p>
* <p>
* If any observer method of a {@code ProcessProducerField} event throws an
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java 2009-10-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -18,9 +18,8 @@
/**
* <p>
- * The container fires an event of this type for each producer method it
- * discovers, before registering the corresponding
- * {@link javax.enterprise.inject.spi.Bean} object.
+ * The container fires an event of this type for each enabled producer method,
+ * before registering the {@link javax.enterprise.inject.spi.Bean} object.
* </p>
* <p>
* If any observer method of a {@code ProcessProducerMethod} event throws an
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java 2009-10-30 18:11:36 UTC (rev 4465)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java 2009-10-30 18:25:18 UTC (rev 4466)
@@ -19,7 +19,7 @@
/**
* <p>
- * The container fires an event of this type for each session bean it discovers,
+ * The container fires an event of this type for each enabled session bean,
* before registering the {@link javax.enterprise.inject.spi.Bean} object.
* </p>
* <p>
14 years, 6 months
Weld SVN: r4465 - 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-30 14:11:36 -0400 (Fri, 30 Oct 2009)
New Revision: 4465
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
Log:
get rid of obsolete method
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java 2009-10-30 16:38:50 UTC (rev 4464)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java 2009-10-30 18:11:36 UTC (rev 4465)
@@ -33,15 +33,6 @@
public interface ProcessSessionBean<X> extends ProcessManagedBean<Object>
{
/**
- * Returns the {@link javax.enterprise.inject.spi.AnnotatedType} representing
- * the bean class.
- *
- * @return the {@link javax.enterprise.inject.spi.AnnotatedType} for the bean
- * being registered
- */
- public AnnotatedType<X> getAnnotatedSessionBeanClass();
-
- /**
* Returns the EJB name of the session bean.
*
* @return the name of the EJB
14 years, 6 months
Weld SVN: r4464 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/event/observer/transactional and 9 other directories.
by weld-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-10-30 12:38:50 -0400 (Fri, 30 Oct 2009)
New Revision: 4464
Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
Log:
minor test cleanup
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,9 +1,7 @@
package org.jboss.jsr299.tck.tests.event.bindingTypes;
import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
@@ -12,7 +10,7 @@
import javax.inject.Qualifier;
-@Target( { FIELD, PARAMETER, METHOD, TYPE } )
+@Target( { FIELD, PARAMETER} )
@Retention(RUNTIME)
@Documented
@Qualifier
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -17,11 +17,8 @@
package org.jboss.jsr299.tck.tests.event.observer.transactional;
-import java.lang.annotation.Annotation;
import java.math.BigInteger;
-import javax.enterprise.util.AnnotationLiteral;
-
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -44,10 +41,6 @@
@SpecVersion(spec="cdi", version="20091018")
public class TransactionalObserversTest extends AbstractJSR299Test
{
-
- private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
- {
- };
private PomeranianInterface dog = null;
@Override
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -46,5 +46,7 @@
{
assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("first-observer")).size() == 1;
assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("second-observer")).size() == 1;
+ assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("third-observer")).size() == 0;
+
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -58,6 +58,7 @@
public void testResolvingChecksTypeParameters()
{
assert getCurrentManager().resolveObserverMethods(new StringList()).size() == 1;
+ assert getCurrentManager().resolveObserverMethods(new IntegerList()).size() == 1;
assert getCurrentManager().resolveObserverMethods(new CharacterList()).size() == 0;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -9,6 +9,7 @@
{
public static boolean intercepted = false;
+
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
intercepted = true;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -2,7 +2,6 @@
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -6,17 +6,19 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@SpecVersion(spec="cdi", version="20091018")
+@BeansXml("beans.xml")
public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
@SpecAssertion(section = "9.2", id = "d")
public void testLifecycleInterceptorWithInvalidBindingNotOk()
{
- assert false;
+ assert false;
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder;
import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
class AnotherInterceptor
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -10,7 +8,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
-import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -10,7 +8,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
import javax.interceptor.InterceptorBinding;
@Target( { TYPE, METHOD})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
-import javax.enterprise.util.AnnotationLiteral;
-
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml 2009-10-30 16:38:50 UTC (rev 4464)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidLifecycleInterceptor.TransactionalInterceptor</class>
+ </interceptors>
+</beans>
14 years, 6 months
Weld SVN: r4463 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-30 10:58:49 -0400 (Fri, 30 Oct 2009)
New Revision: 4463
Modified:
cdi-tck/trunk/pom.xml
Log:
remove snapshots
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-10-30 14:57:50 UTC (rev 4462)
+++ cdi-tck/trunk/pom.xml 2009-10-30 14:58:49 UTC (rev 4463)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
</parent>
<!-- Metadata -->
@@ -78,7 +78,7 @@
<jboss.test.harness.version>1.1.0-CR2</jboss.test.harness.version>
<testng.version>5.10</testng.version>
<jsr250.api.version>1.0</jsr250.api.version>
- <cdi.api.version>1.0-SNAPSHOT</cdi.api.version>
+ <cdi.api.version>1.0-CR2</cdi.api.version>
<atinject.api.version>1</atinject.api.version>
<ejb.api.version>3.1.0-Alpha1</ejb.api.version>
<jsr250.api.version>1.0</jsr250.api.version>
14 years, 6 months