Weld SVN: r4171 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:38:09 -0400 (Sat, 17 Oct 2009)
New Revision: 4171
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/UnserializableManagedBean.java
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
Log:
Remove bean which errors for another reason :-)
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-17 18:37:42 UTC (rev 4170)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-17 18:38:09 UTC (rev 4171)
@@ -13,7 +13,7 @@
class BrokenInterceptor implements Serializable
{
@Inject
- public BrokenInterceptor(@Default Violation violation)
+ public BrokenInterceptor(@Default UnserializableManagedBean violation)
{
}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/UnserializableManagedBean.java (from rev 4164, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/UnserializableManagedBean.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/UnserializableManagedBean.java 2009-10-17 18:38:09 UTC (rev 4171)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
+
+class UnserializableManagedBean
+{
+
+}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java 2009-10-17 18:37:42 UTC (rev 4170)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/Violation.java 2009-10-17 18:38:09 UTC (rev 4171)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
-
-class Violation
-{
- public Violation(String foo) {}
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java 2009-10-17 18:37:42 UTC (rev 4170)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ViolationProducer.java 2009-10-17 18:38:09 UTC (rev 4171)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
-
-import javax.enterprise.inject.Produces;
-
-class ViolationProducer
-{
- public final @Produces Violation getViolation() { return new Violation(null); }
-}
15 years, 1 month
Weld SVN: r4170 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:37:42 -0400 (Sat, 17 Oct 2009)
New Revision: 4170
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
Log:
mark broken
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-10-17 18:37:21 UTC (rev 4169)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-10-17 18:37:42 UTC (rev 4170)
@@ -8,7 +8,6 @@
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-
import org.testng.annotations.Test;
@@ -19,7 +18,7 @@
@BeansXml("beans.xml")
public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "7.2", id = "c")
public void testSessionBeanIsIntercepted()
{
15 years, 1 month
Weld SVN: r4169 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken: dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:37:21 -0400 (Sat, 17 Oct 2009)
New Revision: 4169
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/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
Log:
shorter names
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-17 18:35:26 UTC (rev 4168)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-17 18:37:21 UTC (rev 4169)
@@ -21,7 +21,7 @@
{
@Test(groups = { "contexts", "passivation", "integration"})
@SpecAssertion(section = "6.6.4", id = "fb")
- public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails()
+ public void test()
{
assert false;
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-17 18:35:26 UTC (rev 4168)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-10-17 18:37:21 UTC (rev 4169)
@@ -21,7 +21,7 @@
{
@Test(groups = { "contexts", "passivation", "integration"})
@SpecAssertion(section = "6.6.4", id = "fa")
- public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails()
+ public void test()
{
assert false;
}
15 years, 1 month
Weld SVN: r4168 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:35:26 -0400 (Sat, 17 Oct 2009)
New Revision: 4168
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
Log:
less verbose
Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2009-10-17 18:35:02 UTC (rev 4167)
+++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2009-10-17 18:35:26 UTC (rev 4168)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="JSR-299 TCK" verbose="1" >
+<suite name="JSR-299 TCK" verbose="0" >
<test name="JSR-299 TCK">
<method-selectors>
<method-selector>
15 years, 1 month
Weld SVN: r4167 - core/trunk/impl/src/main/java/org/jboss/weld.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:35:02 -0400 (Sat, 17 Oct 2009)
New Revision: 4167
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
Log:
restore previous exception, it is needed :-)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-17 18:34:25 UTC (rev 4166)
+++ core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-17 18:35:02 UTC (rev 4167)
@@ -38,27 +38,27 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.InjectionTarget;
+import org.jboss.interceptor.model.InterceptionModel;
import org.jboss.weld.bean.AbstractClassBean;
import org.jboss.weld.bean.AbstractProducerBean;
import org.jboss.weld.bean.DecoratorImpl;
import org.jboss.weld.bean.DisposalMethod;
+import org.jboss.weld.bean.ManagedBean;
import org.jboss.weld.bean.NewManagedBean;
import org.jboss.weld.bean.NewSessionBean;
import org.jboss.weld.bean.RIBean;
-import org.jboss.weld.bean.ManagedBean;
import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.context.SerializableContextual;
import org.jboss.weld.introspector.WeldAnnotated;
import org.jboss.weld.metadata.cache.MetaAnnotationStore;
import org.jboss.weld.resolution.ResolvableWeldClass;
import org.jboss.weld.util.Beans;
import org.jboss.weld.util.Proxies;
import org.jboss.weld.util.Reflections;
-import org.jboss.weld.context.SerializableContextual;
-import org.jboss.interceptor.model.InterceptionModel;
import com.google.common.base.Supplier;
import com.google.common.collect.Multimap;
@@ -256,7 +256,7 @@
{
if (resolvedBean.getScope().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?, ?,?>)
{
- throw new UnserializableDependencyException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean);
+ throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean);
}
throw new UnserializableDependencyException("The bean " + ij.getBean() + " declares a passivating scope but has non-serializable dependency: " + resolvedBean);
}
15 years, 1 month
Weld SVN: r4166 - in core/trunk/impl/src/main/java/org/jboss/weld: util and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:34:25 -0400 (Sat, 17 Oct 2009)
New Revision: 4166
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
Log:
merge marius' and my version fixes :-)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-17 18:33:57 UTC (rev 4165)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-17 18:34:25 UTC (rev 4166)
@@ -146,7 +146,7 @@
static
{
- log.info("Weld " + getVersion());
+ log.info("Weld " + Names.version(WeldBootstrap.class.getPackage()));
}
// The Bean manager
@@ -310,23 +310,6 @@
}
return this;
}
-
- /**
- * Gets version information
- *
- * @return The implementation version from the Bootstrap class package.
- */
- public static String getVersion()
- {
- Package pkg = WeldBootstrap.class.getPackage();
- if (pkg != null)
- {
- //allow for the case when pkg.getImplementationVersion() == null
- String pkgImplementationVersion = pkg.getImplementationVersion();
- return pkgImplementationVersion != null ? Names.version(pkgImplementationVersion) : null;
- }
- return null;
- }
protected void initializeContexts()
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-10-17 18:33:57 UTC (rev 4165)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-10-17 18:34:25 UTC (rev 4166)
@@ -333,9 +333,17 @@
return buffer.toString();
}
- public static String version(String version)
+ public static String version(Package pkg)
{
- return new StringBuilder().append(version.substring(0, version.lastIndexOf("-"))).append(" (").append(version.substring(version.lastIndexOf("-") + 1)).append(")").toString();
+ if (pkg != null)
+ {
+ String version = pkg.getImplementationVersion();
+ if (version != null)
+ {
+ return new StringBuilder().append(version.substring(0, version.lastIndexOf("-"))).append(" (").append(version.substring(version.lastIndexOf("-") + 1)).append(")").toString();
+ }
+ }
+ return "SNAPSHOT";
}
}
15 years, 1 month
Weld SVN: r4165 - core/trunk/tests.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-17 14:33:57 -0400 (Sat, 17 Oct 2009)
New Revision: 4165
Modified:
core/trunk/tests/unit-tests.xml
Log:
turn off tng output
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-10-16 21:23:55 UTC (rev 4164)
+++ core/trunk/tests/unit-tests.xml 2009-10-17 18:33:57 UTC (rev 4165)
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Weld" verbose="1" >
+<suite name="Weld" verbose="0" >
<test name="Weld">
<method-selectors>
15 years, 1 month
Weld SVN: r4164 - core/trunk/impl/src/main/java/org/jboss/weld.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-16 17:23:55 -0400 (Fri, 16 Oct 2009)
New Revision: 4164
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
Log:
Make all passivation inconsistencies to throw an UnserializableDependencyException
Modified: core/trunk/impl/src/main/java/org/jboss/weld/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-16 20:54:02 UTC (rev 4163)
+++ core/trunk/impl/src/main/java/org/jboss/weld/Validator.java 2009-10-16 21:23:55 UTC (rev 4164)
@@ -256,7 +256,7 @@
{
if (resolvedBean.getScope().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean<?, ?,?>)
{
- throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean);
+ throw new UnserializableDependencyException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean);
}
throw new UnserializableDependencyException("The bean " + ij.getBean() + " declares a passivating scope but has non-serializable dependency: " + resolvedBean);
}
15 years, 1 month
Weld SVN: r4163 - core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-16 16:54:02 -0400 (Fri, 16 Oct 2009)
New Revision: 4163
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTest.java
Log:
forgotten change :(
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTest.java 2009-10-16 20:36:42 UTC (rev 4162)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTest.java 2009-10-16 20:54:02 UTC (rev 4163)
@@ -28,7 +28,7 @@
public void testEnterpriseBeanInterceptionMetadataAdded() throws Exception
{
SessionBean<Ball> ballSessionBean = (SessionBean<Ball>)getCurrentManager().getBeans(Ball.class).iterator().next();
- InterceptorBindings interceptorBindings = new InterceptorBindingsAdapter(getCurrentManager().getBoundInterceptorsRegistry().getInterceptionModel(ballSessionBean.getType()));
+ InterceptorBindings interceptorBindings = new InterceptorBindingsAdapter(getCurrentManager().getCdiInterceptorsRegistry().getInterceptionModel(ballSessionBean.getType()));
List<javax.enterprise.inject.spi.Interceptor> interceptors =
new ArrayList<javax.enterprise.inject.spi.Interceptor>(interceptorBindings.getAllInterceptors());
15 years, 1 month
Weld SVN: r4162 - in cdi-tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/context/passivating/broken and 1 other directories.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-10-16 16:36:42 -0400 (Fri, 16 Oct 2009)
New Revision: 4162
Added:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
Log:
Fix and enable tests
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-10-16 20:35:06 UTC (rev 4161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-10-16 20:36:42 UTC (rev 4162)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
+import java.io.Serializable;
+
import javax.enterprise.context.SessionScoped;
@SessionScoped @BakedBinding
-class BakedBean
+class BakedBean implements Serializable
{
-
+ void bake() {}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-16 20:35:06 UTC (rev 4161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-16 20:36:42 UTC (rev 4162)
@@ -1,18 +1,25 @@
package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter;
+import java.io.Serializable;
+
import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-@Interceptor @InterceptorType
-class BrokenInterceptor
-{
- public BrokenInterceptor(@Default Violation violation) {}
-
- @AroundInvoke
+@Interceptor
+@BakedBinding
+class BrokenInterceptor implements Serializable
+{
+ @Inject
+ public BrokenInterceptor(@Default Violation violation)
+ {
+ }
+
+ @AroundInvoke
public Object invoke(InvocationContext ctx) throws Exception
{
return ctx.proceed();
- }
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-16 20:35:06 UTC (rev 4161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-16 20:36:42 UTC (rev 4162)
@@ -6,14 +6,17 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+
import org.testng.annotations.Test;
@Artifact
+@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
@SpecVersion(spec="cdi", version="PFD2")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @Test(groups = { "contexts", "passivation"})
@SpecAssertion(section = "6.6.4", id = "aad")
// WBRI-361
public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml 2009-10-16 20:36:42 UTC (rev 4162)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter.BrokenInterceptor</class>
+ </interceptors>
+</beans>
\ No newline at end of file
15 years, 1 month