Weld SVN: r4191 - in core/trunk/impl/src/main/java/org/jboss/weld: bean and 1 other directories.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-19 03:38:42 -0400 (Mon, 19 Oct 2009)
New Revision: 4191
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java
Log:
Scan EJB3-style interceptors for EJBs as well (don't handle them), so that we can validate passivation inconsistencies.
Make sure that interceptor bindings are recognized according to the spec wrt @Target (only METHOD and TYPE), meta-binding rules are observed.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-19 07:35:37 UTC (rev 4190)
+++ core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-19 07:38:42 UTC (rev 4191)
@@ -122,7 +122,7 @@
validateCdiBoundInterceptors(beanManager, classBean);
}
// validate EJB-defined interceptors
- if (classBean instanceof ManagedBean && ((ManagedBean)classBean).hasDirectlyDefinedInterceptors())
+ if (((AbstractClassBean<?>) bean).hasDirectlyDefinedInterceptors())
{
validateDirectlyDefinedInterceptorClasses(beanManager, classBean);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-19 07:35:37 UTC (rev 4190)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-19 07:38:42 UTC (rev 4191)
@@ -40,6 +40,9 @@
import javax.inject.Scope;
import org.jboss.interceptor.model.InterceptionModelBuilder;
+import org.jboss.interceptor.model.InterceptionModel;
+import org.jboss.interceptor.model.InterceptorClassMetadataImpl;
+import org.jboss.interceptor.util.InterceptionUtils;
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.DefinitionException;
import org.jboss.weld.DeploymentException;
@@ -57,6 +60,7 @@
import org.jboss.weld.util.Beans;
import org.jboss.weld.util.Proxies;
import org.jboss.weld.util.Strings;
+import org.jboss.weld.util.Reflections;
/**
* An abstract bean representation common for class-based beans
@@ -125,7 +129,10 @@
checkType();
initProxyClassForDecoratedBean();
if (isInterceptionCandidate())
- initInterceptors();
+ {
+ initCdiBoundInterceptors();
+ initDirectlyDefinedInterceptors();
+ }
}
protected void checkType()
@@ -394,9 +401,7 @@
return foundInterceptionBindingTypes;
}
-
-
- protected void initInterceptors()
+ protected void initCdiBoundInterceptors()
{
if (manager.getCdiInterceptorsRegistry().getInterceptionModel(getType()) == null)
{
@@ -440,7 +445,12 @@
builder.interceptAroundInvoke(((AnnotatedMethod) method).getJavaMember()).with(toSerializableContextualArray(methodBoundInterceptors));
}
}
- manager.getCdiInterceptorsRegistry().registerInterceptionModel(getType(), builder.build());
+ InterceptionModel<Class<?>,SerializableContextual<Interceptor<?>,?>> serializableContextualInterceptionModel = builder.build();
+ // if there is at least one applicable interceptor, register it
+ if (serializableContextualInterceptionModel.getAllInterceptors().size() > 0)
+ {
+ manager.getCdiInterceptorsRegistry().registerInterceptionModel(getType(), serializableContextualInterceptionModel);
+ }
}
}
@@ -511,5 +521,55 @@
return false;
}
+ public boolean hasDirectlyDefinedInterceptors()
+ {
+ if (manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()) != null)
+ return manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()).getAllInterceptors().size() > 0;
+ else
+ return false;
+ }
+ protected void initDirectlyDefinedInterceptors()
+ {
+ if (manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()) == null && InterceptionUtils.supportsEjb3InterceptorDeclaration())
+ {
+ InterceptionModelBuilder<Class<?>, Class<?>> builder = InterceptionModelBuilder.newBuilderFor(getType(), (Class) Class.class);
+
+ Class<?>[] classDeclaredInterceptors = null;
+ if (getAnnotatedItem().isAnnotationPresent(InterceptionUtils.getInterceptorsAnnotationClass()))
+ {
+ Annotation interceptorsAnnotation = getType().getAnnotation(InterceptionUtils.getInterceptorsAnnotationClass());
+ classDeclaredInterceptors = Reflections.extractValues(interceptorsAnnotation);
+ }
+
+ if (classDeclaredInterceptors != null)
+ {
+ builder.interceptAll().with(classDeclaredInterceptors);
+ }
+
+ List<WeldMethod<?, ?>> businessMethods = Beans.getInterceptableBusinessMethods(getAnnotatedItem());
+ for (WeldMethod<?, ?> method : businessMethods)
+ {
+ boolean excludeClassInterceptors = method.isAnnotationPresent(InterceptionUtils.getExcludeClassInterceptorsAnnotationClass());
+ Class<?>[] methodDeclaredInterceptors = null;
+ if (method.isAnnotationPresent(InterceptionUtils.getInterceptorsAnnotationClass()))
+ {
+ methodDeclaredInterceptors = Reflections.extractValues(method.getAnnotation(InterceptionUtils.getInterceptorsAnnotationClass()));
+ }
+ if (excludeClassInterceptors)
+ {
+ builder.ignoreGlobalInterceptors(((AnnotatedMethod)method).getJavaMember());
+ }
+ if (methodDeclaredInterceptors != null)
+ {
+ builder.interceptAroundInvoke(((AnnotatedMethod) method).getJavaMember()).with(methodDeclaredInterceptors);
+ }
+ }
+ InterceptionModel<Class<?>, Class<?>> interceptionModel = builder.build();
+ if (interceptionModel.getAllInterceptors().size() > 0 || new InterceptorClassMetadataImpl(getType()).isInterceptor())
+ manager.getClassDeclaredInterceptorsRegistry().registerInterceptionModel(getType(), builder.build());
+ }
+ }
+
+
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-19 07:35:37 UTC (rev 4190)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-19 07:38:42 UTC (rev 4191)
@@ -186,7 +186,7 @@
initEEInjectionPoints();
if (isInterceptionCandidate())
{
- initClassInterceptors();
+ initDirectlyDefinedInterceptors();
}
setInjectionTarget(new InjectionTarget<T>()
{
@@ -425,14 +425,6 @@
return !Beans.isInterceptor(getAnnotatedItem()) && !Beans.isDecorator(getAnnotatedItem());
}
- public boolean hasDirectlyDefinedInterceptors()
- {
- if (manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()) != null)
- return manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()).getAllInterceptors().size() > 0;
- else
- return false;
- }
-
protected T applyInterceptors(T instance, final CreationalContext<T> creationalContext)
{
try
@@ -459,49 +451,4 @@
return instance;
}
- protected void initClassInterceptors()
- {
- if (manager.getClassDeclaredInterceptorsRegistry().getInterceptionModel(getType()) == null && InterceptionUtils.supportsEjb3InterceptorDeclaration())
- {
- InterceptionModelBuilder<Class<?>, Class<?>> builder = InterceptionModelBuilder.newBuilderFor(getType(), (Class) Class.class);
-
- Class<?>[] classDeclaredInterceptors = null;
- if (getAnnotatedItem().isAnnotationPresent(InterceptionUtils.getInterceptorsAnnotationClass()))
- {
- Annotation interceptorsAnnotation = getType().getAnnotation(InterceptionUtils.getInterceptorsAnnotationClass());
- classDeclaredInterceptors = Reflections.extractValues(interceptorsAnnotation);
- }
-
- if (classDeclaredInterceptors != null)
- {
- builder.interceptPostConstruct().with(classDeclaredInterceptors);
- builder.interceptPreDestroy().with(classDeclaredInterceptors);
- builder.interceptPrePassivate().with(classDeclaredInterceptors);
- builder.interceptPostActivate().with(classDeclaredInterceptors);
- }
-
- List<WeldMethod<?, ?>> businessMethods = Beans.getInterceptableBusinessMethods(getAnnotatedItem());
- for (WeldMethod<?, ?> method : businessMethods)
- {
- boolean excludeClassInterceptors = method.isAnnotationPresent(InterceptionUtils.getExcludeClassInterceptorsAnnotationClass());
- Class<?>[] methodDeclaredInterceptors = null;
- if (method.isAnnotationPresent(InterceptionUtils.getInterceptorsAnnotationClass()))
- {
- methodDeclaredInterceptors = Reflections.extractValues(method.getAnnotation(InterceptionUtils.getInterceptorsAnnotationClass()));
- }
- if (!excludeClassInterceptors && classDeclaredInterceptors != null)
- {
- builder.interceptAroundInvoke(((AnnotatedMethod) method).getJavaMember()).with(classDeclaredInterceptors);
- }
- if (methodDeclaredInterceptors != null)
- {
- builder.interceptAroundInvoke(((AnnotatedMethod) method).getJavaMember()).with(methodDeclaredInterceptors);
- }
- }
- InterceptionModel<Class<?>, Class<?>> interceptionModel = builder.build();
- if (interceptionModel.getAllInterceptors().size() > 0 || new InterceptorClassMetadataImpl(getType()).isInterceptor())
- manager.getClassDeclaredInterceptorsRegistry().registerInterceptionModel(getType(), builder.build());
- }
- }
-
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-10-19 07:35:37 UTC (rev 4190)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-10-19 07:38:42 UTC (rev 4191)
@@ -22,10 +22,16 @@
import org.jboss.weld.log.Logging;
import org.jboss.weld.resources.ClassTransformer;
import org.jboss.weld.util.collections.Arrays2;
+import org.jboss.weld.util.Reflections;
+import org.jboss.weld.DefinitionException;
import javax.interceptor.InterceptorBinding;
import javax.enterprise.inject.Nonbinding;
import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.reflect.InvocationTargetException;
import java.util.Set;
@@ -43,9 +49,14 @@
public InterceptorBindingModel(Class<T> type, ClassTransformer transformer)
{
super(type, transformer);
- initNonBindingTypes();
- initInterceptionBindingTypes();
- this.metaAnnotations = getAnnotatedAnnotation().getAnnotations();
+ if (isValid())
+ {
+ initNonBindingTypes();
+ initInterceptionBindingTypes();
+ checkArrayAndAnnotationValuedMembers();
+ checkMetaAnnotations();
+ this.metaAnnotations = getAnnotatedAnnotation().getAnnotations();
+ }
}
protected Set<Class<? extends Annotation>> getMetaAnnotationTypes()
@@ -68,6 +79,54 @@
inheritedInterceptionBindingTypes = getAnnotatedAnnotation().getMetaAnnotations(InterceptorBinding.class);
}
+ @Override
+ protected void initValid()
+ {
+ super.initValid();
+ if (!getAnnotatedAnnotation().isAnnotationPresent(Target.class))
+ {
+ this.valid = false;
+ log.debug("#0 is missing @Target", getAnnotatedAnnotation());
+ }
+ else
+ {
+ ElementType[] targetElementTypes = getAnnotatedAnnotation().getAnnotation(Target.class).value();
+ if (!Arrays2.unorderedEquals(targetElementTypes, ElementType.TYPE, ElementType.METHOD)
+ && !Arrays2.unorderedEquals(targetElementTypes, ElementType.TYPE))
+ {
+ this.valid = false;
+ log.debug("#0 is not declared @Target(TYPE, METHOD) or @Target(TYPE)");
+ }
+ }
+ }
+
+ private void checkMetaAnnotations()
+ {
+ if (Arrays2.containsAll(getAnnotatedAnnotation().getAnnotation(Target.class).value(), ElementType.METHOD))
+ {
+ for (Annotation inheritedBinding: getInheritedInterceptionBindingTypes())
+ {
+ if (!Arrays2.containsAll(inheritedBinding.annotationType().getAnnotation(Target.class).value(), ElementType.METHOD))
+ {
+ this.valid = false;
+ log.debug("#0 is declared @Target(TYPE, METHOD), but inherits #1, which is declared @Target(TYPE)",
+ getAnnotatedAnnotation(), inheritedBinding);
+ }
+ }
+ }
+ }
+
+ private void checkArrayAndAnnotationValuedMembers()
+ {
+ for (WeldMethod<?, ?> annotatedMethod : getAnnotatedAnnotation().getMembers())
+ {
+ if ((Reflections.isArrayType(annotatedMethod.getJavaClass()) || Annotation.class.isAssignableFrom(annotatedMethod.getJavaClass())) && !nonBindingTypes.contains(annotatedMethod))
+ {
+ throw new DefinitionException("Member of array type or annotation type must be annotated @NonBinding " + annotatedMethod);
+ }
+ }
+ }
+
public Set<Annotation> getInheritedInterceptionBindingTypes()
{
return inheritedInterceptionBindingTypes;
14 years, 8 months
- 1
- 0
Weld SVN: r4190 - core/trunk/bom.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-19 03:35:37 -0400 (Mon, 19 Oct 2009)
New Revision: 4190
Modified:
core/trunk/bom/pom.xml
Log:
Revert jboss-interceptors to 1.0.0-SNAPSHOT.
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-19 00:14:50 UTC (rev 4189)
+++ core/trunk/bom/pom.xml 2009-10-19 07:35:37 UTC (rev 4190)
@@ -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-CR1</jboss.interceptor.version>
+ <jboss.interceptor.version>1.0.0-SNAPSHOT</jboss.interceptor.version>
</properties>
<dependencyManagement>
14 years, 8 months
- 1
- 0
Weld SVN: r4189 - in core/trunk: jboss-as and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 20:14:50 -0400 (Sun, 18 Oct 2009)
New Revision: 4189
Modified:
core/trunk/bom/pom.xml
core/trunk/jboss-as/build.xml
Log:
use new api
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-19 00:13:32 UTC (rev 4188)
+++ core/trunk/bom/pom.xml 2009-10-19 00:14:50 UTC (rev 4189)
@@ -71,7 +71,7 @@
</repositories>
<properties>
- <weld.api.version>1.0-CR1</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>
Modified: core/trunk/jboss-as/build.xml
===================================================================
--- core/trunk/jboss-as/build.xml 2009-10-19 00:13:32 UTC (rev 4188)
+++ core/trunk/jboss-as/build.xml 2009-10-19 00:14:50 UTC (rev 4189)
@@ -4,8 +4,6 @@
<path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
- <echo message="${java.io.tmpdir}" />
-
<property name="maven.dir" location="${basedir}/lib/maven" />
<property file="local.build.properties" />
14 years, 8 months
- 1
- 0
Weld SVN: r4188 - core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 20:13:32 -0400 (Sun, 18 Oct 2009)
New Revision: 4188
Removed:
core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/util/
Log:
Remove unecessary class
14 years, 8 months
- 1
- 0
Weld SVN: r4187 - cdi-tck/trunk/impl/src/main/resources and 11 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 20:12:42 -0400 (Sun, 18 Oct 2009)
New Revision: 4187
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Bestiary.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Hippogriff.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployerEnvironment.java
core/trunk/impl/src/main/java/org/jboss/weld/ejb/EjbDescriptors.java
core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Producers.java
core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java
Log:
support @New injecting classes from outside BDAs
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Bestiary.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Bestiary.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Bestiary.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -0,0 +1,47 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.Produces;
+
+@RequestScoped
+public class Bestiary
+{
+
+ private Set<String> possibleNames;
+ private Set<String> knightsWhichKilledTheDragons;
+
+ @Produces Collection<Dragon> getDragons(@New ArrayList<Dragon> dragons)
+ {
+ return dragons;
+ }
+
+ public void observeBirth(@Observes Griffin griffin, @New TreeSet<String> possibleNames)
+ {
+ this.possibleNames = possibleNames;
+ }
+
+ public void destroyDragons(@Disposes Collection<Dragon> dragons, @New LinkedHashSet<String> knights)
+ {
+ this.knightsWhichKilledTheDragons = knights;
+ }
+
+ public Set<String> getPossibleNames()
+ {
+ return possibleNames;
+ }
+
+ public Set<String> getKnightsWhichKilledTheDragons()
+ {
+ return knightsWhichKilledTheDragons;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Bestiary.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+public class Dragon
+{
+
+ private Set<String> children;
+
+ @Inject
+ public void initialize(@New HashSet<String> children)
+ {
+ this.children = children;
+ }
+
+ public Set<String> getChildren()
+ {
+ return children;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Dragon.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+public class Griffin
+{
+
+ @Inject @New ArrayList<String> list;
+
+ public List<String> getList()
+ {
+ return list;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Griffin.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Hippogriff.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Hippogriff.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Hippogriff.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.inject.New;
+import javax.inject.Inject;
+
+public class Hippogriff
+{
+
+ private Map<String, String> homes;
+
+ @Inject
+ public Hippogriff(@New HashMap<String, String> homes)
+ {
+ this.homes = homes;
+ }
+
+ public Map<String, String> getHomes()
+ {
+ return homes;
+ }
+
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/Hippogriff.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -1,13 +1,20 @@
package org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean;
import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Set;
+import java.util.TreeSet;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
+import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -27,7 +34,66 @@
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
{
};
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "ya")
+ })
+ public void testNewBeanCreatedForFieldInjectionPoint()
+ {
+ assert getInstanceByType(Griffin.class).getList() instanceof ArrayList<?>;
+ }
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "yc")
+ })
+ public void testNewBeanCreatedForInitializerInjectionPoint()
+ {
+ assert getInstanceByType(Dragon.class).getChildren() instanceof HashSet<?>;
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "ye")
+ })
+ public void testNewBeanCreatedForConstructorInjectioAnPoint()
+ {
+ assert getInstanceByType(Hippogriff.class).getHomes() instanceof HashMap<?, ?>;
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "yg")
+ })
+ public void testNewBeanCreatedForProducerMethod()
+ {
+ assert getInstanceByType(new TypeLiteral<Collection<Dragon>>() {}) instanceof ArrayList<?>;
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "yi")
+ })
+ public void testNewBeanCreatedForObserverMethod()
+ {
+ getCurrentManager().fireEvent(new Griffin());
+ assert getInstanceByType(Bestiary.class).getPossibleNames() instanceof TreeSet<?>;
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "3.12", id = "yk")
+ })
+ public void testNewBeanCreatedForDisposerMethod()
+ {
+ Bean<Collection<Dragon>> bean = getUniqueBean(new TypeLiteral<Collection<Dragon>>() {});
+ CreationalContext<Collection<Dragon>> ctx = getCurrentManager().createCreationalContext(bean);
+ Collection<Dragon> dragons = bean.create(ctx);
+ bean.destroy(dragons, ctx);
+ assert getInstanceByType(Bestiary.class).getKnightsWhichKilledTheDragons() instanceof LinkedHashSet<?>;
+ }
+
@Test(groups = { "new" })
@SpecAssertions({
@SpecAssertion(section = "3.12", id = "p")
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-19 00:08:13 UTC (rev 4186)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-19 00:12:42 UTC (rev 4187)
@@ -1565,11 +1565,41 @@
<group>
<text>Note that this second bean exists, is enabled, and is available for injection whenever the bean class is in the application classpath, even if the first bean is disabled, as defined by Section 5.2.2, “Enabled and disabled beans” or is deployed out- side of a bean deployment archive, as defined in Section 12.1, “Bean deployment archives”, and is therefore not discovered during the bean discovery process defined in Chapter 12, Packaging and deployment.</text>
<assertion id="ya">
- <text>Check that @New on a class outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ <text>Check that @New on a field injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
</assertion>
<assertion id="yb">
- <text>Check that @New on a class (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ <text>Check that @New on a field injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
</assertion>
+ <assertion id="yc">
+ <text>Check that @New on a initializer method injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yd">
+ <text>Check that @New on a initializer method injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="ye">
+ <text>Check that @New on a constructor injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yf">
+ <text>Check that @New on a constructor injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yg">
+ <text>Check that @New on a producer method injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yh">
+ <text>Check that @New on a producer method injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yi">
+ <text>Check that @New on a observer method injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yj">
+ <text>Check that @New on a observer method injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yk">
+ <text>Check that @New on a disposer method injection point outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yl">
+ <text>Check that @New on a disposer method injection point (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
</group>
<assertion id="z">
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -25,6 +25,7 @@
import javax.decorator.Decorates;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.Bean;
@@ -83,6 +84,10 @@
// The injection points
private Set<WeldInjectionPoint<?, ?>> injectionPoints;
private Set<WeldInjectionPoint<?, ?>> delegateInjectionPoints;
+
+ // The @New injection points
+ private Set<WeldInjectionPoint<?, ?>> newInjectionPoints;
+
// If the type a primitive?
private boolean primitive;
// The Bean manager
@@ -110,6 +115,7 @@
this.manager = manager;
this.injectionPoints = new HashSet<WeldInjectionPoint<?, ?>>();
this.delegateInjectionPoints = new HashSet<WeldInjectionPoint<?,?>>();
+ this.newInjectionPoints = new HashSet<WeldInjectionPoint<?,?>>();
}
/**
@@ -153,6 +159,10 @@
{
this.delegateInjectionPoints.add(injectionPoint);
}
+ if (injectionPoint.isAnnotationPresent(New.class))
+ {
+ this.newInjectionPoints.add(injectionPoint);
+ }
injectionPoints.add(injectionPoint);
}
@@ -390,6 +400,11 @@
{
return injectionPoints;
}
+
+ public Set<WeldInjectionPoint<?, ?>> getNewInjectionPoints()
+ {
+ return newInjectionPoints;
+ }
/**
* Gets the merged stereotypes of the bean
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -45,8 +45,8 @@
import org.jboss.weld.DeploymentException;
import org.jboss.weld.bean.proxy.DecoratorProxyMethodHandler;
import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
-import org.jboss.weld.context.SerializableContextualInstance;
import org.jboss.weld.context.SerializableContextual;
+import org.jboss.weld.context.SerializableContextualInstance;
import org.jboss.weld.injection.FieldInjectionPoint;
import org.jboss.weld.injection.MethodInjectionPoint;
import org.jboss.weld.introspector.WeldClass;
@@ -76,7 +76,6 @@
private List<Set<FieldInjectionPoint<?, ?>>> injectableFields;
// The initializer methods of each type in the type hierarchy, with the actual type at the bottom
private List<Set<MethodInjectionPoint<?, ?>>> initializerMethods;
- private Set<String> dependencies;
private List<Decorator<?>> decorators;
@@ -110,6 +109,8 @@
};
initStereotypes();
initPolicy();
+ initInitializerMethods();
+ initInjectableFields();
}
/**
@@ -118,8 +119,6 @@
@Override
public void initialize(BeanDeployerEnvironment environment)
{
- initInitializerMethods();
- initInjectableFields();
super.initialize(environment);
checkBeanImplementation();
initDecorators();
@@ -221,11 +220,6 @@
{
log.trace("Bean type specified in Java");
this.type = getAnnotatedItem().getJavaClass();
- this.dependencies = new HashSet<String>();
- for (Class<?> clazz = type.getSuperclass(); clazz != Object.class; clazz = clazz.getSuperclass())
- {
- dependencies.add(clazz.getName());
- }
}
/**
@@ -339,12 +333,6 @@
// TODO Make immutable
return injectableFields;
}
-
- // TODO maybe a better way to expose this?
- public Set<String> getSuperclasses()
- {
- return dependencies;
- }
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -35,6 +35,7 @@
import org.jboss.weld.injection.MethodInjectionPoint;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.introspector.WeldParameter;
+import org.jboss.weld.util.Beans;
public class DisposalMethod<X, T> extends AbstractReceiverBean<X, T, Method>
{
@@ -52,6 +53,7 @@
initTypes();
initStereotypes();
initPolicy();
+ addInjectionPoints(Beans.getParameterInjectionPoints(this, disposalMethodInjectionPoint));
}
private void initDisposesParameter()
@@ -67,7 +69,6 @@
@Override
public void initialize(BeanDeployerEnvironment environment)
{
- addInjectionPoint(disposalMethodInjectionPoint);
super.initialize(environment);
checkDisposalMethod();
initDisposesParameter();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -89,8 +89,13 @@
*/
public static <T> ManagedBean<T> of(WeldClass<T> clazz, BeanManagerImpl manager)
{
- return new ManagedBean<T>(clazz, new StringBuilder().append(ManagedBean.class.getSimpleName()).append(BEAN_ID_SEPARATOR).append(clazz.getName()).toString(), manager);
+ return new ManagedBean<T>(clazz, createId(ManagedBean.class.getSimpleName(), clazz), manager);
}
+
+ protected static String createId(String beanType, WeldClass<?> clazz)
+ {
+ return new StringBuilder().append(beanType).append(BEAN_ID_SEPARATOR).append(clazz.getBaseType()).toString();
+ }
/**
* Constructor
@@ -104,6 +109,7 @@
initType();
initTypes();
initBindings();
+ initConstructor();
}
/**
@@ -173,7 +179,6 @@
{
if (!isInitialized())
{
- initConstructor();
checkConstructor();
super.initialize(environment);
initPostConstruct();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -43,7 +43,7 @@
*/
public static <T> NewManagedBean<T> of(WeldClass<T> clazz, BeanManagerImpl manager)
{
- return new NewManagedBean<T>(clazz, new StringBuilder().append(NewManagedBean.class.getSimpleName()).append(BEAN_ID_SEPARATOR).append(clazz.getName()).toString(), manager);
+ return new NewManagedBean<T>(clazz, createId(NewManagedBean.class.getSimpleName(), clazz), manager);
}
private Set<Annotation> bindings;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -46,7 +46,7 @@
public static <T> NewSessionBean<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
WeldClass<T> type = manager.getServices().get(ClassTransformer.class).loadClass(ejbDescriptor.getBeanClass());
- return new NewSessionBean<T>(type, ejbDescriptor, new StringBuilder().append(NewSessionBean.class.getSimpleName()).append(BEAN_ID_SEPARATOR).append(ejbDescriptor.getEjbName()).toString(), manager);
+ return new NewSessionBean<T>(type, ejbDescriptor, createId(NewSessionBean.class.getSimpleName(), ejbDescriptor), manager);
}
private Set<Annotation> bindings;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -79,6 +79,7 @@
this.id = new StringBuilder().append(BEAN_ID_PREFIX).append(getClass().getSimpleName()).append(BEAN_ID_SEPARATOR).append(declaringBean.getAnnotatedItem().getName()).append(getAnnotatedItem().getSignature().toString()).toString();
initStereotypes();
initPolicy();
+ initProducerMethodInjectableParameters();
}
/**
@@ -89,7 +90,6 @@
{
if (!isInitialized())
{
- initProducerMethodInjectableParameters();
super.initialize(environment);
checkProducerMethod();
initDisposalMethod(environment);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -92,9 +92,14 @@
public static <T> SessionBean<T> of(InternalEjbDescriptor<T> ejbDescriptor, BeanManagerImpl manager)
{
WeldClass<T> type = manager.getServices().get(ClassTransformer.class).loadClass(ejbDescriptor.getBeanClass());
- return new SessionBean<T>(type, ejbDescriptor, new StringBuilder().append(SessionBean.class.getSimpleName()).append(BEAN_ID_SEPARATOR).append(ejbDescriptor.getEjbName()).toString(), manager);
+ return new SessionBean<T>(type, ejbDescriptor, createId(SessionBean.class.getSimpleName(), ejbDescriptor) , manager);
}
+ protected static String createId(String beanType, InternalEjbDescriptor<?> ejbDescriptor)
+ {
+ return new StringBuilder().append(beanType).append(BEAN_ID_SEPARATOR).append(ejbDescriptor.getEjbName()).toString();
+ }
+
/**
* Constructor
*
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -23,6 +23,7 @@
import javax.validation.Validator;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.Container;
import org.jboss.weld.util.collections.Arrays2;
import org.jboss.weld.validation.spi.ValidationServices;
@@ -55,7 +56,7 @@
{
if (getManager().getServices().contains(ValidationServices.class))
{
- return getManager().getServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
+ return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
}
else
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -102,6 +102,11 @@
// getting lazy created
return null;
}
+ if (proxiedInstance == null)
+ {
+ // TODO not sure if this right PLM
+ return null;
+ }
if (proxiedMethod.getName().equals("equals") && proxiedMethod.getParameterTypes().length == 1 && proxiedMethod.getParameterTypes()[0] == Object.class && args[0] == self)
{
return true;
@@ -109,7 +114,7 @@
try
{
Object returnValue = Reflections.lookupMethod(proxiedMethod, proxiedInstance).invoke(proxiedInstance, args);
- log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + Arrays.toString(args) + " and got return value " + returnValue);
+ log.trace("Executed method " + proxiedMethod + " on " + proxiedInstance + " with parameters " + Arrays.toString(args) + " and got return value " + returnValue == null ? null : returnValue);
return returnValue;
}
catch (InvocationTargetException e)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -23,7 +23,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import javax.interceptor.Interceptor;
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.bean.AbstractClassBean;
@@ -155,7 +154,7 @@
* The class bean
*
*/
- protected <T> void createSubBeans(AbstractClassBean<T> bean)
+ protected <T> void createObserversProducersDisposers(AbstractClassBean<T> bean)
{
createProducerMethods(bean, bean.getAnnotatedItem());
createProducerFields(bean, bean.getAnnotatedItem());
@@ -181,14 +180,14 @@
{
DisposalMethod<X, ?> disposalBean = DisposalMethod.of(manager, method, declaringBean);
disposalBean.initialize(getEnvironment());
- getEnvironment().addBean(disposalBean);
+ getEnvironment().addDisposesMethod(disposalBean);
}
}
protected <X, T> void createProducerMethod(AbstractClassBean<X> declaringBean, WeldMethod<T, X> annotatedMethod)
{
ProducerMethod<X, T> bean = ProducerMethod.of(annotatedMethod, declaringBean, manager);
- getEnvironment().addBean(bean);
+ getEnvironment().addProducerMethod(bean);
}
protected <X, T> void createProducerField(AbstractClassBean<X> declaringBean, WeldField<T, X> field)
@@ -206,7 +205,7 @@
{
bean = ProducerField.of(field, declaringBean, manager);
}
- getEnvironment().addBean(bean);
+ getEnvironment().addProducerField(bean);
}
protected <X> void createProducerFields(AbstractClassBean<X> declaringBean, WeldClass<X> annotatedClass)
@@ -228,38 +227,48 @@
protected <X, T> void createObserverMethod(RIBean<X> declaringBean, WeldMethod<T, X> method)
{
ObserverMethodImpl<X, T> observer = ObserverFactory.create(method, declaringBean, manager);
- getEnvironment().addObserver(observer);
+ getEnvironment().addObserverMethod(observer);
}
- protected <T> void createSimpleBean(WeldClass<T> annotatedClass)
+ protected <T> ManagedBean<T> createManagedBean(WeldClass<T> annotatedClass)
{
ManagedBean<T> bean = ManagedBean.of(annotatedClass, manager);
- getEnvironment().addBean(bean);
- createSubBeans(bean);
- getEnvironment().addBean(NewManagedBean.of(annotatedClass, manager));
+ getEnvironment().addManagedBean(bean);
+ createObserversProducersDisposers(bean);
+ return bean;
}
+ protected <T> void createNewManagedBean(WeldClass<T> annotatedClass)
+ {
+ getEnvironment().addManagedBean(NewManagedBean.of(annotatedClass, manager));
+ }
+
protected <T> void createDecorator(WeldClass<T> annotatedClass)
{
DecoratorImpl<T> bean = DecoratorImpl.of(annotatedClass, manager);
- getEnvironment().addBean(bean);
+ getEnvironment().addDecorator(bean);
}
protected <T> void createInterceptor(WeldClass<T> annotatedClass)
{
InterceptorImpl<T> bean = InterceptorImpl.of(annotatedClass, manager);
- getEnvironment().addBean(bean);
+ getEnvironment().addInterceptor(bean);
}
- protected <T> void createEnterpriseBean(InternalEjbDescriptor<T> ejbDescriptor)
+ protected <T> SessionBean<T> createSessionBean(InternalEjbDescriptor<T> ejbDescriptor)
{
// TODO Don't create enterprise bean if it has no local interfaces!
SessionBean<T> bean = SessionBean.of(ejbDescriptor, manager);
- getEnvironment().addBean(bean);
- createSubBeans(bean);
- getEnvironment().addBean(NewSessionBean.of(ejbDescriptor, manager));
+ getEnvironment().addSessionBean(bean);
+ createObserversProducersDisposers(bean);
+ return bean;
}
+ protected <T> void createNewSessionBean(InternalEjbDescriptor<T> ejbDescriptor)
+ {
+ getEnvironment().addSessionBean(NewSessionBean.of(ejbDescriptor, manager));
+ }
+
/**
* Indicates if the type is a simple Web Bean
*
@@ -267,7 +276,7 @@
* The type to inspect
* @return True if simple Web Bean, false otherwise
*/
- protected boolean isTypeManagedBeanOrDecorator(WeldClass<?> clazz)
+ protected boolean isTypeManagedBeanOrDecoratorOrInterceptor(WeldClass<?> clazz)
{
Class<?> javaClass = clazz.getJavaClass();
EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -40,7 +40,6 @@
{
private final BeanManagerImpl deploymentManager;
-
private final Set<WeldClass<?>> classes;
/**
@@ -97,7 +96,7 @@
{
for (WeldClass<?> clazz : classes)
{
- boolean managedBeanOrDecorator = !getEnvironment().getEjbDescriptors().contains(clazz.getJavaClass()) && isTypeManagedBeanOrDecorator(clazz);
+ boolean managedBeanOrDecorator = !getEnvironment().getEjbDescriptors().contains(clazz.getJavaClass()) && isTypeManagedBeanOrDecoratorOrInterceptor(clazz);
if (managedBeanOrDecorator && clazz.isAnnotationPresent(Decorator.class))
{
validateDecorator(clazz);
@@ -110,14 +109,24 @@
}
else if (managedBeanOrDecorator && !clazz.isAbstract())
{
- createSimpleBean(clazz);
+ createManagedBean(clazz);
}
}
- // TODO Iterate over newClasses and add a new bean for each
for (InternalEjbDescriptor<?> ejbDescriptor : getEnvironment().getEjbDescriptors())
{
- createEnterpriseBean(ejbDescriptor);
+ createSessionBean(ejbDescriptor);
}
+
+ // Now create the new beans
+ for (WeldClass<?> clazz : getEnvironment().getNewManagedBeanClasses())
+ {
+ createNewManagedBean(clazz);
+ }
+ for (InternalEjbDescriptor<?> descriptor : getEnvironment().getNewSessionBeanDescriptors())
+ {
+ createNewSessionBean(descriptor);
+ }
+
return this;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -27,22 +27,30 @@
import java.util.Set;
import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.AbstractBean;
import org.jboss.weld.bean.AbstractClassBean;
import org.jboss.weld.bean.DecoratorImpl;
import org.jboss.weld.bean.DisposalMethod;
import org.jboss.weld.bean.InterceptorImpl;
+import org.jboss.weld.bean.ManagedBean;
import org.jboss.weld.bean.NewBean;
+import org.jboss.weld.bean.NewManagedBean;
+import org.jboss.weld.bean.NewSessionBean;
import org.jboss.weld.bean.ProducerField;
import org.jboss.weld.bean.ProducerMethod;
import org.jboss.weld.bean.RIBean;
+import org.jboss.weld.bean.SessionBean;
import org.jboss.weld.bean.builtin.AbstractBuiltInBean;
import org.jboss.weld.bean.builtin.ExtensionBean;
import org.jboss.weld.ejb.EjbDescriptors;
+import org.jboss.weld.ejb.InternalEjbDescriptor;
import org.jboss.weld.event.ObserverMethodImpl;
+import org.jboss.weld.injection.WeldInjectionPoint;
import org.jboss.weld.introspector.WeldClass;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.resolution.ResolvableFactory;
import org.jboss.weld.resolution.TypeSafeDisposerResolver;
+import org.jboss.weld.resources.ClassTransformer;
public class BeanDeployerEnvironment
{
@@ -57,6 +65,9 @@
private final Set<InterceptorImpl<?>> interceptors;
private final EjbDescriptors ejbDescriptors;
private final TypeSafeDisposerResolver disposalMethodResolver;
+ private final ClassTransformer classTransformer;
+ private final Set<WeldClass<?>> newManagedBeanClasses;
+ private final Set<InternalEjbDescriptor<?>> newSessionBeanDescriptors;
public BeanDeployerEnvironment(EjbDescriptors ejbDescriptors, BeanManagerImpl manager)
{
@@ -70,7 +81,20 @@
this.observers = new HashSet<ObserverMethodImpl<?, ?>>();
this.ejbDescriptors = ejbDescriptors;
this.disposalMethodResolver = new TypeSafeDisposerResolver(manager, allDisposalBeans);
+ this.classTransformer = manager.getServices().get(ClassTransformer.class);
+ this.newManagedBeanClasses = new HashSet<WeldClass<?>>();
+ this.newSessionBeanDescriptors = new HashSet<InternalEjbDescriptor<?>>();
}
+
+ public Set<WeldClass<?>> getNewManagedBeanClasses()
+ {
+ return newManagedBeanClasses;
+ }
+
+ public Set<InternalEjbDescriptor<?>> getNewSessionBeanDescriptors()
+ {
+ return newSessionBeanDescriptors;
+ }
public <X, T> ProducerMethod<X, T> getProducerMethod(WeldMethod<X, T> method)
{
@@ -100,55 +124,106 @@
}
}
- public void addBean(ProducerMethod<?, ?> bean)
+ public void addProducerMethod(ProducerMethod<?, ?> bean)
{
producerMethodBeanMap.put(bean.getAnnotatedItem(), bean);
- beans.add(bean);
+ addAbstractBean(bean);
}
- public void addBean(ProducerField<?, ?> bean)
+ public void addProducerField(ProducerField<?, ?> bean)
{
- beans.add(bean);
+ addAbstractBean(bean);
}
- public void addBean(ExtensionBean bean)
+ public void addExtension(ExtensionBean bean)
{
beans.add(bean);
}
- public void addBean(AbstractBuiltInBean<?> bean)
+ public void addBuiltInBean(AbstractBuiltInBean<?> bean)
{
beans.add(bean);
}
- public void addBean(AbstractClassBean<?> bean)
+ protected void addAbstractClassBean(AbstractClassBean<?> bean)
{
if (!(bean instanceof NewBean))
{
classBeanMap.put(bean.getAnnotatedItem(), bean);
}
+ addAbstractBean(bean);
+ }
+
+ public void addManagedBean(ManagedBean<?> bean)
+ {
+ newManagedBeanClasses.add(bean.getAnnotatedItem());
+ addAbstractClassBean(bean);
+ }
+
+ public void addSessionBean(SessionBean<?> bean)
+ {
+ newSessionBeanDescriptors.add(bean.getEjbDescriptor());
+ addAbstractClassBean(bean);
+ }
+
+ public void addNewManagedBean(NewManagedBean<?> bean)
+ {
beans.add(bean);
}
+
+ public void addNewSessionBean(NewSessionBean<?> bean)
+ {
+ beans.add(bean);
+ }
+
+ protected void addAbstractBean(AbstractBean<?, ?> bean)
+ {
+ addNewBeansFromInjectionPoints(bean);
+ beans.add(bean);
+ }
- public void addBean(DecoratorImpl<?> bean)
+ public void addDecorator(DecoratorImpl<?> bean)
{
decorators.add(bean);
}
- public void addBean(InterceptorImpl<?> bean)
+ public void addInterceptor(InterceptorImpl<?> bean)
{
interceptors.add(bean);
}
- public void addBean(DisposalMethod<?, ?> bean)
+ public void addDisposesMethod(DisposalMethod<?, ?> bean)
{
allDisposalBeans.add(bean);
+ addNewBeansFromInjectionPoints(bean);
}
- public void addObserver(ObserverMethodImpl<?, ?> observer)
+ public void addObserverMethod(ObserverMethodImpl<?, ?> observer)
{
this.observers.add(observer);
+ addNewBeansFromInjectionPoints(observer.getNewInjectionPoints());
}
+
+
+ private void addNewBeansFromInjectionPoints(AbstractBean<?, ?> bean)
+ {
+ addNewBeansFromInjectionPoints(bean.getNewInjectionPoints());
+ }
+
+ private void addNewBeansFromInjectionPoints(Set<WeldInjectionPoint<?, ?>> newInjectionPoints)
+ {
+ for (WeldInjectionPoint<?, ?> injectionPoint : newInjectionPoints)
+ {
+ if (getEjbDescriptors().contains(injectionPoint.getJavaClass()))
+ {
+ newSessionBeanDescriptors.add(getEjbDescriptors().getUnique(injectionPoint.getJavaClass()));
+ }
+ else
+ {
+ newManagedBeanClasses.add(classTransformer.loadClass(injectionPoint.getJavaClass(), injectionPoint.getBaseType()));
+ }
+ }
+ }
public Set<? extends RIBean<?>> getBeans()
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -152,10 +152,10 @@
}
}
beanDeployer.addClasses(beanDeploymentArchive.getBeanClasses());
- beanDeployer.getEnvironment().addBean(new ManagerBean(beanManager));
- beanDeployer.getEnvironment().addBean(new InjectionPointBean(beanManager));
- beanDeployer.getEnvironment().addBean(new EventBean(beanManager));
- beanDeployer.getEnvironment().addBean(new InstanceBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new ManagerBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new InjectionPointBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new EventBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new InstanceBean(beanManager));
if (!environment.equals(Environments.SE))
{
beanDeployer.addClass(ConversationImpl.class);
@@ -166,16 +166,16 @@
}
if (beanManager.getServices().contains(TransactionServices.class))
{
- beanDeployer.getEnvironment().addBean(new UserTransactionBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new UserTransactionBean(beanManager));
}
if (beanManager.getServices().contains(SecurityServices.class))
{
- beanDeployer.getEnvironment().addBean(new PrincipalBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new PrincipalBean(beanManager));
}
if (beanManager.getServices().contains(ValidationServices.class))
{
- beanDeployer.getEnvironment().addBean(new DefaultValidatorBean(beanManager));
- beanDeployer.getEnvironment().addBean(new DefaultValidatorFactoryBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new DefaultValidatorBean(beanManager));
+ beanDeployer.getEnvironment().addBuiltInBean(new DefaultValidatorFactoryBean(beanManager));
}
beanDeployer.createBeans().deploy();
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployer.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -53,7 +53,7 @@
ExtensionBean bean = new ExtensionBean(getManager(), clazz, extension);
this.
- getEnvironment().addBean(bean);
+ getEnvironment().addExtension(bean);
createObserverMethods(bean, clazz);
}
return this;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployerEnvironment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployerEnvironment.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/ExtensionBeanDeployerEnvironment.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -26,7 +26,7 @@
}
@Override
- public void addBean(ExtensionBean bean)
+ public void addExtension(ExtensionBean bean)
{
extensionBeans.add(bean);
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/ejb/EjbDescriptors.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/ejb/EjbDescriptors.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/ejb/EjbDescriptors.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -21,10 +21,15 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import org.jboss.weld.bootstrap.api.Service;
import org.jboss.weld.ejb.spi.EjbDescriptor;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.SetMultimap;
+
/**
* EJB descriptors by EJB implementation class or name
*
@@ -34,9 +39,9 @@
public class EjbDescriptors implements Service, Iterable<InternalEjbDescriptor<?>>
{
// EJB name -> EJB descriptors map
- private final Map<String, InternalEjbDescriptor<?>> ejbs;
+ private final Map<String, InternalEjbDescriptor<?>> ejbByName;
- private final Collection<Class<?>> ejbClasses;
+ private final SetMultimap<Class<?>, String> ejbByClass;
public static final EjbDescriptors EMPTY = new EjbDescriptors()
{
@@ -72,8 +77,16 @@
*/
public EjbDescriptors()
{
- this.ejbs = new HashMap<String, InternalEjbDescriptor<?>>();
- this.ejbClasses = new HashSet<Class<?>>();
+ this.ejbByName = new HashMap<String, InternalEjbDescriptor<?>>();
+ this.ejbByClass = Multimaps.newSetMultimap(new HashMap<Class<?>, Collection<String>>(), new Supplier<Set<String>>()
+ {
+
+ public Set<String> get()
+ {
+ return new HashSet<String>();
+ }
+
+ });
}
/**
@@ -85,7 +98,7 @@
@SuppressWarnings("unchecked")
public <T> InternalEjbDescriptor<T> get(String beanName)
{
- return (InternalEjbDescriptor<T>) ejbs.get(beanName);
+ return (InternalEjbDescriptor<T>) ejbByName.get(beanName);
}
/**
@@ -96,8 +109,8 @@
public <T> void add(EjbDescriptor<T> ejbDescriptor)
{
InternalEjbDescriptor<T> internalEjbDescriptor = new InternalEjbDescriptor<T>(ejbDescriptor);
- ejbs.put(ejbDescriptor.getEjbName(), internalEjbDescriptor);
- ejbClasses.add(ejbDescriptor.getBeanClass());
+ ejbByName.put(ejbDescriptor.getEjbName(), internalEjbDescriptor);
+ ejbByClass.put(ejbDescriptor.getBeanClass(), internalEjbDescriptor.getEjbName());
}
/**
@@ -109,7 +122,7 @@
*/
public boolean contains(String beanName)
{
- return ejbs.containsKey(beanName);
+ return ejbByName.containsKey(beanName);
}
/**
@@ -121,9 +134,26 @@
*/
public boolean contains(Class<?> beanClass)
{
- return ejbClasses.contains(beanClass);
+ return ejbByClass.containsKey(beanClass);
}
-
+
+ public InternalEjbDescriptor<?> getUnique(Class<?> beanClass)
+ {
+ Set<String> ejbs = ejbByClass.get(beanClass);
+ if (ejbs.size() > 0)
+ {
+ throw new IllegalStateException("Unable to determine EJB for " + beanClass + ", multiple EJBs with that class " + ejbs);
+ }
+ else if (ejbs.size() == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return get(ejbs.iterator().next());
+ }
+ }
+
/**
* Adds all EJB descriptors to the maps
*
@@ -142,18 +172,18 @@
*/
public void clear()
{
- ejbs.clear();
+ ejbByName.clear();
}
public Iterator<InternalEjbDescriptor<?>> iterator()
{
- return ejbs.values().iterator();
+ return ejbByName.values().iterator();
}
public void cleanup()
{
- this.ejbClasses.clear();
- this.ejbs.clear();
+ this.ejbByClass.clear();
+ this.ejbByName.clear();
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -31,6 +31,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.event.TransactionPhase;
import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.ObserverMethod;
@@ -41,16 +42,19 @@
import org.jboss.weld.DefinitionException;
import org.jboss.weld.bean.RIBean;
import org.jboss.weld.injection.MethodInjectionPoint;
+import org.jboss.weld.injection.WeldInjectionPoint;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.introspector.WeldParameter;
import org.jboss.weld.manager.api.ExecutorServices;
+import org.jboss.weld.util.Beans;
/**
* <p>
- * Reference implementation for the ObserverMethod interface, which represents an
- * observer method. Each observer method has an event type which is the class of
- * the event object being observed, and event binding types that are annotations
- * applied to the event parameter to narrow the event notifications delivered.
+ * Reference implementation for the ObserverMethod interface, which represents
+ * an observer method. Each observer method has an event type which is the class
+ * of the event object being observed, and event binding types that are
+ * annotations applied to the event parameter to narrow the event notifications
+ * delivered.
* </p>
*
* @author David Allen
@@ -67,6 +71,8 @@
protected final MethodInjectionPoint<T, X> observerMethod;
protected TransactionPhase transactionPhase;
+ private final Set<WeldInjectionPoint<?, ?>> newInjectionPoints;
+
/**
* Creates an Observer which describes and encapsulates an observer method
* (8.5).
@@ -86,8 +92,21 @@
Observes observesAnnotation = observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class);
this.notifyType = observesAnnotation.notifyObserver();
transactionPhase = TransactionPhase.IN_PROGRESS;
+ this.newInjectionPoints = new HashSet<WeldInjectionPoint<?, ?>>();
+ for (WeldInjectionPoint<?, ?> injectionPoint : Beans.getParameterInjectionPoints(null, observerMethod))
+ {
+ if (injectionPoint.isAnnotationPresent(New.class))
+ {
+ this.newInjectionPoints.add(injectionPoint);
+ }
+ }
}
+ public Set<WeldInjectionPoint<?, ?>> getNewInjectionPoints()
+ {
+ return newInjectionPoints;
+ }
+
/**
* Performs validation of the observer method for compliance with the
* specifications.
@@ -117,10 +136,12 @@
{
throw new DefinitionException("Cannot use a type variable " + type + " in an parameterized type " + toString());
}
-// else if (type instanceof WildcardType)
-// {
-// throw new DefinitionException("Cannot use a wildcard variable " + type + " in an parameterized type " + toString());
-// }
+ // else if (type instanceof WildcardType)
+ // {
+ // throw new
+ // DefinitionException("Cannot use a wildcard variable " + type +
+ // " in an parameterized type " + toString());
+ // }
}
}
}
@@ -173,7 +194,7 @@
{
return transactionPhase;
}
-
+
/**
* @return the observerMethod
*/
@@ -217,7 +238,8 @@
{
return;
}
- // As we are working with the contextual instance, we may not have the actual object, but a container proxy (e.g. EJB)
+ // As we are working with the contextual instance, we may not have the
+ // actual object, but a container proxy (e.g. EJB)
observerMethod.invokeOnInstanceWithSpecialValue(instance, Observes.class, event, manager, creationalContext, ObserverException.class);
}
finally
@@ -231,6 +253,7 @@
/**
* Queues the event for later execution
+ *
* @param event
*/
protected void sendEventAsynchronously(final T event)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -19,6 +19,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
@@ -166,10 +167,10 @@
@Override
public boolean equals(Object other)
{
- if (other instanceof WeldAnnotated)
+ if (other instanceof WeldAnnotated<?, ?>)
{
WeldAnnotated<?, ?> that = (WeldAnnotated<?, ?>) other;
- return this.getAnnotations().equals(that.getAnnotations()) && this.getJavaClass().equals(that.getJavaClass());
+ return this.getAnnotations().equals(that.getAnnotations()) && this.getJavaClass().equals(that.getJavaClass()) && this.getActualTypeArguments().length == that.getActualTypeArguments().length && Arrays.equals(this.getActualTypeArguments(), that.getActualTypeArguments());
}
return false;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -136,6 +136,12 @@
AnnotationStore annotationStore = AnnotationStore.of(annotatedType.getAnnotations(), annotatedType.getAnnotations(), classTransformer.getTypeStore());
return new WeldClassImpl<T>(annotatedType.getJavaClass(), annotatedType.getBaseType(), annotatedType, annotationStore, classTransformer);
}
+
+ public static <T> WeldClass<T> of(Class<T> rawType, Type type, ClassTransformer classTransformer)
+ {
+ AnnotationStore annotationStore = AnnotationStore.of(rawType.getAnnotations(), rawType.getDeclaredAnnotations(), classTransformer.getTypeStore());
+ return new WeldClassImpl<T>(rawType, type, null, annotationStore, classTransformer);
+ }
protected WeldClassImpl(Class<T> rawType, Type type, AnnotatedType<T> annotatedType, AnnotationStore annotationStore, ClassTransformer classTransformer)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -17,6 +17,7 @@
package org.jboss.weld.resources;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
import java.util.concurrent.Callable;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -32,7 +33,7 @@
public class ClassTransformer implements Service
{
- private final ConcurrentCache<Class<?>, WeldClass<?>> classes;
+ private final ConcurrentCache<Type, WeldClass<?>> classes;
private final ConcurrentCache<AnnotatedType<?>, WeldClass<?>> annotatedTypes;
private final ConcurrentCache<Class<?>, WeldAnnotation<?>> annotations;
private final TypeStore typeStore;
@@ -42,21 +43,33 @@
*/
public ClassTransformer(TypeStore typeStore)
{
- classes = new ConcurrentCache<Class<?>, WeldClass<?>>();
+ classes = new ConcurrentCache<Type, WeldClass<?>>();
this.annotatedTypes = new ConcurrentCache<AnnotatedType<?>, WeldClass<?>>();
annotations = new ConcurrentCache<Class<?>, WeldAnnotation<?>>();
this.typeStore = typeStore;
}
+ public <T> WeldClass<T> loadClass(final Class<T> rawType, final Type baseType)
+ {
+ return classes.putIfAbsent(baseType, new Callable<WeldClass<T>>()
+ {
+
+ public WeldClass<T> call() throws Exception
+ {
+ return WeldClassImpl.of(rawType, baseType, ClassTransformer.this);
+ }
+
+ });
+ }
+
public <T> WeldClass<T> loadClass(final Class<T> clazz)
{
- final ClassTransformer transformer = this;
return classes.putIfAbsent(clazz, new Callable<WeldClass<T>>()
{
public WeldClass<T> call() throws Exception
{
- return WeldClassImpl.of(clazz, transformer);
+ return WeldClassImpl.of(clazz, ClassTransformer.this);
}
});
@@ -64,13 +77,12 @@
public <T> WeldClass<T> loadClass(final AnnotatedType<T> clazz)
{
- final ClassTransformer transformer = this;
return annotatedTypes.putIfAbsent(clazz, new Callable<WeldClass<T>>()
{
public WeldClass<T> call() throws Exception
{
- return WeldClassImpl.of(clazz, transformer);
+ return WeldClassImpl.of(clazz, ClassTransformer.this);
}
});
@@ -78,13 +90,12 @@
public <T extends Annotation> WeldAnnotation<T> loadAnnotation(final Class<T> clazz)
{
- final ClassTransformer transformer = this;
return annotations.putIfAbsent(clazz, new Callable<WeldAnnotation<T>>()
{
public WeldAnnotation<T> call() throws Exception
{
- return WeldAnnotationImpl.of(clazz, transformer);
+ return WeldAnnotationImpl.of(clazz, ClassTransformer.this);
}
});
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -17,7 +17,6 @@
package org.jboss.weld.util;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
@@ -398,6 +397,16 @@
return injectionPoints;
}
+ public static Set<ParameterInjectionPoint<?, ?>> getParameterInjectionPoints(Bean<?> declaringBean, MethodInjectionPoint<?, ?> method)
+ {
+ Set<ParameterInjectionPoint<?,?>> injectionPoints = new HashSet<ParameterInjectionPoint<?,?>>();
+ for (WeldParameter<?, ?> parameter : method.getWBParameters())
+ {
+ injectionPoints.add(ParameterInjectionPoint.of(declaringBean, parameter));
+ }
+ return injectionPoints;
+ }
+
public static Set<ParameterInjectionPoint<?, ?>> getParameterInjectionPoints(Bean<?> declaringBean, List<Set<MethodInjectionPoint<?, ?>>> methodInjectionPoints)
{
Set<ParameterInjectionPoint<?, ?>> injectionPoints = new HashSet<ParameterInjectionPoint<?,?>>();
Modified: core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Producers.java
===================================================================
--- core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Producers.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/inject-tck-runner/src/test/java/org/jboss/weld/atinject/tck/Producers.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -10,10 +10,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Typed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Qualifier;
@@ -22,7 +21,6 @@
import org.atinject.tck.auto.Seat;
import org.atinject.tck.auto.Tire;
import org.atinject.tck.auto.accessories.SpareTire;
-import org.jboss.weld.atinject.tck.util.NonContextual;
/**
* Producer methods for the @Inject TCK beans we need greater control over
@@ -32,16 +30,6 @@
*/
public class Producers
{
-
- private final NonContextual<SpareTire> spareTire;
- private final NonContextual<DriversSeat> driversSeat;
-
- @Inject
- public Producers(BeanManager beanManager)
- {
- this.spareTire = new NonContextual<SpareTire>(beanManager, SpareTire.class);
- this.driversSeat = new NonContextual<DriversSeat>(beanManager, DriversSeat.class);
- }
/**
* Producer method for a bean with qualifier @Drivers and types Seat, Object
@@ -49,9 +37,9 @@
* @return
*/
@Produces @Drivers
- public Seat produceAtDriversSeat()
+ public Seat produceAtDriversSeat(@New DriversSeat driversSeat)
{
- return driversSeat.newInstance().produce().inject().get();
+ return driversSeat;
}
/**
@@ -60,9 +48,9 @@
* @return
*/
@Produces @Typed(DriversSeat.class)
- public DriversSeat produceDriversSeat()
+ public DriversSeat produceDriversSeat(@New DriversSeat driversSeat)
{
- return driversSeat.newInstance().produce().inject().get();
+ return driversSeat;
}
@Qualifier
@@ -81,18 +69,18 @@
*
*/
@Produces @Named("spare") @Spare
- public Tire produceAtNamedSpareTire()
+ public Tire produceAtNamedSpareTire(@New SpareTire spareTire)
{
- return spareTire.newInstance().produce().inject().get();
+ return spareTire;
}
/**
* Producer method for bean with default qualifiers and type SpareTire only
*/
@Produces @Typed(SpareTire.class)
- public SpareTire produceSpareTire()
+ public SpareTire produceSpareTire(@New SpareTire spareTire)
{
- return spareTire.newInstance().produce().inject().get();
+ return spareTire;
}
}
Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java 2009-10-19 00:08:13 UTC (rev 4186)
+++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockValidationServices.java 2009-10-19 00:12:42 UTC (rev 4187)
@@ -16,6 +16,11 @@
*/
package org.jboss.weld.mock;
+import javax.validation.ConstraintValidatorFactory;
+import javax.validation.MessageInterpolator;
+import javax.validation.TraversableResolver;
+import javax.validation.Validator;
+import javax.validation.ValidatorContext;
import javax.validation.ValidatorFactory;
import org.jboss.weld.validation.spi.ValidationServices;
@@ -29,7 +34,45 @@
public ValidatorFactory getDefaultValidatorFactory()
{
- return null;
+ return new ValidatorFactory()
+ {
+
+ public ValidatorContext usingContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> T unwrap(Class<T> type)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Validator getValidator()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public TraversableResolver getTraversableResolver()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public MessageInterpolator getMessageInterpolator()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ConstraintValidatorFactory getConstraintValidatorFactory()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ };
}
public void cleanup() {}
14 years, 8 months
- 1
- 0
Weld SVN: r4186 - cdi-tck/trunk/doc/reference/en-US.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-10-18 20:08:13 -0400 (Sun, 18 Oct 2009)
New Revision: 4186
Added:
cdi-tck/trunk/doc/reference/en-US/sigtest.xml
Modified:
cdi-tck/trunk/doc/reference/en-US/master.xml
Log:
added sigtest section
Modified: cdi-tck/trunk/doc/reference/en-US/master.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/master.xml 2009-10-18 23:22:43 UTC (rev 4185)
+++ cdi-tck/trunk/doc/reference/en-US/master.xml 2009-10-19 00:08:13 UTC (rev 4186)
@@ -6,6 +6,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="part-background.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="part-execution.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="part-test-harness.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sigtest.xml" />
<!--
vim: ts=3:sw=3:tw=80:set expandtab
-->
Added: cdi-tck/trunk/doc/reference/en-US/sigtest.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/sigtest.xml (rev 0)
+++ cdi-tck/trunk/doc/reference/en-US/sigtest.xml 2009-10-19 00:08:13 UTC (rev 4186)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
+<chapter id="sigtest">
+ <title>Running the Signature Test</title>
+ <para>
+ One of the requirements of an implementation passing the TCK is for it to pass the CDI signature test.
+ This section describes how the signature file is generated and how to run it against your implementation.
+ </para>
+
+ <section>
+ <title>Obtaining the sigtest tool</title>
+ <para>
+ You can obtain the Sigtest tool from the Sigtest home page at <ulink url="https://sigtest.dev.java.net/"/>.
+ The user guide can be found at <ulink url="http://java.sun.com/javame/sigtest/docs/sigtest2.1_usersguide.pdf"/>.
+ </para>
+ </section>
+
+ <section>
+ <title>Generating the signature file</title>
+ <para>
+ The general command for generating a signature file looks like this:
+ </para>
+
+ <programlisting><![CDATA[
+java -cp %JAVA_HOME%\jre\lib\rt.jar%;sigtestdev.jar com.sun.tdk.signaturetest.Setup -Package javax.decorator -Package javax.enterprise -Package javax.event -Package javax.inject -Package javax.interceptor -FileName weld.sig -Classpath .;%JAVA_HOME%\jre\lib\rt.jar -static]]></programlisting>
+
+ <para>
+ Here's a working example with the classpaths filled out:
+ </para>
+
+ <programlisting><![CDATA[
+java -cp %JAVA_HOME%\jre\lib\rt.jar;/home/shane/java/sigtest-2.0/lib/sigtestdev.jar com.sun.tdk.signaturetest.Setup -Package javax.decorator -Package javax.enterprise -Package javax.event -Package javax.inject -Package javax.interceptor -FileName weld.sig -Classpath .;%JAVA_HOME%/jre/lib/rt.jar;/home/shane/.m2/repository/org/jboss/weld/jsr299-api/1.0.0-SNAPSHOT/jsr299-api-1.0.0-SNAPSHOT.jar;/home/shane/.m2/repository/javax/el/el-api/1.2/el-api-1.2.jar -static]]></programlisting>
+ </section>
+
+ <section>
+ <title>Running the signature test</title>
+
+ <para>To run the signature test simply change the execution class from <literal>Setup</literal> to <literal>SignatureTest</literal>:</para>
+
+ <programlisting><![CDATA[
+java -cp %JAVA_HOME%\jre\lib\rt.jar%;sigtestdev.jar com.sun.tdk.signaturetest.SignatureTest -Package javax.decorator -Package javax.enterprise -Package javax.event -Package javax.inject -Package javax.interceptor -FileName weld.sig -Classpath .;%JAVA_HOME%\jre\lib\rt.jar -static]]></programlisting>
+
+ <para>Here's a working example:</para>
+
+ <programlisting><![CDATA[java -cp %JAVA_HOME%\jre\lib\rt.jar;/home/shane/java/sigtest-2.0/lib/sigtestdev.jar com.sun.tdk.signaturetest.SignatureTest -Package javax.decorator -Package javax.enterprise -Package javax.event -Package javax.inject -Package javax.interceptor -FileName weld.sig -Classpath .;%JAVA_HOME%\jre\lib\rt.jar;/home/shane/.m2/repository/org/jboss/weld/jsr299-api/1.0.0-SNAPSHOT/jsr299-api-1.0.0-SNAPSHOT.jar;/home/shane/.m2/repository/javax/el/el-api/1.2/el-api-1.2.jar -static]]></programlisting>
+
+ <para>When running the signature test, you may get the following message:</para>
+
+ <literal>"The return type java.lang.reflect.Member can't be resolved"</literal>
+
+ <para>This can safely be ignored - the important thing is to get the <literal>"STATUS:Passed."</literal> message.</para>
+ </section>
+
+ <section>
+ <title>Forcing a signature test failure</title>
+
+ <para>Just for fun (and to confirm that the signature test is working correctly), you can try the following:</para>
+
+ <para>1) Edit weld.sig</para>
+
+ <para>2) Modify one of the class signatures - in the following example we change one of the constructors for <literal>NullableDependencyException</literal> - here's the original:</para>
+
+ <programlisting><![CDATA[
+CLSS public javax.inject.NullableDependencyException
+cons public NullableDependencyException()
+cons public NullableDependencyException(java.lang.String)]]></programlisting>
+
+ <para>Let's change the constructor parameter to a <literal>java.lang.Integer</literal> instead:</para>
+
+ <programlisting><![CDATA[
+CLSS public javax.inject.NullableDependencyException
+cons public NullableDependencyException()
+cons public NullableDependencyException(java.lang.Integer)]]></programlisting>
+
+ <para>3) Now we run the signature test using the above command, which should result in the following errors:</para>
+
+ <programlisting><![CDATA[
+Missing Constructors
+--------------------
+
+javax.inject.NullableDependencyException: constructor public javax.inject.NullableDependencyException.NullableDependencyException(java.lang.Integer)
+
+Added Constructors
+------------------
+
+javax.inject.NullableDependencyException: constructor public javax.inject.NullableDependencyException.NullableDependencyException(java.lang.String)
+
+
+STATUS:Failed.2 errors]]></programlisting>
+ </section>
+
+
+</chapter>
14 years, 8 months
- 1
- 0
Weld SVN: r4185 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 19:22:43 -0400 (Sun, 18 Oct 2009)
New Revision: 4185
Modified:
build/trunk/parent/pom.xml
Log:
add jboss plugin repo
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2009-10-18 23:22:34 UTC (rev 4184)
+++ build/trunk/parent/pom.xml 2009-10-18 23:22:43 UTC (rev 4185)
@@ -44,6 +44,16 @@
<enabled>false</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
<repositories>
@@ -415,6 +425,7 @@
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>
+ <useAgent>${gpg.useAgent}</useAgent>
</configuration>
<executions>
<execution>
14 years, 8 months
- 1
- 0
Weld SVN: r4184 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 19:22:34 -0400 (Sun, 18 Oct 2009)
New Revision: 4184
Modified:
cdi-tck/trunk/pom.xml
Log:
use new parent
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-10-18 16:18:47 UTC (rev 4183)
+++ cdi-tck/trunk/pom.xml 2009-10-18 23:22:34 UTC (rev 4184)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</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-CR1</cdi.api.version>
+ <cdi.api.version>1.0-SNAPSHOT</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, 8 months
- 1
- 0
Weld SVN: r4183 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context and 245 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 12:18:47 -0400 (Sun, 18 Oct 2009)
New Revision: 4183
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContext2Test.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/QualifierDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.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/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.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/nonbinding/NonBindingTypesWhenResolvingTest.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/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.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/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
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/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
update to current spec
Modified: api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ api/trunk/cdi/src/main/java/javax/enterprise/context/Conversation.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -53,12 +53,6 @@
*/
public void end();
- /**
- * Determine if a conversation is long running or transient
- *
- * @return true if the conversation is long running
- */
- public boolean isLongRunning();
/**
* Get the id associated with the current long running conversation
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ContextDestroysBeansTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContext2Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContext2Test.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContext2Test.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DestroyForSameCreationalContext2Test extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DestroyForSameCreationalContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class GetFromContextualTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class GetOnInactiveContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class GetWithNoCreationalContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NormalContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -22,7 +22,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec = "cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ApplicationContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ApplicationContextSharedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EJBApplicationContextTest extends AbstractJSR299Test
{
@Test(groups = { "rewrite", "contexts", "webservice", "integration", "jboss-as-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationBeginTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationEndTest extends AbstractJSR299Test
{
@Override
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationIdSetByApplicationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationIdSetByContainerTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConversationTimeoutTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -33,7 +33,7 @@
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"),
@Resource(destination="rain.jspx", source="rain.jsf")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ClientConversationContextTest extends AbstractConversationTest
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -24,7 +24,7 @@
@Resource(destination="clouds.jspx", source="clouds.jsf"),
@Resource(destination="cloud.jspx", source="cloud.jsf")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
@Resource(destination="thunder.jspx", source="thunder.jsf"),
@Resource(destination="lightening.jspx", source="lightening.jsf")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
@Resource(destination="clouds.jspx", source="clouds.jsf"),
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ManualCidPropagationTest extends AbstractConversationTest
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DependentContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DependentContextEjbTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivatingContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "integration"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "integration"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingFieldInDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanWithNonSerializableIntializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonPassivationManagedBeanHasPassivatingScopeTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivatingManagedBeanWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivatingManagedBeanWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class RequestContextTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EJBRequestContextTest extends AbstractJSR299Test
{
/**
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SessionContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "servlet", "integration" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -31,7 +31,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class FinalBeanClassTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class FinalBeanMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NoDelegateInjectionPointsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@ExpectedDeploymentException(DefinitionError.class)
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DelegateFieldInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -33,7 +33,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Packaging(PackagingType.EAR)
@IntegrationTest
public class EJBDecoratorInvocationTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -33,7 +33,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
* @author Pete Muir
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BeanDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class GenericManagedBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NameDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/QualifierDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/QualifierDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/QualifierDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class QualifierDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -24,7 +24,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseQualifierDefinitionTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ScopeDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TooManyScopesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StereotypeDefinitionTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonEmptyNamedTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class IncompatibleStereotypesTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TooManyScopeTypesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
//(a)ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DefaultNamedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
@IntegrationTest
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -35,7 +35,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StereotypeInheritenceTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -35,7 +35,7 @@
*/
@Artifact
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension.DeploymentTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -37,7 +37,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension.ExtensionsTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ExtensionsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -35,7 +35,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
@Test(groups={"rewrite", "jboss-as-broken"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DeploymentFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -37,7 +37,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AddingNormalScopeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AddingPassivatingScopeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UseBeforeValidationTest extends AbstractJSR299Test
{
@Test(groups = {"broken", "rewrite"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -43,7 +43,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryInEarTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@IntegrationTest
@Packaging(PackagingType.EAR)
public class LibraryInEarTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -41,7 +41,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryInWarTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@IntegrationTest
public class LibraryInWarTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryMissingBeansXmlTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@IntegrationTest
public class LibraryMissingBeansXmlTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -47,7 +47,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({EarInstalledLibraryTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Packaging(PackagingType.EAR)
@IntegrationTest
public class EarInstalledLibraryTest extends AbstractJSR299Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -45,7 +45,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({WarInstalledLibraryTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@IntegrationTest
public class WarInstalledLibraryTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -22,7 +22,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EventTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EventBindingTypesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DependentIsConditionalObserverTest extends AbstractJSR299Test
{
// WBRI-315
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EventTypesTest extends AbstractJSR299Test
{
@Test(groups = "event")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class FireEventTest extends AbstractJSR299Test
{
private static final String BEAN_MANAGER_FIRE_EVENT_METHOD_NAME = "fireEvent";
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -7,7 +7,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonBindingTypePassedToFireTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -22,7 +22,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ImplicitEventTest extends AbstractJSR299Test
{
private static final TypeLiteral<Event<StudentRegisteredEvent>> STUDENT_REGISTERED_EVENT_LITERAL = new TypeLiteral<Event<StudentRegisteredEvent>>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverExceptionAbortsProcessingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -31,7 +31,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class CheckedExceptionWrappedTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConditionalObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -21,7 +21,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseEventInheritenceTest extends AbstractJSR299Test
{
@Test(groups = { "events", "inheritance" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolveEventObserversTest extends AbstractJSR299Test
{
private static final String BEAN_MANAGER_RESOLVE_OBSERVERS_METHOD_NAME = "resolveObserverMethods";
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -7,7 +7,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolveEnterpriseEventObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events", "ejb" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverExceptionRethrownTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
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-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -41,7 +41,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TransactionalObserversTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -35,7 +35,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DuplicateBindingTypesWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
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-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NonBindingTypesWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
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-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class CheckTypeParametersWhenResolvingObserversTest extends AbstractJSR299Test
{
public static class CharacterList extends ArrayList<Character>
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SelectEventTest extends AbstractJSR299Test
{
@Test(groups = "events")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@IntegrationTest
@Extension("javax.enterprise.inject.spi.Extension")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AfterBeanDiscoveryTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -37,7 +37,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AlternativeMetaDataTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -48,7 +48,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessAnnotatedTypeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test
{
@Test(groups="jboss-as-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test
{
@Test(groups="jboss-as-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -39,7 +39,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BeanByTypeTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -63,7 +63,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BeanManagerTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -37,7 +37,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessObserverMethodEventTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessObserverMethodErrorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -41,7 +41,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessObserverMethodExceptionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -23,7 +23,7 @@
@Extension("javax.enterprise.inject.spi.Extension")
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -25,7 +25,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessSessionBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,12 +29,14 @@
})
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "ba")
+ @SpecAssertion(section = "11.2", id = "ba"),
+ @SpecAssertion(section = "11.2", id = "bb"),
+ @SpecAssertion(section = "11.2", id = "bc")
})
public void testProduceAndInjectCallsInitializerAndConstructor()
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -25,7 +25,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BuiltInBeansTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DisposalMethodDefinitionTest extends AbstractJSR299Test
{
private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DisposalMethodOnSessionBean extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SingletonWithConversationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
{
@Test(groups = { "jboss-as-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SingletonWithSessionScopeTest extends AbstractJSR299Test
{
@Test(groups = { "jboss-as-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StatelessWithConversationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StatelessWithRequestScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class StatelessWithSessionScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -24,7 +24,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -39,7 +39,7 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@EjbJarXml("ejb-jar.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -22,7 +22,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NewEnterpriseBeanTest extends AbstractJSR299Test
{
private Bean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
@Artifact
@Packaging(EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EjbInitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "initializerMethod", "ejb3" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InitializerMethodTest extends AbstractJSR299Test
{
@@ -33,7 +33,7 @@
@SpecAssertion(section = "3.9", id = "g"),
@SpecAssertion(section = "3.9.1", id = "a"),
@SpecAssertion(section = "3.9.2", id = "aa"),
- @SpecAssertion(section = "5.6.4", id = "b"),
+ @SpecAssertion(section = "5.6.4", id = "ab"),
@SpecAssertion(section = "3.10", id = "a")
})
public void testMultipleInitializerMethodsAreCalled()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = "initializerMethod")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
@Test(groups = "initializerMethod")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -18,7 +18,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerFieldDefinitionTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
{
@Test(groups = "producerField")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseProducerFieldDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerFieldLifecycleTest extends AbstractJSR299Test
{
private AnnotationLiteral<Null> NULL_LITERAL = new AnnotationLiteral<Null>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ParameterizedTypeWithWildcardTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -21,7 +21,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerMethodDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseProducerMethodDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -23,7 +23,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerMethodLifecycleTest extends AbstractJSR299Test
{
private AnnotationLiteral<Pet> PET_LITERAL = new AnnotationLiteral<Pet>() {};
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Packaging(PackagingType.EAR)
public class SimpleBeanDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
@Test(groups = { "disposalMethod" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ConstructorHasObservesParameterTest extends AbstractJSR299Test
{
@Test(groups = { "observerMethod" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DependentWithPublicFieldTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -23,7 +23,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SimpleBeanLifecycleTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(UnproxyableResolutionException.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnproxyableManagedBeanTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NewSimpleBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EjbInjectionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -42,7 +42,7 @@
@IntegrationTest
@Resource(source="web.xml", destination="/WEB-INF/web.xml")
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnvInjectionTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
@Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml")
//@PersistenceXml("persistence.xml")
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PersistenceContextInjectionTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@@ -108,7 +108,6 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.5.2", id = "a"),
@SpecAssertion(section = "3.5.1", id = "hh")
})
public void testBeanTypesAndBindingTypesOfPersistenceContext()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
@Packaging(PackagingType.WAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionOfResourceTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -20,7 +20,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DirectlyExtendsNothingTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SameNameTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
/**
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProducerMethodSpecializationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class IndirectOverrideTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializesStaticMethodTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -17,7 +17,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SimpleBeanSpecializationTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test
{
/**
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -21,11 +21,11 @@
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.ArrayList;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.InterceptionType;
@@ -37,7 +37,6 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-
import org.testng.annotations.Test;
/**
@@ -48,7 +47,7 @@
* @author Marius Bogoevici
*/
@Artifact
-@SpecVersion(spec = "cdi", version = "PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InterceptorDefinitionTest extends AbstractJSR299Test
{
@@ -83,12 +82,13 @@
assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Transactional>(){});
}
- @Test
+ @Test(groups="rewrite")
@SpecAssertions({
@SpecAssertion(section = "11.1.2", id = "c"),
@SpecAssertion(section = "11.1.2", id = "e")
})
// WBRI-59
+ // TODO Add tests for EJB timeout method PLM
public void testInterceptionType()
{
Interceptor<?> interceptorBean = getTransactionalInterceptor();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InterceptorWithNoBindingTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InvalidInterceptorBindingAnnotationsTest extends AbstractJSR299Test
{
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-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -14,7 +14,7 @@
@IntegrationTest
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InterceptorCalledBeforeDecoratorTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InterceptorNotListedInBeansXmlNotEnabledTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class InterceptorOrderTest extends AbstractJSR299Test
{
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-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@BeansXml("beans.xml")
public class MultipleInterceptorBindingsTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolutionByNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DuplicateNameResolutionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -23,7 +23,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class CircularDependencyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,7 +29,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ClientProxyTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ArrayTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class FinalClassTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class FinalMethodTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnproxyableTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PrivateConstructorTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AmbiguousDependencyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnsatisfiedDependencyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
* @author Jozef Hartinger
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DynamicLookupTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -32,7 +32,7 @@
* Tests for built-in Instance.
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class BuiltinInstanceTest extends AbstractJSR299Test {
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolutionByNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -35,7 +35,7 @@
@Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"),
@Resource(destination = "JSFTestPage.jsp", source = "JSFTestPage.jsp"),
@Resource(destination = "JSPTestPage.jsp", source = "JSPTestPage.jsp")})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class IntegrationWithUnifiedELTest extends AbstractJSR299Test
{
@Test(groups = {"el" } )
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -9,7 +9,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionTest extends AbstractJSR299Test
{
@Test(groups = { "injection", "producerMethod" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -23,7 +23,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AnyInjectionTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Farm.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -8,8 +8,16 @@
@Stateless
public class Farm implements FarmLocal
{
- @Inject private Sheep sheep;
+ @Inject private Sheep sheepField;
+
+ private boolean initializerCalled;
private boolean injectionPerformedCorrectly = false;
+
+ @Inject private void initialize(Sheep sheep)
+ {
+ assert sheepField != null;
+ initializerCalled = true;
+ }
@Interceptors(FarmInterceptor.class)
public int getAnimalCount() {
@@ -18,7 +26,8 @@
@PostConstruct
public void postConstruct() {
- injectionPerformedCorrectly = sheep != null;
+ assert initializerCalled;
+ injectionPerformedCorrectly = true;
}
public boolean isInjectionPerformedCorrectly()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/ProcessInjectionTargetEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
@Artifact
@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
@IntegrationTest
-@SpecVersion(spec = "cdi", version = "PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessInjectionTargetEventTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -29,14 +29,18 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SessionBeanInjectionTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
@SpecAssertion(section = "5.6", id = "a"),
- @SpecAssertion(section = "5.6.4", id = "a")})
+ @SpecAssertion(section = "5.6.4", id = "aa"),
+ @SpecAssertion(section = "5.6.4", id = "ab"),
+ @SpecAssertion(section = "5.6.4", id = "ba"),
+ @SpecAssertion(section = "5.6.4", id = "be")
+ })
public void testInjectionOnContextualSessionBean()
{
assert getInstanceByType(FarmLocal.class).isInjectionPerformedCorrectly();
@@ -45,7 +49,9 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "5.6", id = "c"),
- @SpecAssertion(section = "5.6.4", id = "a")})
+ @SpecAssertion(section = "5.6.4", id = "ak"),
+ @SpecAssertion(section = "5.6.4", id = "al")
+ })
public void testInjectionOnNonContextualSessionBean()
{
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -38,13 +38,15 @@
@Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"),
@Resource(destination = "TagPage.jsp", source = "TagPage.jsp"),
@Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")})
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test
{
@Test
@SpecAssertions( {
@SpecAssertion(section = "5.6", id = "ef"),
- @SpecAssertion(section = "5.6.4", id = "a") })
+ @SpecAssertion(section = "5.6.4", id = "ae"),
+ @SpecAssertion(section = "5.6.4", id = "bn")
+ })
public void testInjectionIntoServlet() throws Exception
{
WebClient webClient = new WebClient();
@@ -55,7 +57,9 @@
@Test
@SpecAssertions( {
@SpecAssertion(section = "5.6", id = "eg"),
- @SpecAssertion(section = "5.6.4", id = "a") })
+ @SpecAssertion(section = "5.6.4", id = "ag"),
+ @SpecAssertion(section = "5.6.4", id = "bq")
+ })
public void testInjectionIntoFilter() throws Exception
{
WebClient webClient = new WebClient();
@@ -64,7 +68,10 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "ea")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6", id = "ea"),
+ @SpecAssertion(section = "5.6.4", id = "ai")
+ })
public void testInjectionIntoServletListener() throws Exception
{
WebClient webClient = new WebClient();
@@ -73,7 +80,10 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "eb")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6", id = "eb"),
+ @SpecAssertion(section = "5.6.4", id = "am")
+ })
public void testInjectionIntoTagHandler() throws Exception
{
WebClient webClient = new WebClient();
@@ -84,7 +94,10 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "ec")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6", id = "ec"),
+ @SpecAssertion(section = "5.6.4", id="as")
+ })
public void testInjectionIntoTagLibraryListener() throws Exception
{
WebClient webClient = new WebClient();
@@ -93,7 +106,10 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "d")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6.4", id = "au"),
+ @SpecAssertion(section = "5.6", id = "d")
+ })
public void testInjectionIntoJSFManagedBean() throws Exception
{
WebClient webclient = new WebClient();
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessInjectionTargetEventTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -41,7 +41,7 @@
@Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp"),
@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension") })
@IntegrationTest
-@SpecVersion(spec = "cdi", version = "PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ProcessInjectionTargetEventTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
@Artifact
@IntegrationTest(runLocally = true)
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test
{
@WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NullableBeanTest extends AbstractJSR299Test
{
@Test(groups = { "injection", "producerMethod" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -40,7 +40,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -46,7 +46,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AmbiguousInjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -36,7 +36,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class UnsatisfiedInjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups={"manager", "injection", "deployment"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -11,7 +11,7 @@
@Artifact
@IntegrationTest
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups = { "manager", "ejb3", "integration", "jboss-as-broken" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/EnterpriseResolutionByTypeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -27,7 +27,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
@Packaging(PackagingType.EAR)
public class EnterpriseResolutionByTypeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -37,7 +37,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ResolutionByTypeTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PrimitiveInjectionPointTest extends AbstractJSR299Test
{
@Test(groups={"resolution", "producerMethod"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class TypeVariableInjectionPointTest extends AbstractJSR299Test
{
@Test(groups = { "resolution"})
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -31,7 +31,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class DecoratorNotResolvedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -31,7 +31,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class InterceptorNotResolvedTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -31,7 +31,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -33,7 +33,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class PolicyAvailabilityTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SameTypeListedTwiceTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-10-18 16:18:47 UTC (rev 4183)
@@ -30,7 +30,7 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="PFD2")
+@SpecVersion(spec="cdi", version="20091018")
public class SessionBeanPolicyTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-18 16:09:06 UTC (rev 4182)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-18 16:18:47 UTC (rev 4183)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://jboss.com/products/weld/tck/audit /Users/pmuir/workspace/jboss-test-audit/api/src/main/resources/tck-audit.xsd"
name="JSR-299: Contexts and Dependency Injection for Java Enterprise Edition"
id="cdi"
- version="PFD2">
+ version="20091018">
<section id="2" title="Concepts">
@@ -525,6 +525,11 @@
<text>A stereotype should not declare any qualifier annotation other than |@Named|. If a stereotype declares any other qualifier annotation, non-portable behavior results.</text>
<note>The behavior here is undefined.</note>
</assertion>
+
+ <assertion id="c" testable="false">
+ <text>A stereotype should not be annotated |@Typed|. If a stereotype is annotated |@Typed|, non-portable behavior results.</text>
+ </assertion>
+
</section>
<section id="2.7.1.4" title="Declaring an @Alternative stereotype">
@@ -641,8 +646,9 @@
</section>
<section id="3.1.2" title="Bean types of a managed bean">
+
<assertion id="a">
- <text>The set of bean types for a managed bean contains the bean class, every superclass and all interfaces it implements directly or indirectly.</text>
+ <text>The unrestricted set of bean types for a managed bean contains the bean class, every superclass and all interfaces it implements directly or indirectly.</text>
</assertion>
</section>
@@ -786,7 +792,7 @@
<section id="3.2.2" title="Bean types of a session bean">
<assertion id="aa">
- <text>The set of bean types for a session bean contains all local interfaces of the bean and their superinterfaces.</text>
+ <text>The unrestricted set of bean types for a session bean contains all local interfaces of the bean and their superinterfaces.</text>
</assertion>
<assertion id="ba">
@@ -904,19 +910,23 @@
<section id="3.3.1" title="Bean types of a producer method">
<assertion id="a">
- <text>If the return type of a producer method is an interface, the set of bean types contains the return type, all interfaces it extends directly or indirectly and |java.lang.Object|</text>
+ <text>If the return type of a producer method is an interface, the unrestricted set of bean types contains the return type, all interfaces it extends directly or indirectly and |java.lang.Object|</text>
</assertion>
- <assertion id="ba">
- <text>If a return type of a producer method is primitive ~or is a Java array type~, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text>
- </assertion>
+ <group>
+ <text>If a return type of a producer method is primitive or is a Java array type, the unrestricted set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text>
+ <assertion id="ba">
+ <text>Check primitive return type</text>
+ </assertion>
- <assertion id="bb">
- <text>If a return type of a producer method is ~primitive or is~ a Java array type, the set of bean types contains exactly two types: the method return type and |java.lang.Object|.</text>
- </assertion>
+ <assertion id="bb">
+ <text>Check array return type</text>
+ </assertion>
+ </group>
+
<assertion id="c">
- <text>If the return type of a producer method is a class, the set of bean types contains the return type, every superclass and all interfaces it implements directly or indirectly.</text>
+ <text>If the return type of a producer method is a class, the unrestricted set of bean types contains the return type, every superclass and all interfaces it implements directly or indirectly.</text>
</assertion>
</section>
@@ -1149,19 +1159,23 @@
<section id="3.4.1" title="Bean types of a producer field">
<assertion id="a">
- <text>The bean types of a producer field depend upon the field type. If the field type is an interface, the set of bean types contains the field type, all interfaces it extends directly or indirectly and java.lang.Object</text>
+ <text>The bean types of a producer field depend upon the field type. If the field type is an interface, the unrestricted set of bean types contains the field type, all interfaces it extends directly or indirectly and java.lang.Object</text>
</assertion>
- <assertion id="ba">
- <text>The bean types of a producer field depend upon the field type. If a field type is primitive ~or is a Java array type,~ the set of bean types contains exactly two types: the field type and java.lang.Object</text>
- </assertion>
+ <group>
+ <text>The bean types of a producer field depend upon the field type. If a field type is primitive or is a Java array type, the unrestricted set of bean types contains exactly two types: the field type and java.lang.Object</text>
+ <assertion id="ba">
+ <text>Check primitive type</text>
+ </assertion>
- <assertion id="bb">
- <text>The bean types of a producer field depend upon the field type. If a field type is ~primitive or is~ a Java array type, the set of bean types contains exactly two types: the field type and java.lang.Object</text>
- </assertion>
+ <assertion id="bb">
+ <text>Check array type</text>
+ </assertion>
+ </group>
+
<assertion id="c">
- <text>The bean types of a producer field depend upon the field type. If the field type is a class, the set of bean types contains the field type, every superclass and all interfaces it implements directly or indirectly</text>
+ <text>The bean types of a producer field depend upon the field type. If the field type is a class, the unrestricted set of bean types contains the field type, every superclass and all interfaces it implements directly or indirectly</text>
</assertion>
</section>
@@ -1243,9 +1257,24 @@
</section>
<section id="3.5.2" title="Bean types of a resource">
- <assertion id="a">
- <text>The bean types of a resource are the declared type of the field declaration, together with |java.lang.Object|.</text>
- </assertion>
+ <group>
+ <text>The unrestricted set of bean types of a resource is determined by the declared type of the producer field, as specified by Section 3.4.1, “Bean types of a producer field”.</text>
+ <assertion id="aa">
+ <text>Check @Resource</text>
+ </assertion>
+ <assertion id="ab">
+ <text>Check @PersistenceContext</text>
+ </assertion>
+ <assertion id="ac">
+ <text>Check @PersistenceUnit</text>
+ </assertion>
+ <assertion id="ad">
+ <text>Check @EJB</text>
+ </assertion>
+ <assertion id="ae">
+ <text>Check @WebServiceRef</text>
+ </assertion>
+ </group>
</section>
<section id="3.6" title="Additional built-in beans">
@@ -1532,6 +1561,16 @@
<assertion id="xb">
<text>This second bean is not an alternative.</text>
</assertion>
+
+ <group>
+ <text>Note that this second bean exists, is enabled, and is available for injection whenever the bean class is in the application classpath, even if the first bean is disabled, as defined by Section 5.2.2, “Enabled and disabled beans” or is deployed out- side of a bean deployment archive, as defined in Section 12.1, “Bean deployment archives”, and is therefore not discovered during the bean discovery process defined in Chapter 12, Packaging and deployment.</text>
+ <assertion id="ya">
+ <text>Check that @New on a class outside the BDA, but in the classpath causes a bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ <assertion id="yb">
+ <text>Check that @New on a class (which is a session bean class) outside the BDA, but in the classpath causes a session bean with qualifier @New and the given type to be created</text>
+ </assertion>
+ </group>
<assertion id="z">
<text>When the binding |@New| is specified at an injection point and no |value| member is explicitly specified, the container defaults the |value| to the declared type of the injection point.</text>
@@ -1909,7 +1948,7 @@
<section id="5.1" title="Inter-module accessibility in Java EE">
<group>
- <text>Beans packaged in a certain Java EE _module or library are available for injection, lookup and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text>
+ <text>Beans packaged in a certain Java EE module or library are available for injection, lookup and EL resolution to classes and JSP/JSF pages packaged in some other Java EE module or library if and only if the first module or library is required to be accessible to the other module or library by the Java EE platform specification.</text>
<assertion id="aa">
<text>Test with injection.</text>
@@ -2374,13 +2413,133 @@
</section>
<section id="5.6.4" title="Injection of fields and initializer methods">
- <assertion id="a">
- <text>When the container creates a new instance of a managed bean, session bean, or of any other Java EE component class supporting injection, the container must initialize the values of all injected fields after injection of Java EE component environment resources has been performed and before the |@PostConstruct| callback occurs and before the servlet |init()| method is called. The container sets the value of each injected field to an injectable reference.</text>
- </assertion>
-
- <assertion id="b">
- <text>After the container initializes the values of the injected fields, it must call all initializer methods, passing an injectable reference to each parameter.</text>
- </assertion>
+ <group>
+ <text>When the container creates a new instance of a managed bean, session bean, or of any other Java EE component class supporting injection, the container must: Initialize the values of all injected fields. The container sets the value of each injected field to an injectable reference. Call all initializer methods, passing an injectable reference to each parameter.</text>
+ <assertion id="aa">
+ <text>Test session bean fields injected</text>
+ </assertion>
+ <assertion id="ab">
+ <text>Test session bean initializer methods called</text>
+ </assertion>
+ <assertion id="ac">
+ <text>Test managed bean fields injected</text>
+ </assertion>
+ <assertion id="ad">
+ <text>Test managed bean initializer methods called</text>
+ </assertion>
+ <assertion id="ae">
+ <text>Test Servlet fields injected</text>
+ </assertion>
+ <assertion id="af">
+ <text>Test Servlet initializer methods called</text>
+ </assertion>
+ <assertion id="ag">
+ <text>Test Servlet Filter fields injected</text>
+ </assertion>
+ <assertion id="ah">
+ <text>Test Servlet Filter initializer methods called</text>
+ </assertion>
+ <assertion id="ai">
+ <text>Test Servlet Listener fields injected</text>
+ </assertion>
+ <assertion id="aj">
+ <text>Test Servlet Listener initializer methods called</text>
+ </assertion>
+ <assertion id="ak">
+ <text>Test non-contextual session bean fields injected</text>
+ </assertion>
+ <assertion id="al">
+ <text>Test non-contextual session bean initializer methods called</text>
+ </assertion>
+ <assertion id="am">
+ <text>Test tag handler fields injected</text>
+ </assertion>
+ <assertion id="an">
+ <text>Test tag handler initializer methods called</text>
+ </assertion>
+ <assertion id="ao">
+ <text>Test EJB interceptor fields injected</text>
+ </assertion>
+ <assertion id="ap">
+ <text>Test EJB interceptor initializer methods called</text>
+ </assertion>
+ <assertion id="aq">
+ <text>Test WS endpoint fields injected</text>
+ </assertion>
+ <assertion id="ar">
+ <text>Test WS endpoint bean initializer methods called</text>
+ </assertion>
+ <assertion id="as">
+ <text>Test tag handler listener fields injected</text>
+ </assertion>
+ <assertion id="at">
+ <text>Test tag handler listener initializer methods called</text>
+ </assertion>
+ <assertion id="au">
+ <text>Test JSF managed bean fields injected</text>
+ </assertion>
+ <assertion id="av">
+ <text>Test JSF managed bean initializer methods called</text>
+ </assertion>
+ </group>
+
+ <group>
+ <text>The container must ensure that: Initializer methods declared by a class X in the type hierarchy of the bean are called after all injected fields declared by X or by superclasses of X have been initialized, and after all Java EE component environment resource dependencies declared by X or by superclasses of X have been injected. Any @PostConstruct callback declared by a class X in the type hierarchy of the bean is called after all initializer meth- ods declared by X or by superclasses of X have been called, after all injected fields declared by X or by superclasses of X have been initialized, and after all Java EE component environment resource dependencies declared by X or by superclasses of X have been injected. Any servlet init() method is called after all initializer methods have been called, all injected fields have been initialized and all Java EE component environment resource dependencies have been injected.</text>
+ <assertion id="ba">
+ <text>Test session bean initializer methods called after injected field of X</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Test session bean initializer methods called after injected field of superclass of X</text>
+ </assertion>
+ <assertion id="bc">
+ <text>Test session bean initializer methods called after EE resource injection of X</text>
+ </assertion>
+ <assertion id="bd">
+ <text>Test session bean initializer methods called after EE resource injection of superclass of X</text>
+ </assertion>
+ <assertion id="be">
+ <text>Test session bean @PostConstruct called after initializer of X</text>
+ </assertion>
+ <assertion id="bf">
+ <text>Test session bean @PostConstruct called after initializer of superclass of X</text>
+ </assertion>
+ <assertion id="bg">
+ <text>Test managed bean initializer methods called after injected field of X</text>
+ </assertion>
+ <assertion id="bh">
+ <text>Test managed bean initializer methods called after injected field of superclass of X</text>
+ </assertion>
+ <assertion id="bi">
+ <text>Test managed bean initializer methods called after EE resource injection of X</text>
+ </assertion>
+ <assertion id="bj">
+ <text>Test managed bean initializer methods called after EE resource injection of superclass of X</text>
+ </assertion>
+ <assertion id="bk">
+ <text>Test managed bean @PostConstruct called after initializer of X</text>
+ </assertion>
+ <assertion id="bl">
+ <text>Test managed bean @PostConstruct called after initializer of superclass of X</text>
+ </assertion>
+ <assertion id="bm">
+ <text>Servlet |init()| method called after initializer method</text>
+ </assertion>
+ <assertion id="bn">
+ <text>Servlet |init()| method called after injected fields</text>
+ </assertion>
+ <assertion id="bo">
+ <text>Servlet |init()| method called after Java EE resource injection</text>
+ </assertion>
+ <assertion id="bp">
+ <text>Servlet Filter |init()| method called after initializer method</text>
+ </assertion>
+ <assertion id="bq">
+ <text>Servlet Filter |init()| method called after injected fields</text>
+ </assertion>
+ <assertion id="br">
+ <text>Servle Filtert |init()| method called after Java EE resource injection</text>
+ </assertion>
+ </group>
</section>
<section id="5.6.5" title="Destruction of dependent objects">
@@ -2531,6 +2690,11 @@
<assertion id="e">
<text>If an instance of an annotation that is not a qualifier type is passed to |select()|, an |IllegalArgumentException| is thrown.</text>
</assertion>
+
+ <assertion id="ea" testable="false">
+ <text>If an instance of javax.enterprise.inject.New is passed to select(), non-portable behavior results. Portable applications should not pass qualifiers of type @New to select().</text>
+ <note>Describes non-portable behavior</note>
+ </assertion>
<assertion id="fa">
<text>The |get()| method must identify a bean that matches the required type and required qualifiers and is accessible to the class into which the parent |Instance| was injected, according to the rules of typesafe resolution, as defined in Section 5.3, "Typesafe resolution" and resolving ambiguities according to Section 5.3.1, "Unsatisfied and ambiguous dependencies".</text>
@@ -3667,6 +3831,10 @@
</assertion>
</group>
+ <assertion id="ig">
+ <text>Invocation of EJB timer service timeouts by the container are not business method invocations, but are intercepted by interceptors for EJB timeouts.</text>
+ </assertion>
+
<assertion id="j">
<text>Invocation of lifecycle callbacks by the container are not business method invocations, but are intercepted by interceptors for lifecycle callbacks.</text>
</assertion>
@@ -4215,21 +4383,46 @@
</text>
</assertion>
- <assertion id="b">
- <text>For a method, the bean interceptor bindings include the interceptor bindings declared by the bean at the class level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes, together with all interceptor bindings declared at the method level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively.</text>
- </assertion>
-
+ <group>
+ <text>For a business method, or EJB timeout method, the bean interceptor bindings include the interceptor bindings declared by the bean at the class level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively, and of stereotypes, together with all interceptor bindings declared at the method level, including interceptor bindings declared as meta-annotations of other interceptor bindings, recursively.</text>
+ <assertion id="ba">
+ <text>Check a business method</text>
+ </assertion>
+ <assertion id="ba">
+ <text>Check an EJB timeout method</text>
+ </assertion>
+ </group>
+
<assertion id="ca">
- <text>First, the container identifies the set of matching enabled interceptors where, for each interceptor binding declared by the interceptor, there exists an interceptor binding in the set of bean interceptor bindings with (a) the same type and (b) the same annotation member value for each member which is not annotated |(a)javax.enterprise.inject.NonBinding| (see Section 9.5.2, "Interceptor binding types with members"), and the interceptor intercepts the given kind of lifecycle callback or business method, and the interceptor is enabled in the bean deployment archive of the bean.</text>
+ <text>First, the container identifies the set of matching enabled interceptors where, for each interceptor binding declared by the interceptor, there exists an interceptor binding in the set of bean interceptor bindings with (a) the same type and (b) the same annotation member value for each member which is not annotated |(a)javax.enterprise.inject.NonBinding| (see Section 9.5.2, "Interceptor binding types with members"), and the interceptor intercepts the given kind of lifecycle callback or business method, and the interceptor is enabled in the bean deployment archive of the bean.</text>
</assertion>
<assertion id="ea">
<text>Next, the container orders the matching interceptors according to the interceptor ordering specified in Section 9.4, "Interceptor enablement and ordering".</text>
</assertion>
- <assertion id="f">
- <text>For a custom implementation of the Interceptor interface defined in Section 11.1.2, "The Interceptor interface", the container calls |getInterceptorBindings()| to determine the interceptor bindings of the interceptor and |intercepts()| to determine if the interceptor intercepts a given kind of lifecycle callback or business method.</text>
- </assertion>
+ <group>
+ <text>For a custom implementation of the Interceptor interface defined in Section 11.1.2, "The Interceptor interface", the container calls |getInterceptorBindings()| to determine the interceptor bindings of the interceptor and |intercepts()| to determine if the interceptor intercepts a given kind of lifecycle callback, EJB timeout or business method.</text>
+ <assertion id="fa">
+ <text>Check for @PostConstruct</text>
+ </assertion>
+ <assertion id="fb">
+ <text>Check for @PreDestroy</text>
+ </assertion>
+ <assertion id="fc">
+ <text>Check for @PostActivate</text>
+ </assertion>
+ <assertion id="fd">
+ <text>Check for @PrePassivate</text>
+ </assertion>
+ <assertion id="fe">
+ <text>Check for @AroundInvoke</text>
+ </assertion>
+ <assertion id="ff">
+ <text>Check for @AroundTimeout</text>
+ </assertion>
+ </group>
+
</section>
<section id="9.5.1" title="Interceptors with multiple bindings">
@@ -4731,7 +4924,7 @@
</assertion>
<assertion id="e">
- <text>An |InterceptionType| identifies the kind of lifecycle callback or business method.</text>
+ <text>An |InterceptionType| identifies the kind of lifecycle callback, EJB timeout method or business method.</text>
</assertion>
<assertion id="f">
@@ -4775,9 +4968,25 @@
<note>Statement of intent</note>
</assertion>
- <assertion id="ba">
- <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Inject| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor".</text>
- </assertion>
+ <group>
+ <text>For a |Producer| that represents a class, |produce()| calls the constructor annotated |@Inject| if it exists, or the constructor with no parameters otherwise, as defined in Section 5.6.3, "Injection using the bean constructor". and returns the resulting instance. If the class has interceptors, |produce()| is responsible for building the interceptor and decorator stacks for the instance.</text>
+ <assertion id="ba">
+ <text>Test field injection occurs</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Test initializer methods called</text>
+ </assertion>
+ <assertion id="bc">
+ <text>Test constructor injected</text>
+ </assertion>
+ <assertion id="bd">
+ <text>Test decorator stack built</text>
+ </assertion>
+ <assertion id="be">
+ <text>Test interceptor stack built</text>
+ </assertion>
+ </group>
+
<assertion id="c">
<text>For a |Producer| that represents a class, |dispose()| does nothing.</text>
@@ -4999,6 +5208,12 @@
<assertion id="e">
<text>If an instance of an annotation that is not a qualifier type is given, an |IllegalArgumentException| is thrown.</text>
</assertion>
+
+ <assertion id="f" testable="false">
+ <text>If an instance of |javax.enterprise.inject.New| is passed to |getBeans()|, non-portable behavior results. Portable applications should not pass qualifiers of type |@New| to |getBeans()|.</text>
+ <note>Describes non-portable behavior</note>
+ </assertion>
+
</section>
<section id="11.3.10" title="Observer method resolution">
14 years, 8 months
- 1
- 0
Weld SVN: r4182 - core/trunk/impl/src/main/java/org/jboss/weld/bean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-18 12:09:06 -0400 (Sun, 18 Oct 2009)
New Revision: 4182
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
Log:
minor
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-18 13:04:11 UTC (rev 4181)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2009-10-18 16:09:06 UTC (rev 4182)
@@ -29,9 +29,9 @@
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
+import org.jboss.interceptor.model.InterceptionModel;
import org.jboss.interceptor.model.InterceptionModelBuilder;
import org.jboss.interceptor.model.InterceptorClassMetadataImpl;
-import org.jboss.interceptor.model.InterceptionModel;
import org.jboss.interceptor.proxy.InterceptionHandlerFactory;
import org.jboss.interceptor.proxy.InterceptorProxyCreatorImpl;
import org.jboss.interceptor.registry.InterceptorRegistry;
@@ -39,8 +39,8 @@
import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.DefinitionException;
import org.jboss.weld.DeploymentException;
+import org.jboss.weld.bean.interceptor.CdiInterceptorHandlerFactory;
import org.jboss.weld.bean.interceptor.ClassInterceptionHandlerFactory;
-import org.jboss.weld.bean.interceptor.CdiInterceptorHandlerFactory;
import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
import org.jboss.weld.injection.ConstructorInjectionPoint;
import org.jboss.weld.injection.InjectionContextImpl;
@@ -70,6 +70,8 @@
// The constructor
private ConstructorInjectionPoint<T> constructor;
+
+ // The Java EE style injection points
private Set<WeldInjectionPoint<?, ?>> ejbInjectionPoints;
private Set<WeldInjectionPoint<?, ?>> persistenceContextInjectionPoints;
private Set<WeldInjectionPoint<?, ?>> persistenceUnitInjectionPoints;
14 years, 8 months
- 1
- 0