Weld SVN: r5867 - core/trunk/impl/src/main/java/org/jboss/weld/bean and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 10:05:41 -0500 (Wed, 17 Feb 2010)
New Revision: 5867
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
Log:
WELD-432
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java 2010-02-17 15:05:04 UTC (rev 5866)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java 2010-02-17 15:05:41 UTC (rev 5867)
@@ -32,7 +32,6 @@
{
@Test
@SpecAssertion(section = "3.4.2", id = "h")
- //WELD-432
public void testNonStaticFieldOfSessionBeanCannotBeProducerField()
{
assert false;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2010-02-17 15:05:04 UTC (rev 5866)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ProducerField.java 2010-02-17 15:05:41 UTC (rev 5867)
@@ -19,6 +19,7 @@
import static org.jboss.weld.logging.Category.BEAN;
import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
import static org.jboss.weld.logging.messages.BeanMessage.INJECTED_FIELD_CANNOT_BE_PRODUCER;
+import static org.jboss.weld.logging.messages.BeanMessage.PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC;
import java.lang.reflect.Field;
import java.util.Set;
@@ -131,17 +132,21 @@
}
});
- checkProducerFieldAnnotations();
+ checkProducerField();
}
}
- protected void checkProducerFieldAnnotations()
+ protected void checkProducerField()
{
if (getWeldAnnotated().isAnnotationPresent(Inject.class))
{
throw new DefinitionException(INJECTED_FIELD_CANNOT_BE_PRODUCER, getWeldAnnotated(), getWeldAnnotated().getDeclaringType());
}
+ if (getDeclaringBean() instanceof SessionBean<?> && !field.isStatic())
+ {
+ throw new DefinitionException(PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC, getWeldAnnotated(), getWeldAnnotated().getDeclaringType());
+ }
}
protected void defaultDispose(T instance)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java 2010-02-17 15:05:04 UTC (rev 5866)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java 2010-02-17 15:05:41 UTC (rev 5867)
@@ -129,6 +129,7 @@
@MessageId("000092") PARAM_NOT_IN_PARAM_LIST,
@MessageId("000093") CANNOT_READ_OBJECT,
@MessageId("000094") INJECTED_FIELD_CANNOT_BE_PRODUCER,
- @MessageId("000095") GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT;
+ @MessageId("000095") GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT,
+ @MessageId("000096") PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC;
}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-17 15:05:04 UTC (rev 5866)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-17 15:05:41 UTC (rev 5867)
@@ -94,3 +94,4 @@
CANNOT_READ_OBJECT=Cannot read object
INJECTED_FIELD_CANNOT_BE_PRODUCER=Injected field {0} cannot be annotated @Produces on {1}
GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT=Session bean with generic class {0} must be @Depedent scope
+PRODUCER_FIELD_ON_SESSION_BEAN_MUST_BE_STATIC=Producer fields on session beans must be static. Field {0} declared on {1}
14 years, 3 months
Weld SVN: r5866 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 10:05:04 -0500 (Wed, 17 Feb 2010)
New Revision: 5866
Modified:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
CDITCK-111
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-02-17 15:00:27 UTC (rev 5865)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-02-17 15:05:04 UTC (rev 5866)
@@ -103,6 +103,18 @@
</methods>
</class>
+ <!-- CDITCK-111 -->
+ <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
+ <methods>
+ <exclude name="testForEachEnterpriseBeanANewBeanExists" />
+ <exclude name="testNewBeanHasNoBeanELName" />
+ <exclude name="testNewBeanHasNoObservers" />
+ <exclude name="testNewBeanHasNoStereotypes" />
+ <exclude name="testNewBeanIsDependentScoped" />
+ <exclude name="testNewBeanIsHasOnlyNewBinding" />
+ </methods>
+ </class>
+
<!-- Issues in Weld (the RI) -->
<!-- WELD-390 fixed, but TCK test is broken in 1.0.1-CR1 -->
14 years, 3 months
Weld SVN: r5865 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 10:00:27 -0500 (Wed, 17 Feb 2010)
New Revision: 5865
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
Log:
CDITCK-111
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2010-02-17 14:10:43 UTC (rev 5864)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2010-02-17 15:00:27 UTC (rev 5865)
@@ -26,7 +26,7 @@
public class Fox implements FoxLocal
{
@Produces @Tame
- private Den den = new Den("FoxDen");
+ private static Den den = new Den("FoxDen");
private int nextLitterSize;
14 years, 3 months
Weld SVN: r5864 - in core/trunk/impl/src/main: java/org/jboss/weld/bean/builtin and 6 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 09:10:43 -0500 (Wed, 17 Feb 2010)
New Revision: 5864
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/RIBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldAnnotated.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
Log:
minor cleanup and WELD-443
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -130,6 +130,14 @@
}
}
+ @Override
+ public void initializeAfterBeanDiscovery()
+ {
+ checkType();
+ }
+
+ protected abstract void checkType();
+
protected void addInjectionPoint(WeldInjectionPoint<?, ?> injectionPoint)
{
if (injectionPoint.isAnnotationPresent(Delegate.class))
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 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -183,20 +183,14 @@
@Override
public void initializeAfterBeanDiscovery()
{
- super.initializeAfterBeanDiscovery();
initDecorators();
if (hasDecorators())
{
initProxyClassForDecoratedBean();
}
+ super.initializeAfterBeanDiscovery();
}
- @Override
- public void checkType()
- {
-
- }
-
public void initDecorators()
{
this.decorators = getBeanManager().resolveDecorators(getTypes(), getQualifiers());
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractProducerBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -288,6 +288,12 @@
}
}
}
+
+ @Override
+ protected void checkType()
+ {
+
+ }
protected boolean isTypeSerializable(final Class<?> clazz)
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -226,6 +226,12 @@
}
}
}
+
+ @Override
+ protected void checkType()
+ {
+
+ }
@Override
public Class<T> getType()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -377,7 +377,6 @@
@Override
public void initializeAfterBeanDiscovery()
{
- super.initializeAfterBeanDiscovery();
if (this.passivationCapableBean && this.hasDecorators())
{
for (Decorator<?> decorator : this.getDecorators())
@@ -411,6 +410,7 @@
}
}
}
+ super.initializeAfterBeanDiscovery();
}
private void initPassivationCapable()
@@ -454,7 +454,7 @@
* Validates the type
*/
@Override
- public void checkType()
+ protected void checkType()
{
if (getWeldAnnotated().isAnonymousClass() || (getWeldAnnotated().isMemberClass() && !getWeldAnnotated().isStatic()))
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/RIBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/RIBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/RIBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -71,16 +71,8 @@
*
* @param environment
*/
- public void initializeAfterBeanDiscovery()
- {
- // no-op by default
- }
-
- public void checkType()
- {
-
- }
-
+ public abstract void initializeAfterBeanDiscovery();
+
public abstract boolean isSpecializing();
public boolean isDependent()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -21,6 +21,7 @@
import static org.jboss.weld.logging.messages.BeanMessage.EJB_CANNOT_BE_DECORATOR;
import static org.jboss.weld.logging.messages.BeanMessage.EJB_CANNOT_BE_INTERCEPTOR;
import static org.jboss.weld.logging.messages.BeanMessage.EJB_NOT_FOUND;
+import static org.jboss.weld.logging.messages.BeanMessage.GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT;
import static org.jboss.weld.logging.messages.BeanMessage.MESSAGE_DRIVEN_BEANS_CANNOT_BE_MANAGED;
import static org.jboss.weld.logging.messages.BeanMessage.OBSERVER_METHOD_MUST_BE_STATIC_OR_BUSINESS;
import static org.jboss.weld.logging.messages.BeanMessage.PROXY_INSTANTIATION_BEAN_ACCESS_FAILED;
@@ -42,6 +43,7 @@
import javax.decorator.Decorator;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Typed;
@@ -342,6 +344,15 @@
}
@Override
+ protected void checkType()
+ {
+ if (!getScope().equals(Dependent.class) && getWeldAnnotated().isGeneric())
+ {
+ throw new DefinitionException(GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT, this);
+ }
+ }
+
+ @Override
public boolean isPassivationCapableBean()
{
return getEjbDescriptor().isStateful();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractBuiltInBean.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -47,6 +47,11 @@
// No-op
}
+ @Override
+ public void initializeAfterBeanDiscovery()
+ {
+ // No-op
+ }
public Set<Annotation> getQualifiers()
{
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 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -18,9 +18,9 @@
import static org.jboss.weld.logging.Category.BOOTSTRAP;
import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_ALTERNATIVES;
import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_DECORATORS;
import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_INTERCEPTORS;
-import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_ALTERNATIVES;
import java.util.List;
@@ -165,7 +165,6 @@
if (bean instanceof RIBean<?>)
{
((RIBean<?>) bean).initializeAfterBeanDiscovery();
- ((RIBean<?>) bean).checkType();
}
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldAnnotated.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldAnnotated.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldAnnotated.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -72,6 +72,11 @@
{
return delegate().isStatic();
}
+
+ public boolean isGeneric()
+ {
+ return delegate().isGeneric();
+ }
public boolean isProxyable()
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldAnnotated.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -119,6 +119,8 @@
* @return True if static, false otherwise
*/
public boolean isStatic();
+
+ public boolean isGeneric();
/**
* Indicates if this AnnotatedItem represents a final element
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -600,6 +600,11 @@
{
return Modifier.isFinal(getJavaClass().getModifiers());
}
+
+ public boolean isGeneric()
+ {
+ return getJavaClass().getTypeParameters().length > 0;
+ }
/**
* Gets the name of the type
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -295,5 +295,10 @@
{
return Collections.unmodifiableList((List) parameters);
}
+
+ public boolean isGeneric()
+ {
+ return getJavaMember().getTypeParameters().length > 0;
+ }
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -134,5 +134,10 @@
{
return new StringBuilder().append("field ").append(getDeclaringType().getName()).append(".").append(field.getName()).toString();
}
+
+ public boolean isGeneric()
+ {
+ return false;
+ }
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -228,5 +228,10 @@
{
return Collections.unmodifiableList((List) parameters);
}
+
+ public boolean isGeneric()
+ {
+ return getJavaMember().getTypeParameters().length > 0;
+ }
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -109,6 +109,11 @@
return false;
}
+ public boolean isGeneric()
+ {
+ return false;
+ }
+
public Package getPackage()
{
return declaringMember.getPackage();
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -128,6 +128,7 @@
@MessageId("000091") IP_NOT_CONSTRUCTOR_OR_METHOD,
@MessageId("000092") PARAM_NOT_IN_PARAM_LIST,
@MessageId("000093") CANNOT_READ_OBJECT,
- @MessageId("000094") INJECTED_FIELD_CANNOT_BE_PRODUCER;
+ @MessageId("000094") INJECTED_FIELD_CANNOT_BE_PRODUCER,
+ @MessageId("000095") GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT;
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2010-02-17 14:10:43 UTC (rev 5864)
@@ -408,7 +408,7 @@
{
throw new DefinitionException(INITIALIZER_CANNOT_BE_OBSERVER, method, type);
}
- else if (method.getJavaMember().getTypeParameters().length > 0)
+ else if (method.isGeneric())
{
throw new DefinitionException(INITIALIZER_METHOD_IS_GENERIC, method, type);
}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-17 14:09:04 UTC (rev 5863)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-17 14:10:43 UTC (rev 5864)
@@ -93,3 +93,4 @@
PARAM_NOT_IN_PARAM_LIST=Parameter position {0} is not in the parameter list: {1}
CANNOT_READ_OBJECT=Cannot read object
INJECTED_FIELD_CANNOT_BE_PRODUCER=Injected field {0} cannot be annotated @Produces on {1}
+GENERIC_SESSION_BEAN_MUST_BE_DEPENDENT=Session bean with generic class {0} must be @Depedent scope
14 years, 3 months
Weld SVN: r5863 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 09:09:04 -0500 (Wed, 17 Feb 2010)
New Revision: 5863
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
Log:
add excludes for current CDITCK issues
Modified: cdi-tck/trunk/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-02-17 13:27:52 UTC (rev 5862)
+++ cdi-tck/trunk/impl/src/main/resources/tck-tests.xml 2010-02-17 14:09:04 UTC (rev 5863)
@@ -14,6 +14,18 @@
<package name="org.jboss.jsr299.tck.interceptors.tests.*" />
</packages>
<classes>
+
+ <!-- CDITCK-108 -->
+ <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
+ <methods>
+ <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
+ <methods>
+ <exclude name="testApplicationContextShared" />
+ </methods>
+ </class>
<!-- Issues in Weld (the RI) -->
14 years, 3 months
Weld SVN: r5862 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2010-02-17 08:27:52 -0500 (Wed, 17 Feb 2010)
New Revision: 5862
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
WELDX-19: Documented ThreadScoped
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2010-02-17 11:56:08 UTC (rev 5861)
+++ doc/trunk/reference/en-US/environments.xml 2010-02-17 13:27:52 UTC (rev 5862)
@@ -408,6 +408,43 @@
<section>
+ <title>Thread Context</title>
+
+ <para>In contrast to Java EE applications, Java SE applications place no restrictions
+ on developers regarding the creation and usage of threads.
+ Therefore Weld SE provides a custom scope annotation, <literal>@ThreadScoped</literal>,
+ and corresponding context implementation which can be used to bind bean instances
+ to the current thread. It is intended to be used in scenarios where you might otherwise
+ use <literal>ThreadLocal</literal>, and does in fact use
+ <literal>ThreadLocal</literal> under the hood.
+ </para>
+
+ <para>
+ To use the @ThreadScoped annotation you need to enable the <literal>RunnableDecorator</literal>
+ which 'listens' for all executions of <literal>Runnable.run()</literal> and
+ decorates them by setting up the thread context beforehand, bound to
+ the current thread, and destroying the context afterwards.
+ </para>
+
+ <programlisting role="XML"><![CDATA[<beans>
+ <decorators>
+ <decorator>org.jboss.weld.environment.se.threading.RunnableDecorator</decorator>
+ </decorator>
+</beans>]]></programlisting>
+
+ <note>
+ <para>It is not necessary to use @ThreadScoped in all
+ multithreaded applications. The thread context is not intended
+ as a replacement for defining your own application-specific contexts.
+ It is generally only useful in situtations where you would otherwise
+ have used ThreadLocal directly, which are typically rare.
+ </para>
+ </note>
+
+ </section>
+
+ <section>
+
<title>Setting the Classpath</title>
<para>Weld SE comes packaged as a 'shaded' jar which includes the CDI API,
14 years, 3 months
Weld SVN: r5861 - examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2010-02-17 06:56:08 -0500 (Wed, 17 Feb 2010)
New Revision: 5861
Modified:
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java
Log:
WELDX-76: EMPTY_LIST --> emptyList()
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2010-02-17 11:50:26 UTC (rev 5860)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2010-02-17 11:56:08 UTC (rev 5861)
@@ -47,7 +47,7 @@
if (validParams.size() != 1)
{
errors.add( "Please supply just one parameter: your first name" );
- validParams = Collections.EMPTY_LIST;
+ validParams = Collections.emptyList();
}
}
14 years, 3 months
Weld SVN: r5860 - examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2010-02-17 06:50:26 -0500 (Wed, 17 Feb 2010)
New Revision: 5860
Modified:
examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java
Log:
WELDX-76: Uses error message from validator instead of reproducing one.
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2010-02-17 11:41:28 UTC (rev 5859)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2010-02-17 11:50:26 UTC (rev 5860)
@@ -46,7 +46,9 @@
System.out.println( "Hello " + argsValidator.getValidParameters().get( 0 ) );
} else
{
- System.out.println( "Please provide just one argument: your first name" );
+ for (String error : argsValidator.getErrors()) {
+ System.out.println( error );
+ }
}
}
14 years, 3 months
Weld SVN: r5859 - java-se/trunk.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2010-02-17 06:41:28 -0500 (Wed, 17 Feb 2010)
New Revision: 5859
Modified:
java-se/trunk/pom.xml
Log:
WELDX-51: removed slf4j-simple out of shaded weld-se.jar.
Modified: java-se/trunk/pom.xml
===================================================================
--- java-se/trunk/pom.xml 2010-02-17 10:56:38 UTC (rev 5858)
+++ java-se/trunk/pom.xml 2010-02-17 11:41:28 UTC (rev 5859)
@@ -168,6 +168,13 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <artifactSet>
+ <excludes>
+ <exclude>org.slf4j:slf4j-simple</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
</plugin>
</plugins>
</build>
14 years, 3 months
Weld SVN: r5858 - core/trunk/impl/src/main/resources/org/jboss/weld/messages.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-17 05:56:38 -0500 (Wed, 17 Feb 2010)
New Revision: 5858
Modified:
core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
Log:
unbreak build
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-16 22:38:58 UTC (rev 5857)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2010-02-17 10:56:38 UTC (rev 5858)
@@ -92,5 +92,4 @@
IP_NOT_CONSTRUCTOR_OR_METHOD=Cannot handle injection point as a constructor or method: {0}
PARAM_NOT_IN_PARAM_LIST=Parameter position {0} is not in the parameter list: {1}
CANNOT_READ_OBJECT=Cannot read object
-INITIALIZER_CANNOT_BE_PRODUCER=Initializer method {0} cannot be annotated @Produces on {1}
INJECTED_FIELD_CANNOT_BE_PRODUCER=Injected field {0} cannot be annotated @Produces on {1}
14 years, 3 months