Weld SVN: r4617 - core/trunk/impl/src/main/java/org/jboss/weld/servlet.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 10:59:17 -0500 (Tue, 03 Nov 2009)
New Revision: 4617
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
Log:
Validate the environment
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-03 14:43:29 UTC (rev 4616)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/WeldListener.java 2009-11-03 15:59:17 UTC (rev 4617)
@@ -63,12 +63,29 @@
private static BeanManagerImpl getBeanManager(ServletContext ctx)
{
BeanDeploymentArchive war = Container.instance().deploymentServices().get(ServletServices.class).getBeanDeploymentArchive(ctx);
- return Container.instance().beanDeploymentArchives().get(war);
+ if (war == null)
+ {
+ throw new IllegalStateException("Unable to locate BeanDeploymentArchive. ServletContext: " + ctx);
+ }
+ BeanManagerImpl beanManager = Container.instance().beanDeploymentArchives().get(war);
+ if (beanManager == null)
+ {
+ throw new IllegalStateException("Unable to locate BeanManager. ServletContext: " + ctx + "; BeanDeploymentArchive: " + war);
+ }
+ return beanManager;
}
@Override
public void contextInitialized(ServletContextEvent sce)
{
+ if (!Container.instance().isInitialized())
+ {
+ throw new IllegalStateException("Weld bootstrap must be complete before contextInitialized event");
+ }
+ if (!Container.instance().deploymentServices().contains(ServletServices.class))
+ {
+ throw new IllegalStateException("Cannot use WeldListener without ServletServices");
+ }
super.contextInitialized(sce);
sce.getServletContext().setAttribute(BeanManager.class.getName(), getBeanManager(sce.getServletContext()));
}
16 years, 5 months
Weld SVN: r4616 - in core/trunk: tests/src/test/java/org/jboss/weld/test/unit/reflection/method and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 09:43:29 -0500 (Tue, 03 Nov 2009)
New Revision: 4616
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
Log:
WELD-221
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-11-03 14:16:06 UTC (rev 4615)
+++ core/trunk/impl/src/main/java/org/jboss/weld/util/Reflections.java 2009-11-03 14:43:29 UTC (rev 4616)
@@ -198,19 +198,19 @@
{
return resolveParameterizedType((ParameterizedType) beanType, (ParameterizedType) type);
}
- if (beanType instanceof Class)
+ if (beanType instanceof Class<?>)
{
return resolveType(((Class<?>) beanType).getGenericSuperclass(), type);
}
}
- if (type instanceof TypeVariable)
+ if (type instanceof TypeVariable<?>)
{
if (beanType instanceof ParameterizedType)
{
return resolveTypeParameter((ParameterizedType) beanType, (TypeVariable<?>) type);
}
- if (beanType instanceof Class)
+ if (beanType instanceof Class<?>)
{
return resolveType(((Class<?>) beanType).getGenericSuperclass(), type);
}
@@ -242,7 +242,7 @@
Type[] actualTypes = beanType.getActualTypeArguments();
for (int i = 0; i < typeVariables.length; i++)
{
- if (typeVariables[i].equals(typeVariable))
+ if (typeVariables[i].equals(typeVariable) && !actualTypes[i].equals(typeVariable))
{
return resolveType(type, actualTypes[i]);
}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java 2009-11-03 14:16:06 UTC (rev 4615)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java 2009-11-03 14:43:29 UTC (rev 4616)
@@ -16,11 +16,12 @@
private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
- @Test(groups = "broken", description = "WELD-221")
- public void testNonStaticInnerClassWithGenericTypes() throws Exception
+ @Test(description = "WELD-221")
+ public void testMethodReturnsGenericTypeOfClass() throws Exception
{
WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
WeldMethod<Choice<?, ?>, Choice<?, ?>> method = WeldMethodImpl.of(Choice.class.getMethod("aMethod"), clazz, transformer);
+ assert method.getTypeClosure().size() == 3;
}
}
16 years, 5 months
Weld SVN: r4615 - core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 09:16:06 -0500 (Tue, 03 Nov 2009)
New Revision: 4615
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/WeldClassTest.java
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
Log:
minor
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:12:34 UTC (rev 4614)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:16:06 UTC (rev 4615)
@@ -1,61 +0,0 @@
-package org.jboss.weld.test.unit.reflection.clazz;
-
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.enterprise.inject.Stereotype;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.inject.Qualifier;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.introspector.WeldClass;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.testng.annotations.Test;
-
-@Artifact
-public class ClassAnnotatedItemTest
-{
-
- private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-
- @Test(groups = "broken", description="WELD-216")
- public void testNonStaticInnerClassWithGenericTypes()
- {
- AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
- WeldClassImpl.of(at, transformer);
- }
-
- @Test
- public void testDeclaredAnnotations()
- {
- WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
- assert annotatedElement.getAnnotations().size() == 1;
- assert annotatedElement.getAnnotation(Random.class) != null;
- assert annotatedElement.getJavaClass().equals(Order.class);
- }
-
- @Test
- public void testMetaAnnotations()
- {
- WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
- Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
- assert annotations.size() == 1;
- Iterator<Annotation> it = annotations.iterator();
- Annotation production = it.next();
- assert Random.class.equals(production.annotationType());
- }
-
- @Test
- public void testEmpty()
- {
- WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
- assert annotatedElement.getAnnotation(Stereotype.class) == null;
- assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
- WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
- assert classWithNoAnnotations.getAnnotations().size() == 0;
- }
-
-}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/WeldClassTest.java (from rev 4613, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/WeldClassTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/WeldClassTest.java 2009-11-03 14:16:06 UTC (rev 4615)
@@ -0,0 +1,61 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.inject.Qualifier;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+@Artifact
+public class WeldClassTest
+{
+
+ private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+
+ @Test(groups = "broken", description="WELD-216")
+ public void testNonStaticInnerClassWithGenericTypes()
+ {
+ AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
+ WeldClassImpl.of(at, transformer);
+ }
+
+ @Test
+ public void testDeclaredAnnotations()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ assert annotatedElement.getAnnotations().size() == 1;
+ assert annotatedElement.getAnnotation(Random.class) != null;
+ assert annotatedElement.getJavaClass().equals(Order.class);
+ }
+
+ @Test
+ public void testMetaAnnotations()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
+ assert annotations.size() == 1;
+ Iterator<Annotation> it = annotations.iterator();
+ Annotation production = it.next();
+ assert Random.class.equals(production.annotationType());
+ }
+
+ @Test
+ public void testEmpty()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ assert annotatedElement.getAnnotation(Stereotype.class) == null;
+ assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
+ WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
+ assert classWithNoAnnotations.getAnnotations().size() == 0;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/WeldClassTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 5 months
Weld SVN: r4614 - in core/trunk: osgi-bundle and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 09:12:34 -0500 (Tue, 03 Nov 2009)
New Revision: 4614
Modified:
core/trunk/bom/pom.xml
core/trunk/osgi-bundle/pom.xml
Log:
use properties in osgi bundle pom
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-11-03 14:04:04 UTC (rev 4613)
+++ core/trunk/bom/pom.xml 2009-11-03 14:12:34 UTC (rev 4614)
@@ -78,6 +78,7 @@
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
<jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version>
<slf4j.version>1.5.9.RC1</slf4j.version>
+ <cal10n.version>0.7.2</cal10n.version>
</properties>
<dependencyManagement>
@@ -162,6 +163,12 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>ch.qos</groupId>
+ <artifactId>cal10n-api</artifactId>
+ <version>${cal10n.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml 2009-11-03 14:04:04 UTC (rev 4613)
+++ core/trunk/osgi-bundle/pom.xml 2009-11-03 14:12:34 UTC (rev 4614)
@@ -79,12 +79,12 @@
org.jboss.weld.jsf;
include:="WeldPhaseListener";
version=${osgi.version},
- javassist.util.proxy;version="3.8.1.GA"
+ javassist.util.proxy;version=${javassist.version}
</_exportcontents>
<Import-Package>
- org.slf4j.cal10n; version=1.5.9.RC1,
- ch.qos.cal10n; version=0.7.2,
+ org.slf4j.cal10n; version=${slf4j.version},
+ ch.qos.cal10n; version=${cal10n.version},
javax.interceptor.*, *;
resolution:=optional
</Import-Package>
16 years, 5 months
Weld SVN: r4613 - in core/trunk/tests: src/test/java/org/jboss/weld/test/unit and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 09:04:04 -0500 (Tue, 03 Nov 2009)
New Revision: 4613
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
core/trunk/tests/unit-tests.xml
Log:
reorg tests
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous)
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Animal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+interface Animal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Animal.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Antelope.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,7 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+class Antelope implements Animal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Antelope.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Choice.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
-
-abstract class ChoiceParent<T>
-{
-}
-
-
-class Choice<T, E> extends ChoiceParent<T>
-{
- public Choice<T, E> aMethod()
- {
- return null;
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,25 +0,0 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
-
-import javax.enterprise.inject.spi.AnnotatedType;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
-import org.jboss.weld.metadata.TypeStore;
-import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-@Artifact
-public class ClassAnnotatedItemTest extends AbstractWeldTest
-{
-
- private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
-
- @Test(groups = "broken")
- public void testNonStaticInnerClassWithGenericTypes()
- {
- AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
- WeldClassImpl.of(at, transformer);
- }
-
-}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java (from rev 4612, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/ClassAnnotatedItemTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,61 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.inject.Qualifier;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+@Artifact
+public class ClassAnnotatedItemTest
+{
+
+ private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+
+ @Test(groups = "broken", description="WELD-216")
+ public void testNonStaticInnerClassWithGenericTypes()
+ {
+ AnnotatedType at = WeldClassImpl.of(new Kangaroo().procreate().getClass(), transformer);
+ WeldClassImpl.of(at, transformer);
+ }
+
+ @Test
+ public void testDeclaredAnnotations()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ assert annotatedElement.getAnnotations().size() == 1;
+ assert annotatedElement.getAnnotation(Random.class) != null;
+ assert annotatedElement.getJavaClass().equals(Order.class);
+ }
+
+ @Test
+ public void testMetaAnnotations()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ Set<Annotation> annotations = annotatedElement.getMetaAnnotations(Qualifier.class);
+ assert annotations.size() == 1;
+ Iterator<Annotation> it = annotations.iterator();
+ Annotation production = it.next();
+ assert Random.class.equals(production.annotationType());
+ }
+
+ @Test
+ public void testEmpty()
+ {
+ WeldClass<Order> annotatedElement = WeldClassImpl.of(Order.class, transformer);
+ assert annotatedElement.getAnnotation(Stereotype.class) == null;
+ assert annotatedElement.getMetaAnnotations(Stereotype.class).size() == 0;
+ WeldClass<Antelope> classWithNoAnnotations = WeldClassImpl.of(Antelope.class, transformer);
+ assert classWithNoAnnotations.getAnnotations().size() == 0;
+ }
+
+}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Kangaroo.java 2009-11-03 00:19:36 UTC (rev 4587)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Kangaroo.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
+package org.jboss.weld.test.unit.reflection.clazz;
class Kangaroo
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Order.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,8 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+
+@Random
+class Order
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Order.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java (from rev 4587, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/Random.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.unit.reflection.clazz;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface Random
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/clazz/Random.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method (from rev 4612, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/Choice.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+package org.jboss.weld.test.unit.reflection.method;
abstract class ChoiceParent<T>
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/reflection/method/WeldMethodTest.java 2009-11-03 14:04:04 UTC (rev 4613)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+package org.jboss.weld.test.unit.reflection.method;
import javax.enterprise.util.TypeLiteral;
@@ -16,7 +16,7 @@
private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
- @Test(groups = "broken")
+ @Test(groups = "broken", description = "WELD-221")
public void testNonStaticInnerClassWithGenericTypes() throws Exception
{
WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-11-03 13:53:44 UTC (rev 4612)
+++ core/trunk/tests/unit-tests.xml 2009-11-03 14:04:04 UTC (rev 4613)
@@ -42,9 +42,6 @@
<package name="org.jboss.weld.test.unit.environments.servlet" />
<package name="org.jboss.weld.test.unit.extensions" />
<package name="org.jboss.weld.test.unit.implementation" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem.anonymous" />
- <package name="org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType" />
<package name="org.jboss.weld.test.unit.implementation.enterpise" />
<package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" />
<package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" />
@@ -69,6 +66,8 @@
<package name="org.jboss.weld.test.unit.noncontextual" />
<package name="org.jboss.weld.test.unit.preinstantiatebeanmanager" />
<package name="org.jboss.weld.test.unit.security" />
+ <package name="org.jboss.weld.test.unit.reflection.clazz" />
+ <package name="org.jboss.weld.test.unit.reflection.method" />
</packages>
</test>
16 years, 5 months
Weld SVN: r4612 - in core/trunk/tests: src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 08:53:44 -0500 (Tue, 03 Nov 2009)
New Revision: 4612
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java
core/trunk/tests/unit-tests.xml
Log:
Make tests into unit tests
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java 2009-11-03 13:15:43 UTC (rev 4611)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/Choice.java 2009-11-03 13:53:44 UTC (rev 4612)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.implementation.annotatedItem.anonymous;
-
-abstract class ChoiceParent<T>
-{
-}
-
-
-class Choice<T, E> extends ChoiceParent<T>
-{
- public Choice<T, E> aMethod()
- {
- return null;
- }
-}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java 2009-11-03 13:15:43 UTC (rev 4611)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/anonymous/ClassAnnotatedItemTest.java 2009-11-03 13:53:44 UTC (rev 4612)
@@ -6,11 +6,10 @@
import org.jboss.weld.introspector.jlr.WeldClassImpl;
import org.jboss.weld.metadata.TypeStore;
import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@Artifact
-public class ClassAnnotatedItemTest extends AbstractWeldTest
+public class ClassAnnotatedItemTest
{
private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
Added: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java 2009-11-03 13:53:44 UTC (rev 4612)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+
+abstract class ChoiceParent<T>
+{
+}
+
+
+class Choice<T, E> extends ChoiceParent<T>
+{
+ public Choice<T, E> aMethod()
+ {
+ return null;
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/Choice.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java 2009-11-03 13:53:44 UTC (rev 4612)
@@ -0,0 +1,26 @@
+package org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType;
+
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.weld.introspector.WeldClass;
+import org.jboss.weld.introspector.WeldMethod;
+import org.jboss.weld.introspector.jlr.WeldClassImpl;
+import org.jboss.weld.introspector.jlr.WeldMethodImpl;
+import org.jboss.weld.metadata.TypeStore;
+import org.jboss.weld.resources.ClassTransformer;
+import org.testng.annotations.Test;
+
+public class WeldMethodTest
+{
+
+ private final ClassTransformer transformer = new ClassTransformer(new TypeStore());
+ private final Class<Choice<?, ?>> CHOICE_LITERAL = new TypeLiteral<Choice<?, ?>>() {}.getRawType();
+
+ @Test(groups = "broken")
+ public void testNonStaticInnerClassWithGenericTypes() throws Exception
+ {
+ WeldClass<Choice<?, ?>> clazz = WeldClassImpl.of(CHOICE_LITERAL, transformer);
+ WeldMethod<Choice<?, ?>, Choice<?, ?>> method = WeldMethodImpl.of(Choice.class.getMethod("aMethod"), clazz, transformer);
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/annotatedItem/genericMethodReturnType/WeldMethodTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-11-03 13:15:43 UTC (rev 4611)
+++ core/trunk/tests/unit-tests.xml 2009-11-03 13:53:44 UTC (rev 4612)
@@ -43,6 +43,8 @@
<package name="org.jboss.weld.test.unit.extensions" />
<package name="org.jboss.weld.test.unit.implementation" />
<package name="org.jboss.weld.test.unit.implementation.annotatedItem" />
+ <package name="org.jboss.weld.test.unit.implementation.annotatedItem.anonymous" />
+ <package name="org.jboss.weld.test.unit.implementation.annotatedItem.genericMethodReturnType" />
<package name="org.jboss.weld.test.unit.implementation.enterpise" />
<package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" />
<package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" />
16 years, 5 months
Weld SVN: r4611 - in core/trunk: tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 08:15:43 -0500 (Tue, 03 Nov 2009)
New Revision: 4611
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java
Log:
WELD-246
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-03 12:55:14 UTC (rev 4610)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-03 13:15:43 UTC (rev 4611)
@@ -72,9 +72,11 @@
// bean is an EJB!
ejbDescriptors.addAll(beanDeploymentArchive.getEjbs());
}
-
beanDeployer = new BeanDeployer(beanManager, ejbDescriptors);
+ // Must at the Manager bean straight away, as it can be injected during startup!
+ beanManager.addBean(new ManagerBean(beanManager));
+
parseBeansXml();
}
@@ -125,7 +127,6 @@
public void deployBeans(Environment environment)
{
beanDeployer.addClasses(beanDeploymentArchive.getBeanClasses());
- beanDeployer.getEnvironment().addBuiltInBean(new ManagerBean(beanManager));
beanDeployer.getEnvironment().addBuiltInBean(new InjectionPointBean(beanManager));
beanDeployer.getEnvironment().addBuiltInBean(new EventBean(beanManager));
beanDeployer.getEnvironment().addBuiltInBean(new InstanceBean(beanManager));
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-03 12:55:14 UTC (rev 4610)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/NonBdaExtensionTest.java 2009-11-03 13:15:43 UTC (rev 4611)
@@ -63,6 +63,7 @@
Observer1 observer1 = beanManager1.getInstanceByType(Observer1.class);
assert observer1.isBeforeBeanDiscoveryCalled();
+ assert observer1.getBeforeBeanDiscoveryBeanManager().equals(beanManager1);
assert observer1.isAfterBeanDiscoveryCalled();
assert observer1.isAfterDeploymentValidationCalled();
assert observer1.isProcessInjectionTargetCalled();
@@ -75,6 +76,7 @@
Observer2 observer2 = beanManager2.getInstanceByType(Observer2.class);
assert observer2.isBeforeBeanDiscoveryCalled();
+ assert observer2.getBeforeBeanDiscoveryBeanManager().equals(beanManager2);
assert observer2.isAfterBeanDiscoveryCalled();
assert observer2.isAfterDeploymentValidationCalled();
assert observer2.isProcessInjectionTargetCalled();
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java 2009-11-03 12:55:14 UTC (rev 4610)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer1.java 2009-11-03 13:15:43 UTC (rev 4611)
@@ -3,6 +3,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
@@ -17,9 +18,10 @@
this.afterBeanDiscoveryCalled = true;
}
- public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+ public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
{
this.beforeBeanDiscoveryCalled = true;
+ this.beforeBeanDiscoveryBeanManager = beanManager;
}
public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java 2009-11-03 12:55:14 UTC (rev 4610)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/Observer2.java 2009-11-03 13:15:43 UTC (rev 4611)
@@ -3,6 +3,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
@@ -17,9 +18,10 @@
this.afterBeanDiscoveryCalled = true;
}
- public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+ public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
{
this.beforeBeanDiscoveryCalled = true;
+ this.beforeBeanDiscoveryBeanManager = beanManager;
}
public void observeAfterDeploymentValidation(@Observes AfterDeploymentValidation event)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java 2009-11-03 12:55:14 UTC (rev 4610)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/deployment/structure/extensions/ObserverBase.java 2009-11-03 13:15:43 UTC (rev 4611)
@@ -1,6 +1,6 @@
package org.jboss.weld.test.unit.deployment.structure.extensions;
-import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.BeanManager;
public class ObserverBase
{
@@ -11,6 +11,8 @@
protected boolean processProducerCalled;
protected boolean processInjectionTargetCalled;
protected boolean processManagedBeanCalled;
+
+ protected BeanManager beforeBeanDiscoveryBeanManager;
public ObserverBase()
{
@@ -46,5 +48,10 @@
{
return processManagedBeanCalled;
}
+
+ public BeanManager getBeforeBeanDiscoveryBeanManager()
+ {
+ return beforeBeanDiscoveryBeanManager;
+ }
}
\ No newline at end of file
16 years, 5 months
Weld SVN: r4609 - build/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-03 07:55:05 -0500 (Tue, 03 Nov 2009)
New Revision: 4609
Added:
build/tags/weld-parent-5/
Log:
[maven-scm] copy for tag weld-parent-5
Copied: build/tags/weld-parent-5 (from rev 4608, build/trunk/parent)
16 years, 5 months