Weld SVN: r4717 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-06 09:07:08 -0500 (Fri, 06 Nov 2009)
New Revision: 4717
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
sync
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-06 13:01:26 UTC (rev 4716)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-06 14:07:08 UTC (rev 4717)
@@ -34,8 +34,8 @@
*
* <p>A bean type is a client-visible type of the bean. A
* bean may have multiple bean types. The following bean has
- * bean types <tt>BookShop</tt>, <tt>Business</tt> and
- * <tt>Shop<Book></tt>.</p>
+ * bean types <tt>BookShop</tt>, <tt>Business</tt>,
+ * <tt>Shop<Book></tt> and {@link java.lang.Object}.</p>
*
* <pre>
* public class BookShop
16 years, 5 months
- 1
- 0
Weld SVN: r4716 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-06 08:01:26 -0500 (Fri, 06 Nov 2009)
New Revision: 4716
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
Log:
Use supported syntax
Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2009-11-06 12:58:14 UTC (rev 4715)
+++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2009-11-06 13:01:26 UTC (rev 4716)
@@ -18,7 +18,7 @@
</run>
</groups>
<packages>
- <package name="org.jboss.jsr299.tck.tests" />
+ <package name="org.jboss.jsr299.tck.tests.*" />
</packages>
</test>
16 years, 5 months
- 1
- 0
Weld SVN: r4715 - in core/trunk/impl/src/main/java/org/jboss/weld: bean/ee and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-06 07:58:14 -0500 (Fri, 06 Nov 2009)
New Revision: 4715
Added:
core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java
Removed:
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
Log:
reorg
Deleted: 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-11-06 12:34:09 UTC (rev 4714)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.bean.builtin;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-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;
-
-/**
- * @author pmuir
- *
- */
-public class DefaultValidatorBean extends AbstractBuiltInBean<Validator>
-{
-
- private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Validator.class);
-
- public DefaultValidatorBean(BeanManagerImpl manager)
- {
- super(Validator.class.getSimpleName(), manager);
- }
-
- @Override
- public Class<Validator> getType()
- {
- return Validator.class;
- }
-
- public Set<Type> getTypes()
- {
- return TYPES;
- }
-
- public Validator create(CreationalContext<Validator> creationalContext)
- {
- if (getManager().getServices().contains(ValidationServices.class))
- {
- return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
- }
- else
- {
- throw new IllegalStateException("ValidationServices not available");
- }
- }
-
- public void destroy(Validator instance, CreationalContext<Validator> creationalContext)
- {
- // No-op
- }
-
-}
Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java 2009-11-06 12:34:09 UTC (rev 4714)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.bean.builtin;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.validation.ValidatorFactory;
-
-import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.util.collections.Arrays2;
-import org.jboss.weld.validation.spi.ValidationServices;
-
-/**
- * @author pmuir
- *
- */
-public class DefaultValidatorFactoryBean extends AbstractBuiltInBean<ValidatorFactory>
-{
-
- private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, ValidatorFactory.class);
-
- public DefaultValidatorFactoryBean(BeanManagerImpl manager)
- {
- super(ValidatorFactory.class.getSimpleName(), manager);
- }
-
- @Override
- public Class<ValidatorFactory> getType()
- {
- return ValidatorFactory.class;
- }
-
- public Set<Type> getTypes()
- {
- return TYPES;
- }
-
- public ValidatorFactory create(CreationalContext<ValidatorFactory> creationalContext)
- {
- if (getManager().getServices().contains(ValidationServices.class))
- {
- return getManager().getServices().get(ValidationServices.class).getDefaultValidatorFactory();
- }
- else
- {
- throw new IllegalStateException("ValidationServices not available");
- }
- }
-
- public void destroy(ValidatorFactory instance, CreationalContext<ValidatorFactory> creationalContext)
- {
- // No-op
- }
-
-}
Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java 2009-11-06 12:34:09 UTC (rev 4714)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.bean.builtin;
-
-import java.lang.reflect.Type;
-import java.security.Principal;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-
-import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.security.spi.SecurityServices;
-import org.jboss.weld.util.collections.Arrays2;
-
-/**
- * @author pmuir
- *
- */
-public class PrincipalBean extends AbstractBuiltInBean<Principal>
-{
-
- private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Principal.class);
-
- public PrincipalBean(BeanManagerImpl manager)
- {
- super(Principal.class.getSimpleName(), manager);
- }
-
- @Override
- public Class<Principal> getType()
- {
- return Principal.class;
- }
-
- public Set<Type> getTypes()
- {
- return TYPES;
- }
-
- public Principal create(CreationalContext<Principal> creationalContext)
- {
- if (getManager().getServices().contains(SecurityServices.class))
- {
- return getManager().getServices().get(SecurityServices.class).getPrincipal();
- }
- else
- {
- throw new IllegalStateException("SecurityServices not available");
- }
- }
-
- public void destroy(Principal instance, CreationalContext<Principal> creationalContext)
- {
- // No-op
- }
-
-}
Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java 2009-11-06 12:34:09 UTC (rev 4714)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.bean.builtin;
-
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.transaction.UserTransaction;
-
-import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.transaction.spi.TransactionServices;
-import org.jboss.weld.util.collections.Arrays2;
-
-/**
- * @author pmuir
- *
- */
-public class UserTransactionBean extends AbstractBuiltInBean<UserTransaction>
-{
-
- private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, UserTransaction.class);
-
- public UserTransactionBean(BeanManagerImpl manager)
- {
- super(UserTransaction.class.getSimpleName(), manager);
- }
-
- @Override
- public Class<UserTransaction> getType()
- {
- return UserTransaction.class;
- }
-
- public Set<Type> getTypes()
- {
- return TYPES;
- }
-
- public UserTransaction create(CreationalContext<UserTransaction> creationalContext)
- {
- if (getManager().getServices().contains(TransactionServices.class))
- {
- return getManager().getServices().get(TransactionServices.class).getUserTransaction();
- }
- else
- {
- throw new IllegalStateException("TransactionServices not available");
- }
- }
-
- public void destroy(UserTransaction instance, CreationalContext<UserTransaction> creationalContext)
- {
- // No-op
- }
-
-}
Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java)
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bean.ee;
+
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.validation.Validator;
+
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.Container;
+import org.jboss.weld.bean.builtin.AbstractBuiltInBean;
+import org.jboss.weld.util.collections.Arrays2;
+import org.jboss.weld.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class DefaultValidatorBean extends AbstractBuiltInBean<Validator>
+{
+
+ private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Validator.class);
+
+ public DefaultValidatorBean(BeanManagerImpl manager)
+ {
+ super(Validator.class.getSimpleName(), manager);
+ }
+
+ @Override
+ public Class<Validator> getType()
+ {
+ return Validator.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return TYPES;
+ }
+
+ public Validator create(CreationalContext<Validator> creationalContext)
+ {
+ if (getManager().getServices().contains(ValidationServices.class))
+ {
+ return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator();
+ }
+ else
+ {
+ throw new IllegalStateException("ValidationServices not available");
+ }
+ }
+
+ public void destroy(Validator instance, CreationalContext<Validator> creationalContext)
+ {
+ // No-op
+ }
+
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java)
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bean.ee;
+
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.validation.ValidatorFactory;
+
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.builtin.AbstractBuiltInBean;
+import org.jboss.weld.util.collections.Arrays2;
+import org.jboss.weld.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class DefaultValidatorFactoryBean extends AbstractBuiltInBean<ValidatorFactory>
+{
+
+ private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, ValidatorFactory.class);
+
+ public DefaultValidatorFactoryBean(BeanManagerImpl manager)
+ {
+ super(ValidatorFactory.class.getSimpleName(), manager);
+ }
+
+ @Override
+ public Class<ValidatorFactory> getType()
+ {
+ return ValidatorFactory.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return TYPES;
+ }
+
+ public ValidatorFactory create(CreationalContext<ValidatorFactory> creationalContext)
+ {
+ if (getManager().getServices().contains(ValidationServices.class))
+ {
+ return getManager().getServices().get(ValidationServices.class).getDefaultValidatorFactory();
+ }
+ else
+ {
+ throw new IllegalStateException("ValidationServices not available");
+ }
+ }
+
+ public void destroy(ValidatorFactory instance, CreationalContext<ValidatorFactory> creationalContext)
+ {
+ // No-op
+ }
+
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java)
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bean.ee;
+
+import java.lang.reflect.Type;
+import java.security.Principal;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.builtin.AbstractBuiltInBean;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.util.collections.Arrays2;
+
+/**
+ * @author pmuir
+ *
+ */
+public class PrincipalBean extends AbstractBuiltInBean<Principal>
+{
+
+ private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Principal.class);
+
+ public PrincipalBean(BeanManagerImpl manager)
+ {
+ super(Principal.class.getSimpleName(), manager);
+ }
+
+ @Override
+ public Class<Principal> getType()
+ {
+ return Principal.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return TYPES;
+ }
+
+ public Principal create(CreationalContext<Principal> creationalContext)
+ {
+ if (getManager().getServices().contains(SecurityServices.class))
+ {
+ return getManager().getServices().get(SecurityServices.class).getPrincipal();
+ }
+ else
+ {
+ throw new IllegalStateException("SecurityServices not available");
+ }
+ }
+
+ public void destroy(Principal instance, CreationalContext<Principal> creationalContext)
+ {
+ // No-op
+ }
+
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java)
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bean.ee;
+
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.transaction.UserTransaction;
+
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.builtin.AbstractBuiltInBean;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.util.collections.Arrays2;
+
+/**
+ * @author pmuir
+ *
+ */
+public class UserTransactionBean extends AbstractBuiltInBean<UserTransaction>
+{
+
+ private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, UserTransaction.class);
+
+ public UserTransactionBean(BeanManagerImpl manager)
+ {
+ super(UserTransaction.class.getSimpleName(), manager);
+ }
+
+ @Override
+ public Class<UserTransaction> getType()
+ {
+ return UserTransaction.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return TYPES;
+ }
+
+ public UserTransaction create(CreationalContext<UserTransaction> creationalContext)
+ {
+ if (getManager().getServices().contains(TransactionServices.class))
+ {
+ return getManager().getServices().get(TransactionServices.class).getUserTransaction();
+ }
+ else
+ {
+ throw new IllegalStateException("TransactionServices not available");
+ }
+ }
+
+ public void destroy(UserTransaction instance, CreationalContext<UserTransaction> creationalContext)
+ {
+ // No-op
+ }
+
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
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-11-06 12:34:09 UTC (rev 4714)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-06 12:58:14 UTC (rev 4715)
@@ -23,14 +23,14 @@
import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_POLICIES;
import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.bean.builtin.DefaultValidatorBean;
-import org.jboss.weld.bean.builtin.DefaultValidatorFactoryBean;
import org.jboss.weld.bean.builtin.InjectionPointBean;
import org.jboss.weld.bean.builtin.ManagerBean;
-import org.jboss.weld.bean.builtin.PrincipalBean;
-import org.jboss.weld.bean.builtin.UserTransactionBean;
import org.jboss.weld.bean.builtin.facade.EventBean;
import org.jboss.weld.bean.builtin.facade.InstanceBean;
+import org.jboss.weld.bean.ee.DefaultValidatorBean;
+import org.jboss.weld.bean.ee.DefaultValidatorFactoryBean;
+import org.jboss.weld.bean.ee.PrincipalBean;
+import org.jboss.weld.bean.ee.UserTransactionBean;
import org.jboss.weld.bootstrap.api.Environment;
import org.jboss.weld.bootstrap.api.ServiceRegistry;
import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
16 years, 5 months
- 1
- 0
Weld SVN: r4714 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-06 07:34:09 -0500 (Fri, 06 Nov 2009)
New Revision: 4714
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java
Log:
sync with spec
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java 2009-11-06 09:06:44 UTC (rev 4713)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Typed.java 2009-11-06 12:34:09 UTC (rev 4714)
@@ -42,7 +42,8 @@
* <p>When a <tt>@Typed</tt> annotation is specified,
* only the types whose classes are explicitly listed using
* the {@link javax.enterprise.inject.Typed#value() value}
- * member are bean types of the bean.</p>
+ * member, along with {@link java.lang.Object}, are bean
+ * types of the bean.</p>
*
* @author Pete Muir
* @author Gavin King
16 years, 5 months
- 1
- 0
Weld SVN: r4713 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-06 04:06:44 -0500 (Fri, 06 Nov 2009)
New Revision: 4713
Modified:
doc/trunk/reference/en-US/intro.xml
Log:
minor revs
Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml 2009-11-06 05:44:56 UTC (rev 4712)
+++ doc/trunk/reference/en-US/intro.xml 2009-11-06 09:06:44 UTC (rev 4713)
@@ -47,7 +47,7 @@
The JavaBeans and EJBs you've been writing every day, up until now, have not been able to take advantage
of the new services defined by the CDI specification. But you'll be able to use every one of them with
CDI—allowing the container to create and destroy instances of your beans and associate them with a
- designed context, injecting them into other beans, using them in EL expressions, specializing them with
+ designated context, injecting them into other beans, using them in EL expressions, specializing them with
qualifier annotations, even adding interceptors and decorators to them—without modifying your
existing code. At most, you'll need to add some annotations.
</para>
@@ -124,10 +124,10 @@
</para>
<para>
- We may obtain an instance of <literal>TextTranslator</literal> by injecting it into a constructor, bean
- "setter" method, producer method, observer method or field of a JavaBean or EJB session bean, or a field
- of a servlet. The injection is based on the type of the injection point, not the name of the field, method
- or parameter.
+ We may obtain an instance of <literal>TextTranslator</literal> by injecting it into a constructor, method
+ or field of a bean, or a field or method of a Java EE component class such as a servlet. The container
+ chooses the object to be injected based on the type of the injection point, not the name of the field,
+ method or parameter.
</para>
<para>
@@ -186,16 +186,16 @@
instance of <literal>Instance</literal>, parameterized with the bean type:
</para>
- <programlisting role="JAVA"><![CDATA[@Inject Instance<TextTranslator> textTranslatorSource;
+ <programlisting role="JAVA"><![CDATA[@Inject Instance<TextTranslator> textTranslatorInstance;
...
public void translate() {
- textTranslatorSource.get().translate(inputText);
+ textTranslatorInstance().translate(inputText);
}]]></programlisting>
<para>
Notice that it isn't necessary to create a getter or setter method to inject one bean into another. CDI can
- access the field directly (even if it's private!), which should help eliminate some wasteful code. The name of
- the field is arbitrary. It's the field's type that determines what is injected.
+ access an injected field directly (even if it's private!), which sometimes help eliminate some wasteful code.
+ The name of the field is arbitrary. It's the field's type that determines what is injected.
</para>
<para>
@@ -204,8 +204,7 @@
<literal>SentenceTranslator</literal> EJB was not deployed—the container would throw an
<literal>UnsatisfiedDependencyException</literal>. If more than one implementation of
<literal>Translator</literal> were available, the container would throw an
- <literal>AmbiguousDependencyException</literal>. The same for the <literal>TextTranslator</literal> injection
- point.
+ <literal>AmbiguousDependencyException</literal>.
</para>
<para>
@@ -286,7 +285,7 @@
<para>
Note that not all clients of a bean are beans themselves. Other objects such as servlets or message-driven
- beans—which are by nature not injectable, contextual objects—may also obtain references to beans by
+ beans—which are by nature not injectable, contextual objects—may also obtain references to beans by
injection.
</para>
16 years, 5 months
- 1
- 0
Weld SVN: r4712 - in core/trunk: tests/src/test/java/org/jboss/weld/tests/decorators and 1 other directory.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-11-06 00:44:56 -0500 (Fri, 06 Nov 2009)
New Revision: 4712
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
Log:
Fixing broken decorator test. Non-decorated calls are now redirected correctly to the contextual instance.
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-11-06 05:26:28 UTC (rev 4711)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2009-11-06 05:44:56 UTC (rev 4712)
@@ -94,6 +94,9 @@
private Class<T> proxyClassForDecorators;
private final ThreadLocal<Integer> decoratorStackPosition;
+
+ private final ThreadLocal<T> decoratedActualInstance = new ThreadLocal<T>();
+
private WeldMethod<?, ?> postConstruct;
private WeldMethod<?, ?> preDestroy;
@@ -178,6 +181,11 @@
List<SerializableContextualInstance<DecoratorImpl<Object>, Object>> decoratorInstances = new ArrayList<SerializableContextualInstance<DecoratorImpl<Object>,Object>>();
InjectionPoint ip = originalInjectionPoint;
boolean outside = decoratorStackPosition.get().intValue() == 0;
+ if (outside)
+ {
+ decoratedActualInstance.set(instance);
+ }
+
try
{
int i = decoratorStackPosition.get();
@@ -211,7 +219,10 @@
try
{
T proxy = proxyClassForDecorators.newInstance();
- ((ProxyObject) proxy).setHandler(new DecoratorProxyMethodHandler(decoratorInstances, instance));
+ // temporary fix for decorators - make sure that the instance wrapped by the decorators
+ // is the contextual instance
+ // TODO - correct the decoration algorithm to avoid the creation of new target class instances
+ ((ProxyObject) proxy).setHandler(new DecoratorProxyMethodHandler(decoratorInstances, decoratedActualInstance.get()));
return proxy;
}
catch (InstantiationException e)
@@ -222,6 +233,13 @@
{
throw new RuntimeException("Could not access bean correctly when creating decorator proxy for " + toString(), e);
}
+ finally
+ {
+ if (outside)
+ {
+ decoratedActualInstance.set(null);
+ }
+ }
}
public List<Decorator<?>> getDecorators()
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/decorators/SimpleDecoratorTest.java 2009-11-06 05:44:56 UTC (rev 4712)
@@ -14,7 +14,7 @@
@BeansXml("beans.xml")
public class SimpleDecoratorTest extends AbstractWeldTest
{
- @Test(groups = "broken")
+ @Test
public void testSimpleDecorator()
{
SimpleBean simpleBean = getCurrentManager().getInstanceByType(SimpleBean.class);
16 years, 5 months
- 1
- 0
Weld SVN: r4711 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/application/ejb and 102 other directories.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-06 00:26:28 -0500 (Fri, 06 Nov 2009)
New Revision: 4711
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/DestroyForSameCreationalContext2Test.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/application/ejb/EJBApplicationContextTest.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/client/ClientConversationContextTest.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/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/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.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/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/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/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/finalBeanClass/FinalBeanClassTest.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/inject/delegateConstructor/DelegateInjectionPointTest.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/interceptor/DecoratorAndInterceptorTest.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/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/scope/ScopeDefinitionTest.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/inheritance/StereotypeInheritenceTest.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/failsDuringValidation/AfterBeanDiscoveryFailureTest.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/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/isProducer/ObserverMethodAnnotatedProducesTest.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/fires/FireEventTest.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/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/runtimeException/ObserverExceptionRethrownTest.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/extensions/alternative/metadata/AlternativeMetadataTest.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/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.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/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/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/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/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/definition/EnterpriseBeanDefinitionTest.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/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/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.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/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.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/persistenceContext/PersistenceContextInjectionTest.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/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/simple/SimpleBeanSpecializationTest.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/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.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/enterprise/SessionBeanInterceptorDefinitionTest.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/lookup/binding/members/array/BindingAnnotationWithMemberTest.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/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/incontainer/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/dynamic/DynamicLookupTest.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/non/contextual/ws/InjectionIntoWebServiceEndPointTest.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/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/parameterized/AssignabilityOfRawAndParameterizedTypesTest.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
Log:
assertion mappings
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyForSameCreationalContext2Test.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -18,7 +18,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DestroyForSameCreationalContext2Test extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/application/ejb/EJBApplicationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/ConversationIdSetByApplicationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ConversationIdSetByContainerTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ClientConversationContextTest extends AbstractConversationTest
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingBeanConstructorTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ManagedBeanWithNonSerializableInterceptorClassTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -19,7 +19,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -40,7 +40,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
@Test
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class FinalBeanClassTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test
{
@Test
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DelegateInjectionPointTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/interceptor/DecoratorAndInterceptorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DecoratorAndInterceptorTest extends AbstractJSR299Test
{
@Test
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -33,7 +33,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@Packaging(PackagingType.EAR)
@IntegrationTest
public class EJBDecoratorInvocationTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -20,7 +20,7 @@
* @author Pete Muir
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class BeanDefinitionTest extends AbstractJSR299Test
{
@@ -64,7 +64,7 @@
@Test(groups = "producerMethod")
@SpecAssertions({
@SpecAssertion(section = "2.2.1", id = "j"),
- @SpecAssertion(section = "5.3.4", id = "ba"),
+ @SpecAssertion(section = "5.2.4", id = "ba"),
@SpecAssertion(section = "11.1", id = "bd")
})
public void testIsNullable() throws Exception
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -27,7 +27,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@@ -37,8 +37,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.1", id = "b"),
- @SpecAssertion(section = "5.2.1", id = "k")
+ //@SpecAssertion(section = "5.1", id = "b"),
+ @SpecAssertion(section = "5.1.1", id = "k")
})
public void testGetBeanClassCalled()
{
@@ -46,7 +46,7 @@
}
@Test(groups = { "ri-broken" })
- @SpecAssertion(section = "5.2.1", id = "k")
+ @SpecAssertion(section = "5.1.1", id = "k")
// WBRI-328
public void testGetStereotypesCalled()
{
@@ -54,35 +54,35 @@
}
@Test
- @SpecAssertion(section = "5.2.1", id = "k")
+ @SpecAssertion(section = "5.1.1", id = "k")
public void testIsPolicyCalled()
{
assert CatBean.bean.isPolicyCalled();
}
@Test
- @SpecAssertion(section = "5.3", id = "na")
+ @SpecAssertion(section = "5.2", id = "na")
public void testGetTypesCalled()
{
assert CatBean.bean.isGetTypesCalled();
}
@Test
- @SpecAssertion(section = "5.3", id = "nb")
+ @SpecAssertion(section = "5.2", id = "nb")
public void testGetBindingsCalled()
{
assert CatBean.bean.isGetBindingsCalled();
}
@Test
- @SpecAssertion(section = "5.3.1", id = "b")
+ @SpecAssertion(section = "5.2.1", id = "b")
public void testGetInjectionPointsCalled()
{
assert CatBean.bean.isGetInjectionPointsCalled();
}
@Test(groups = { "ri-broken" })
- @SpecAssertion(section = "5.3.4", id = "ba")
+ @SpecAssertion(section = "5.2.4", id = "ba")
// WBRI-328
public void testIsNullableCalled()
{
@@ -90,7 +90,7 @@
}
@Test
- @SpecAssertion(section = "5.4", id = "e")
+ @SpecAssertion(section = "5.3", id = "e")
public void testGetNameCalled()
{
assert CatBean.bean.isGetNameCalled();
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -19,7 +19,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ScopeDefinitionTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class TooManyScopeTypesTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -35,7 +35,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class StereotypeInheritenceTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -17,7 +17,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -36,7 +36,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class AfterBeanDiscoveryFailureTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -32,7 +32,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class UseBeforeValidationTest extends AbstractJSR299Test
{
@Test(groups = {"broken", "rewrite"})
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -29,7 +29,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodOnIncorrectBeanTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -32,7 +32,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodAnnotatedProducesTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -29,7 +29,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/observer/ObserverTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ObserverTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -21,7 +21,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/runtimeException/ObserverExceptionRethrownTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,7 +30,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -45,7 +45,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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class AlternativeMetadataTest extends AbstractJSR299Test
{
@Test
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -39,7 +39,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class BeanByTypeTest extends AbstractJSR299Test
{
@Test
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,7 +30,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Resource(source = "javax.enterprise.inject.spi.Extension", destination = "WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
@IntegrationTest
-@SpecVersion(spec = "cdi", version = "20091018")
+@SpecVersion(spec = "cdi", version = "20091101")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
@Test(groups = "jboss-as-broken")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ProcessObserverMethodEventTest extends AbstractJSR299Test
{
@Test
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ProcessSessionBeanTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -27,7 +27,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DisposalMethodDefinitionTest extends AbstractJSR299Test
{
private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {};
@@ -24,14 +24,14 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "2.3.5", id = "c"),
- @SpecAssertion(section = "3.3.5", id = "b"),
- @SpecAssertion(section = "3.3.5", id = "c"),
- @SpecAssertion(section = "3.3.5", id = "e"),
- @SpecAssertion(section = "3.3.6", id = "ba"),
- @SpecAssertion(section = "3.3.7", id = "a"),
- @SpecAssertion(section = "3.3.7", id = "b0"),
- @SpecAssertion(section = "3.3.9", id = "aa"),
- @SpecAssertion(section = "5.6.6", id = "b")
+ @SpecAssertion(section = "3.3.4", id = "b"),
+ @SpecAssertion(section = "3.3.4", id = "c"),
+ @SpecAssertion(section = "3.3.4", id = "e"),
+ @SpecAssertion(section = "3.3.5", id = "ba"),
+ @SpecAssertion(section = "3.3.6", id = "a"),
+ @SpecAssertion(section = "3.3.6", id = "b0"),
+ @SpecAssertion(section = "3.3.7", id = "aa"),
+ @SpecAssertion(section = "5.5.4", id = "b")
})
public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception
{
@@ -47,8 +47,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.3.5", id = "aa"),
- @SpecAssertion(section = "3.3.6", id = "ba")
+ @SpecAssertion(section = "3.3.4", id = "aa"),
+ @SpecAssertion(section = "3.3.5", id = "ba")
})
public void testDisposalMethodOnNonBean() throws Exception
{
@@ -69,7 +69,7 @@
*/
@Test(groups = { "disposalMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.3.8", id = "a"),
+ @SpecAssertion(section = "3.3.6", id = "h"),
@SpecAssertion(section = "3.10", id = "a")
})
public void testDisposalMethodParametersGetInjected() throws Exception
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,13 +14,13 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.3.6", id = "a"),
- @SpecAssertion(section = "3.3.7", id = "ba")
+ @SpecAssertion(section = "3.3.5", id = "a"),
+ @SpecAssertion(section = "3.3.6", id = "ba")
})
public void testMultipleDisposeParameters()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,11 +12,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.3.7", id = "ea")
+ @SpecAssertion(section = "3.3.6", id = "ea")
public void testObserverParameterUnallowed()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class StatelessWithRequestScopeTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -24,7 +24,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -36,7 +36,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test
{
@@ -44,7 +44,6 @@
@SpecAssertions( {
@SpecAssertion(section = "7.3.2", id = "aa"),
@SpecAssertion(section = "7.3.2", id = "bb"),
- //@SpecAssertion(section = "7.3.3", id = "b"),
@SpecAssertion(section = "6.5.3", id = "b"),
@SpecAssertion(section = "12.1", id="bba")
})
@@ -148,7 +147,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "3.9.2", id = "b")
+ @SpecAssertion(section = "3.9.1", id = "f")
public void testInitializerMethodsCalledWithCurrentParameterValues()
{
AlteStadt alteStadt = getInstanceByType(AlteStadt.class);
@@ -157,7 +156,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle" })
- @SpecAssertion(section = "5.6.5", id = "a")
+ @SpecAssertion(section = "5.5.3", id = "a")
public void testDependentObjectsDestroyed()
{
Bean<UniStadt> uniStadtBean = getBeans(UniStadt.class).iterator().next();
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -18,7 +18,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,13 +11,13 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class InitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.9.2", id = "b"),
+ @SpecAssertion(section = "3.9.1", id = "f"),
@SpecAssertion(section = "2.3.5", id = "b")
})
public void testBindingTypeOnInitializerParameter()
@@ -32,8 +32,8 @@
@SpecAssertions({
@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 = "ad"),
+ @SpecAssertion(section = "3.9.1", id = "e"),
+ @SpecAssertion(section = "5.5.2", id = "ad"),
@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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -17,7 +17,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseProducerFieldDefinitionTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -21,7 +21,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ProducerMethodDefinitionTest extends AbstractJSR299Test
{
@@ -31,7 +31,7 @@
@Test(groups = "producerMethod")
@SpecAssertions( {
@SpecAssertion(section = "3.3", id = "b"),
- @SpecAssertion(section = "5.6.6", id = "a")
+ @SpecAssertion(section = "5.5.4", id = "a")
} )
public void testStaticMethod() throws Exception
{
@@ -50,7 +50,7 @@
@Test(groups = "producerMethod")
@SpecAssertions( {
- @SpecAssertion(section = "3.3.5", id = "b")
+ @SpecAssertion(section = "3.3.4", id = "b")
} )
public void testStaticDisposerMethod() throws Exception
{
@@ -182,7 +182,7 @@
@SpecAssertion(section = "3.3.2", id = "bb"),
@SpecAssertion(section = "2.5.2", id = "b"),
@SpecAssertion(section = "2.5.1", id = "d"),
- @SpecAssertion(section = "3.3.10", id = "a")
+ @SpecAssertion(section = "3.3.8", id = "a")
})
public void testDefaultNamedMethod() throws Exception
{
@@ -231,8 +231,8 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "2.3.5", id = "a"),
- @SpecAssertion(section = "3.3.3", id = "c"),
- @SpecAssertion(section = "3.3.3", id = "b")
+ @SpecAssertion(section = "3.3.2", id = "i"),
+ @SpecAssertion(section = "3.3.3", id = "h")
})
public void testBindingTypesAppliedToProducerMethodParameters()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -23,7 +23,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ProducerMethodLifecycleTest extends AbstractJSR299Test
{
private AnnotationLiteral<Pet> PET_LITERAL = new AnnotationLiteral<Pet>() {};
@@ -73,8 +73,7 @@
@Test(groups = { "producerMethod" })
@SpecAssertions({
- //@SpecAssertion(section = "4.3.2", id = "ab"), removed from spec
- @SpecAssertion(section = "5.6.6", id = "c"),
+ @SpecAssertion(section = "5.5.4", id = "c"),
@SpecAssertion(section="4.3", id="cb")
})
public void testProducerMethodFromMostSpecializedBeanUsed()
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -27,7 +27,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class NewSimpleBeanTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class PersistenceContextInjectionTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -20,7 +20,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -20,7 +20,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ImplementsInterfaceAndExtendsNothingTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ProducerMethodSpecializationTest extends AbstractJSR299Test
{
@@ -25,8 +25,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.6.6", id = "c"),
- @SpecAssertion(section = "3.3.4", id = "aa")
+ @SpecAssertion(section = "5.5.4", id = "c"),
+ @SpecAssertion(section = "3.3.3", id = "aa")
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,12 +11,12 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class IndirectOverrideTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section="3.3.4", id = "ca")
+ @SpecAssertion(section="3.3.3", id = "ca")
public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -17,7 +17,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class SimpleBeanSpecializationTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -47,7 +47,7 @@
* @author Marius Bogoevici
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InterceptorDefinitionTest extends AbstractJSR299Test
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InvalidInterceptorBindingAnnotationsTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class NonInterceptorClassInBeansXmlTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -14,7 +14,7 @@
@IntegrationTest
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class SessionBeanInterceptorDefinitionTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
@BeansXml("beans.xml")
public class InterceptorNotListedInBeansXmlNotEnabledTest 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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -26,12 +26,12 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "5.3.5", id = "b")
+ @SpecAssertion(section = "5.2.5", id = "b")
public void testArrayMemberWithoutNonBinding()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -27,12 +27,12 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DuplicateNameResolutionTest extends AbstractJSR299Test
{
@Test(groups = { "resolution", "el"})
- @SpecAssertion(section = "5.4.1", id = "da")
+ @SpecAssertion(section = "5.3.1", id = "da")
public void testDuplicateNamedBeans() throws Exception
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -23,7 +23,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -29,11 +29,11 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ClientProxyTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "5.5", id = "b")
+ @SpecAssertion(section = "5.4", id = "b")
public void testClientProxyUsedForNormalScope()
{
Tuna tuna = getInstanceByType(Tuna.class);
@@ -41,7 +41,7 @@
}
@Test
- @SpecAssertion(section = "5.5", id = "c")
+ @SpecAssertion(section = "5.4", id = "c")
public void testSimpleBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
{
TunedTuna tuna = getInstanceByType(TunedTuna.class);
@@ -53,7 +53,7 @@
}
@Test
- @SpecAssertion(section = "5.5.2", id = "aa")
+ @SpecAssertion(section = "5.4.2", id = "aa")
public void testClientProxyInvocation()
{
Bean<TunedTuna> tunaBean = getBeans(TunedTuna.class).iterator().next();
@@ -64,7 +64,7 @@
}
@Test(expectedExceptions = { ContextNotActiveException.class, IllegalStateException.class })
@SpecAssertions({
- @SpecAssertion(section="5.5.2", id="ab"),
+ @SpecAssertion(section="5.4.2", id="ab"),
@SpecAssertion(section = "6.5.4", id="a")
})
public void testInactiveScope() throws Exception
@@ -84,7 +84,7 @@
}
@Test(groups = "ri-broken")
- @SpecAssertion(section = "5.5", id = "d")
+ @SpecAssertion(section = "5.4", id = "d")
//WELD-229
public void testInvocationIsProcessedOnCurrentInstance() {
// create new car
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,11 +30,11 @@
@Artifact
@IntegrationTest(runLocally = true)
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ClientProxyTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "5.5", id = "d")
+ @SpecAssertion(section = "5.4", id = "d")
public void testInvocationIsProcessedOnCurrentInstance() throws Exception {
WebClient webClient = new WebClient();
webClient.setThrowExceptionOnFailingStatusCode(true);
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -30,13 +30,13 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ArrayTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.5.1", id = "da"),
- @SpecAssertion(section = "12.4", id = "b")
+ @SpecAssertion(section = "5.4.1", id = "da"),
+ @SpecAssertion(section = "2.8", id = "b")
})
public void testInjectionPointWithArrayType()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -26,11 +26,11 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class FinalClassTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "5.5.1", id = "baa")
+ @SpecAssertion(section = "5.4.1", id = "baa")
public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -40,12 +40,12 @@
* @author Jozef Hartinger
*/
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class DynamicLookupTest extends AbstractJSR299Test
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.7", id ="aa")
+ @SpecAssertion(section = "5.6", id ="aa")
})
public void testObtainsInjectsInstanceOfInstance()
{
@@ -54,7 +54,7 @@
}
@Test(expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section = "5.7.1", id ="da")
+ @SpecAssertion(section = "5.6.1", id ="da")
public void testDuplicateBindingsThrowsException()
{
ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
@@ -62,7 +62,7 @@
}
@Test(expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section = "5.7.1", id = "e")
+ @SpecAssertion(section = "5.6.1", id = "e")
public void testNonBindingThrowsException()
{
ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
@@ -71,12 +71,12 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.7", id="ba"),
- @SpecAssertion(section = "5.7", id ="ca"),
- @SpecAssertion(section = "5.7.1", id ="aa"),
- @SpecAssertion(section = "5.7.1", id ="ab"),
- @SpecAssertion(section = "5.7.1", id="fa"),
- @SpecAssertion(section = "5.7.1", id="fc")
+ @SpecAssertion(section = "5.6", id="ba"),
+ @SpecAssertion(section = "5.6", id ="ca"),
+ @SpecAssertion(section = "5.6.1", id ="aa"),
+ @SpecAssertion(section = "5.6.1", id ="ab"),
+ @SpecAssertion(section = "5.6.1", id="fa"),
+ @SpecAssertion(section = "5.6.1", id="fc")
})
public void testGetMethod() {
// initial setup of contextual instance
@@ -88,14 +88,14 @@
}
@Test(expectedExceptions = UnsatisfiedResolutionException.class)
- @SpecAssertion(section = "5.7.1", id = "fba")
+ @SpecAssertion(section = "5.6.1", id = "fba")
public void testUnsatisfiedDependencyThrowsException()
{
getInstanceByType(ObtainsInstanceBean.class).getPaymentProcessor().select(RemotePaymentProcessor.class).get();
}
@Test(expectedExceptions = AmbiguousResolutionException.class)
- @SpecAssertion(section = "5.7.1", id = "fbb")
+ @SpecAssertion(section = "5.6.1", id = "fbb")
public void testAmbiguousDependencyThrowsException()
{
getInstanceByType(ObtainsInstanceBean.class).getAnyPaymentProcessor().get();
@@ -103,10 +103,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section="5.7.1", id="aa"),
- @SpecAssertion(section="5.7.1", id="ba"),
- @SpecAssertion(section="5.7.1", id="ja"),
- @SpecAssertion(section="5.7.1", id="ka")
+ @SpecAssertion(section="5.6.1", id="aa"),
+ @SpecAssertion(section="5.6.1", id="ba"),
+ @SpecAssertion(section="5.6.1", id="ja"),
+ @SpecAssertion(section="5.6.1", id="ka")
})
public void testIteratorMethod()
{
@@ -157,7 +157,7 @@
}
@Test
- @SpecAssertion(section = "5.7.1", id = "l")
+ @SpecAssertion(section = "5.6.1", id = "l")
public void testIsUnsatisfied()
{
ObtainsInstanceBean injectionPoint = getInstanceByType(ObtainsInstanceBean.class);
@@ -167,8 +167,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.7", id = "da"),
- @SpecAssertion(section = "5.7.1", id = "m")
+ @SpecAssertion(section = "5.6", id = "da"),
+ @SpecAssertion(section = "5.6.1", id = "m")
})
public void testIsAmbiguous()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -28,7 +28,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ResolutionByNameTest extends AbstractJSR299Test
{
@@ -52,14 +52,14 @@
}
@Test(groups={"el"})
- @SpecAssertion(section="5.8", id="bb")
+ @SpecAssertion(section="12.4", id="c")
public void testUnresolvedNameReturnsNull() {
assert getCurrentManager().getELResolver().getValue(getCurrentConfiguration().getEl().createELContext(), null, "nonExistingTuna") == null;
}
@Test(groups = "el")
@SpecAssertions({
- @SpecAssertion(section="5.8", id="bc"),
+ @SpecAssertion(section="12.4", id="d"),
@SpecAssertion(section="2.5", id="a")
})
public void testELResolverReturnsContextualInstance() {
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -35,11 +35,11 @@
@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="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class IntegrationWithUnifiedELTest extends AbstractJSR299Test
{
@Test(groups = {"el" } )
- @SpecAssertion(section = "5.8", id = "aba")
+ @SpecAssertion(section = "12.4", id = "a")
public void testELResolverRegisteredWithJsf() throws Exception
{
WebClient webclient = new WebClient();
@@ -48,7 +48,7 @@
}
@Test(groups = { "el" } )
- @SpecAssertion(section = "5.8", id = "aaa")
+ @SpecAssertion(section = "12.4", id = "a")
public void testELResolverRegisteredWithServletContainer() throws Exception
{
WebClient webclient = new WebClient();
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -10,11 +10,11 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class InjectionTest extends AbstractJSR299Test
{
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.3.4", id = "aa")
+ @SpecAssertion(section = "5.2.4", id = "aa")
public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
assert getBeans(SpiderNest.class).size() == 1;
@@ -25,9 +25,9 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.3", id = "kc"),
- @SpecAssertion(section = "5.6", id = "b"),
- @SpecAssertion(section = "5.6.4", id = "ac")
+ @SpecAssertion(section = "5.2", id = "kc"),
+ @SpecAssertion(section = "5.5", id = "b"),
+ @SpecAssertion(section = "5.5.2", id = "ac")
})
public void testInjectionOfNamedBean()
{
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -31,7 +31,7 @@
@Artifact
@IntegrationTest(runLocally = true)
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test
{
@WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...")
@@ -39,9 +39,9 @@
@Test(groups = "jboss-as-broken")
@SpecAssertions({
- @SpecAssertion(section = "5.6", id = "ee"),
- @SpecAssertion(section = "5.6.4", id = "aq"),
- @SpecAssertion(section = "5.6.4", id = "ar")
+ @SpecAssertion(section = "5.5", id = "ee"),
+ @SpecAssertion(section = "5.5.2", id = "aq"),
+ @SpecAssertion(section = "5.5.2", id = "ar")
})
// JBAS-7046
public void testInjectionIntoWebServiceEndpoint() throws Exception
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -11,7 +11,7 @@
@Artifact
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
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/ResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -37,7 +37,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class ResolutionByTypeTest extends AbstractJSR299Test
{
@@ -49,7 +49,7 @@
private static final Annotation WILD = new AnnotationLiteral<Wild>() {};
@Test(groups = "resolution")
- @SpecAssertion(section = "5.3", id = "lb")
+ @SpecAssertion(section = "5.2", id = "lb")
public void testDefaultBindingTypeAssumed() throws Exception
{
Set<Bean<Tuna>> possibleTargets = getBeans(Tuna.class);
@@ -58,7 +58,7 @@
}
@Test(groups = "resolution")
- @SpecAssertion(section = "5.3", id = "hc")
+ @SpecAssertion(section = "5.2", id = "hc")
public void testResolveByType() throws Exception
{
@@ -94,11 +94,11 @@
@Test(groups = "injection")
@SpecAssertions( {
@SpecAssertion(section = "2.3.4", id = "b"),
- @SpecAssertion(section = "5.3", id = "lc"),
+ @SpecAssertion(section = "5.2", id = "lc"),
@SpecAssertion(section = "2.3.3", id = "d"),
- @SpecAssertion(section = "5.3", id = "la"),
- @SpecAssertion(section = "5.3.6", id = "a"),
- @SpecAssertion(section = "5.3.6", id = "d") })
+ @SpecAssertion(section = "5.2", id = "la"),
+ @SpecAssertion(section = "5.2.6", id = "a"),
+ @SpecAssertion(section = "5.2.6", id = "d") })
public void testAllQualifiersSpecifiedForResolutionMustAppearOnBean()
{
assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>()
@@ -132,7 +132,7 @@
@Test(groups = { "resolution" })
@SpecAssertions( {
- @SpecAssertion(section = "5.3", id = "ka")
+ @SpecAssertion(section = "5.2", id = "ka")
})
public void testResolveByTypeWithTypeParameter() throws Exception
{
@@ -143,7 +143,7 @@
@Test(groups = { "resolution", "producerMethod" })
@SpecAssertions( {
- @SpecAssertion(section = "5.3", id = "j"),
+ @SpecAssertion(section = "5.2", id = "j"),
@SpecAssertion(section="2.2.1", id = "i") } )
public void testResolveByTypeWithArray() throws Exception
{
@@ -152,11 +152,11 @@
@Test(groups = { "resolution" })
@SpecAssertions( {
- @SpecAssertion(section = "5.3", id = "i"),
- @SpecAssertion(section = "5.3.4", id = "aa"),
- @SpecAssertion(section = "5.3.4", id = "ab"),
- @SpecAssertion(section = "5.3.6", id = "b"),
- @SpecAssertion(section = "5.3.6", id = "c") })
+ @SpecAssertion(section = "5.2", id = "i"),
+ @SpecAssertion(section = "5.2.4", id = "aa"),
+ @SpecAssertion(section = "5.2.4", id = "ab"),
+ @SpecAssertion(section = "5.2.6", id = "b"),
+ @SpecAssertion(section = "5.2.6", id = "c") })
public void testResolveByTypeWithPrimitives()
{
assert getBeans(Double.class, new AnyLiteral()).size() == 2;
@@ -171,8 +171,8 @@
@Test(groups = "resolution")
@SpecAssertions( {
- @SpecAssertion(section = "5.3", id = "ld"),
- @SpecAssertion(section = "5.3.5", id = "b")
+ @SpecAssertion(section = "5.2", id = "ld"),
+ @SpecAssertion(section = "5.2.5", id = "b")
})
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
@@ -203,7 +203,7 @@
}
@Test(groups = { "policy" })
- @SpecAssertion(section = "5.2", id = "a")
+ @SpecAssertion(section = "5.1", id = "a")
public void testPolicyNotAvailableInNonDeploymentArchive() throws Exception
{
Set<Bean<Spider>> spiders = getBeans(Spider.class);
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -26,11 +26,11 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class PrimitiveInjectionPointTest extends AbstractJSR299Test
{
@Test(groups={"resolution", "producerMethod"})
- @SpecAssertion(section="5.3.4", id="aa")
+ @SpecAssertion(section="5.2.4", id="aa")
public void testPrimitiveInjectionPointResolvedToNonPrimitiveProducerMethod() {
assert false;
}
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -26,11 +26,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class TypeVariableInjectionPointTest extends AbstractJSR299Test
{
@Test(groups = { "resolution"})
- @SpecAssertion(section = "5.3.2", id = "c")
+ @SpecAssertion(section = "5.2.2", id = "c")
public void testTypeVariableInjectionPoint()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -31,13 +31,13 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test
{
@Test(groups = { "resolution" })
@SpecAssertions({
- @SpecAssertion(section = "5.3.3", id = "a"),
+ @SpecAssertion(section = "5.2.3", id = "a"),
@SpecAssertion(section = "2.2.1", id = "f"),
@SpecAssertion(section = "2.2.1", id = "g")
})
@@ -48,7 +48,7 @@
}
@Test(groups= {"resolution"})
- @SpecAssertion(section = "5.3.3", id = "b")
+ @SpecAssertion(section = "5.2.3", id = "b")
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes()
{
assert getBeans(new TypeLiteral<Map<Integer, Integer>>(){}).size() == 2;
@@ -57,7 +57,7 @@
@Test(groups = { "resolution"})
@SpecAssertions({
- @SpecAssertion(section = "5.3.3", id = "c")})
+ @SpecAssertion(section = "5.2.3", id = "c")})
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards()
{
assert getBeans(new TypeLiteral<HashMap<? extends Number, ? super Integer>>() {}).size() == 1;
@@ -66,7 +66,7 @@
@Test(groups = { "resolution"})
@SpecAssertions({
- @SpecAssertion(section = "5.3.2", id = "b")
+ @SpecAssertion(section = "5.2.2", id = "b")
})
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcardsAtInjectionPoint()
{
@@ -74,7 +74,7 @@
}
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.3.3", id = "d")
+ @SpecAssertion(section = "5.2.3", id = "d")
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards()
{
Set<Bean<Result<? extends Throwable, ? super Exception>>> beans = getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){});
@@ -83,7 +83,7 @@
}
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.3.3", id = "e")
+ @SpecAssertion(section = "5.2.3", id = "e")
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes()
{
Set<Bean<Result<Exception, Exception>>> beans = getBeans(new TypeLiteral<Result<Exception, Exception>>(){});
@@ -92,7 +92,7 @@
}
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.3.3", id = "f")
+ @SpecAssertion(section = "5.2.3", id = "f")
public <T1 extends Exception, T2 extends Exception> void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeTypeVariable()
{
Set<Bean<Result<T1, T2>>> beans = getBeans(new TypeLiteral<Result<T1, T2>>(){});
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test
{
@Test(groups = { "policy" })
- @SpecAssertion(section="5.2.1", id="h")
+ @SpecAssertion(section="5.1.1", id="h")
public void test()
{
assert false;
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-11-06 05:04:39 UTC (rev 4710)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-11-06 05:26:28 UTC (rev 4711)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="20091018")
+@SpecVersion(spec="cdi", version="20091101")
public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test
{
@Test(groups = { "policy"})
- @SpecAssertion(section="5.2.1", id="i")
+ @SpecAssertion(section="5.1.1", id="i")
public void test()
{
assert false;
16 years, 5 months
- 1
- 0
Weld SVN: r4710 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-06 00:04:39 -0500 (Fri, 06 Nov 2009)
New Revision: 4710
Modified:
doc/trunk/reference/en-US/interceptors.xml
Log:
typo
Modified: doc/trunk/reference/en-US/interceptors.xml
===================================================================
--- doc/trunk/reference/en-US/interceptors.xml 2009-11-06 00:57:28 UTC (rev 4709)
+++ doc/trunk/reference/en-US/interceptors.xml 2009-11-06 05:04:39 UTC (rev 4710)
@@ -138,7 +138,7 @@
<para>Whoah! Why the angle bracket stew?</para>
<para>
- Well, have the XML declaration is actually a <emphasis>good thing</emphasis>. It solves two problems:
+ Well, having the XML declaration is actually a <emphasis>good thing</emphasis>. It solves two problems:
</para>
<itemizedlist>
16 years, 5 months
- 1
- 0
Weld SVN: r4709 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-05 19:57:28 -0500 (Thu, 05 Nov 2009)
New Revision: 4709
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
clarify
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-06 00:41:41 UTC (rev 4708)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-06 00:57:28 UTC (rev 4709)
@@ -139,6 +139,10 @@
* the given identifier.
*
* @param id the identifier
+ * @return a {@link Bean} that implements
+ * {@link javax.enterprise.inject.spi.PassivationCapable}
+ * and has the given identifier, or a null value if there
+ * is no such bean
*/
public Bean<?> getPassivationCapableBean(String id);
16 years, 5 months
- 1
- 0
Weld SVN: r4708 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-05 19:41:41 -0500 (Thu, 05 Nov 2009)
New Revision: 4708
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
clarify
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java 2009-11-06 00:13:45 UTC (rev 4707)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java 2009-11-06 00:41:41 UTC (rev 4708)
@@ -20,7 +20,7 @@
import java.util.Set;
/**
- * <p>Represents a Java type.</p>
+ * <p>Represents a Java class or interface.</p>
*
* @author Gavin King
* @author Pete Muir
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-06 00:13:45 UTC (rev 4707)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-06 00:41:41 UTC (rev 4708)
@@ -342,10 +342,11 @@
public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory);
/**
- * Obtain an {@link AnnotatedType} for the given class.
+ * Obtain an {@link AnnotatedType} that may be used to read the annotations
+ * of the given class or interface.
*
- * @param <T> the class
- * @param type the class
+ * @param <T> the class or interface
+ * @param type the {@link java.lang.Class} object
* @return the {@link AnnotatedType}
*/
public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);
16 years, 5 months
- 1
- 0