[webbeans-commits] Webbeans SVN: r2633 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes and 11 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Apr 29 05:15:53 EDT 2009
Author: vitold
Date: 2009-04-29 05:15:52 -0400 (Wed, 29 Apr 2009)
New Revision: 2633
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/foo/
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
Log:
some minor changes
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/XmlParser.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -125,9 +125,9 @@
Element root = document.getRootElement();
List<Class<? extends Annotation>> bindingTypes = new ArrayList<Class<? extends Annotation>>();
+ List<Class<? extends Annotation>> stereotypes = new ArrayList<Class<? extends Annotation>>();
List<Class<? extends Annotation>> interceptorBindingTypes = new ArrayList<Class<? extends Annotation>>();
- List<Class<? extends Annotation>> stereotypes = new ArrayList<Class<? extends Annotation>>();
-
+
Iterator<?> elIterator = root.elementIterator();
while (elIterator.hasNext())
{
@@ -136,26 +136,28 @@
boolean isInterceptorBindingType = ParseXmlHelper.findElementsInEeNamespace(element, XmlConstants.INTERCEPTOR_BINDING_TYPE).size() > 0;
boolean isStereotype = ParseXmlHelper.findElementsInEeNamespace(element, XmlConstants.STEREOTYPE).size() > 0;
- if (isBindingType || isInterceptorBindingType || isStereotype)
+ if (isBindingType || isStereotype || isInterceptorBindingType)
{
Class<? extends Annotation> annotationType = ParseXmlHelper.loadAnnotationClass(element, Annotation.class, environment, packagesMap);
if (isBindingType)
+ {
bindingTypes.add(annotationType);
- if (isInterceptorBindingType)
- {
- interceptorBindingTypes.add(annotationType);
- checkForInterceptorBindingTypeChildren(element);
}
if (isStereotype)
{
stereotypes.add(annotationType);
checkForStereotypeChildren(element);
}
+ if (isInterceptorBindingType)
+ {
+ interceptorBindingTypes.add(annotationType);
+ checkForInterceptorBindingTypeChildren(element);
+ }
}
}
ParseXmlHelper.checkForUniqueElements(bindingTypes);
+ ParseXmlHelper.checkForUniqueElements(stereotypes);
ParseXmlHelper.checkForUniqueElements(interceptorBindingTypes);
- ParseXmlHelper.checkForUniqueElements(stereotypes);
}
private void parseForBeans(Document document)
@@ -237,7 +239,7 @@
stereotypeClass.isAnnotationPresent(ScopeType.class) ||
stereotypeClass.isAnnotationPresent(DeploymentType.class) ||
stereotypeClass.isAnnotationPresent(InterceptorBindingType.class) ||
- stereotypeClass.isAnnotationPresent(Named.class))
+ stereotypeClass.equals(Named.class))
continue;
throw new DefinitionException("Direct child <" + stereotypeChild.getName() + "> of stereotype <" + stereotypeElement.getName() +
"> declaration must be scope type, or deployment type, or interceptor binding type, or javax.annotation.Named");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/TestStereotype.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -6,8 +6,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.annotation.Named;
+
@Retention(RUNTIME)
@Target(TYPE)
+ at Named
@interface TestStereotype
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/DeploymentDeclarationTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,8 +1,14 @@
package org.jboss.jsr299.tck.tests.xml.declaration.deployment;
+import java.util.Set;
+
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo.Order;
import org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo.TestDeploymentType;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
@@ -10,7 +16,7 @@
import org.testng.annotations.Test;
@Artifact
- at Classes({TestDeploymentType.class})
+ at Classes({Order.class, TestDeploymentType.class})
@BeansXml("beans.xml")
public class DeploymentDeclarationTest extends AbstractJSR299Test
{
@@ -21,6 +27,10 @@
})
public void testDeploymentDeclaration()
{
- assert true;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class);
+
+ assert beans.size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
+ assert beans.iterator().next().getDeploymentType().equals(TestDeploymentType.class) : "Deployment type of bean '" + Order.class + "' is not '" + TestDeploymentType.class + "'";
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/declaration/deployment/foo/Order.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.xml.declaration.deployment.foo;
+
+ at TestDeploymentType
+public class Order
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -14,7 +14,7 @@
@Artifact
@Resources({
- @Resource(source="foo/schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
+ @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd")
})
@Classes({
Order.class,
@@ -35,7 +35,7 @@
})
public void testXmlBasedMetadata()
{
- assert getCurrentManager().resolveByType(Order.class).size() == 1;
- assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1;
+ assert getCurrentManager().resolveByType(Order.class).size() == 1 : "There is no one or more than one registered beans with type '" + Order.class + "'";
+ assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1 : "There is no one or more than one registered beans with type '" + AnotherOrder.class + "'";
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,5 +1,12 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.context.RequestScoped;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -13,25 +20,46 @@
import org.testng.annotations.Test;
@Artifact
- at Resources({
- @Resource(source="namespace", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace")
-})
- at Classes({Order.class, AnotherDeploymentType.class})
+ at Resources( { @Resource(source = "namespace", destination = "WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/namespace/javaee/namespace") })
+ at Classes( { Order.class, AnotherDeploymentType.class })
@BeansXml("beans.xml")
public class JavaEeNamespaceTest extends AbstractJSR299Test
{
@Test
- @SpecAssertions({
- @SpecAssertion(section="9.1", id="e"),
- @SpecAssertion(section="9.1", id="f"),
- @SpecAssertion(section="9.2", id="f"),
- @SpecAssertion(section="9.2.1", id="b"),
- @SpecAssertion(section="9.2.1", id="c"),
- @SpecAssertion(section="9.2.1", id="d"),
- @SpecAssertion(section="9.2.1", id="e")
- })
+ @SpecAssertions( { @SpecAssertion(section = "9.1", id = "e"), @SpecAssertion(section = "9.1", id = "f"), @SpecAssertion(section = "9.2", id = "f"), @SpecAssertion(section = "9.2.1", id = "b"), @SpecAssertion(section = "9.2.1", id = "c"), @SpecAssertion(section = "9.2.1", id = "d"), @SpecAssertion(section = "9.2.1", id = "e") })
public void testJavaEeNamespace()
{
- assert getCurrentManager().resolveByType(Order.class).size() == 1;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class);
+
+ assert beans.size() == 1;
+
+ for (Bean<Order> bean : beans)
+ {
+ assert bean.getDeploymentType().equals(AnotherDeploymentType.class);
+ assert bean.getScopeType().equals(RequestScoped.class);
+
+ Set<? extends Type> beanTypes = bean.getTypes();
+ assert beanTypes.contains(Order.class);
+
+ Class<?> clazz = Order.class;
+ try
+ {
+ assert clazz.getDeclaredConstructor(int.class) != null;
+ assert clazz.getDeclaredField("strArr").getType().equals(String[].class);
+ }
+ catch (SecurityException e)
+ {
+ assert false : "SecurityException while getting constructor with 'int' parameter from '" + clazz + "'";
+ }
+ catch (NoSuchMethodException e)
+ {
+ assert false : "Can not find constructor with 'int' parameter in '" + clazz + "'";
+ }
+ catch (NoSuchFieldException e)
+ {
+ assert false : "Can not find field 'strArr' in '" + clazz + "'";
+ }
+ }
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,9 +1,26 @@
package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Date;
+import java.util.Set;
+
+import javax.context.RequestScoped;
+import javax.ejb.TimerHandle;
+import javax.event.Event;
+import javax.inject.AnnotationLiteral;
+import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.sql.CommonDataSource;
+import javax.xml.ws.Binding;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo.Order;
+import org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo.TestBindingType;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -14,12 +31,50 @@
@BeansXml("beans.xml")
public class JavaEePkgTest extends AbstractJSR299Test
{
+ private static final Annotation TEST_BINDING_TYPE = new AnnotationLiteral<TestBindingType>() {};
+
+ private static final Annotation[] bindings = {TEST_BINDING_TYPE};
+
@Test
@SpecAssertions({
@SpecAssertion(section="9.2.1", id="a")
})
public void testJavaEePkg()
{
- assert getCurrentManager().resolveByType(Order.class).size() == 2;
+ Manager manager = getCurrentManager();
+ Set<Bean<Order>> beans = manager.resolveByType(Order.class, bindings);
+
+ assert beans.size() == 1;
+
+ for (Bean<Order> bean : beans)
+ {
+ assert bean.getScopeType().equals(RequestScoped.class);
+
+ Object[] beanBindings = bean.getBindings().toArray();
+ assert beanBindings.length == 1;
+ for (int i = 0; i < beanBindings.length; i++)
+ {
+ Annotation beanBinding = (Annotation) beanBindings[i];
+ assert beanBinding.annotationType().equals(bindings[i].annotationType());
+ }
+
+ Set<? extends Type> beanTypes = bean.getTypes();
+ assert beanTypes.contains(Order.class);
+
+ Class<?> clazz = Order.class;
+ try
+ {
+ assert clazz.getDeclaredConstructor(Integer.class, Date.class, CommonDataSource.class, InvocationContext.class, Event.class,
+ TimerHandle.class, EntityManager.class, Binding.class) != null;
+ }
+ catch (SecurityException e)
+ {
+ assert false : "SecurityException while getting constructor with 'int' parameter from '" + clazz + "'";
+ }
+ catch (NoSuchMethodException e)
+ {
+ assert false : "Can not find constructor with 'int' parameter in '" + clazz + "'";
+ }
+ }
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -2,19 +2,17 @@
import java.util.Date;
-import javax.annotation.Named;
import javax.context.RequestScoped;
import javax.ejb.TimerHandle;
import javax.event.Event;
import javax.inject.Initializer;
-import javax.inject.Produces;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import javax.sql.CommonDataSource;
import javax.xml.ws.Binding;
- at Named("orderBean")
@RequestScoped
+ at TestBindingType
public class Order
{
private final Integer integer;
@@ -33,12 +31,6 @@
this.integer = integer;
this.date = date;
}
-
- @Produces
- public Order getOrder()
- {
- return new Order();
- }
public Integer getInteger()
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/TestBindingType.java 2009-04-29 09:15:52 UTC (rev 2633)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo;
+
+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.BindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface TestBindingType
+{
+
+}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -15,10 +15,10 @@
</dd:AnotherTestInterceptorBindingType>
<dd:TestStereotype>
<Stereotype />
+ <Named />
<dd:TestScopeType />
<dd:TestDeploymentType />
<dd:AnotherTestInterceptorBindingType />
- <dd:TestNamed />
</dd:TestStereotype>
<dd:AnotherTestStereotype>
<Stereotype />
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/declaration/deployment/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -5,4 +5,7 @@
<Production />
<test:TestDeploymentType />
</Deploy>
+ <test:Order>
+ <test:TestDeploymentType />
+ </test:Order>
</Beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -4,17 +4,16 @@
<Deploy>
<Standard />
<Production />
+ <dd:AnotherDeploymentType />
</Deploy>
<dd:Order>
- <dd:str>
- <value>hello</value>
- </dd:str>
+ <dd:AnotherDeploymentType />
+ <dd:str />
<dd:getStr />
</dd:Order>
<bb:AnotherOrder>
- <bb:str>
- <value>hello one more time</value>
- </bb:str>
+ <dd:AnotherDeploymentType />
+ <bb:str />
<bb:getStr />
</bb:AnotherOrder>
</Beans>
\ No newline at end of file
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/schema.xsd 2009-04-29 09:15:52 UTC (rev 2633)
@@ -0,0 +1,10 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
+ <xs:element name="Beans">
+ <xs:complexType>
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:any namespace="##any" processContents="skip" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="skip" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -15,10 +15,4 @@
<test:val/>
<test:getVal />
</test:Order>
- <Decorators>
- <test:TestDecorator />
- </Decorators>
- <Interceptors>
- <test:TestInterceptor />
- </Interceptors>
</Beans>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-28 21:04:44 UTC (rev 2632)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-29 09:15:52 UTC (rev 2633)
@@ -1,8 +1,13 @@
<Beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo">
+ <test:TestBindingType>
+ <BindingType />
+ </test:TestBindingType>
+
<test:Order>
<RequestScoped />
+ <test:TestBindingType />
<Integer />
<Date />
<CommonDataSource />
@@ -11,11 +16,6 @@
<TimerHandle />
<EntityManager />
<Binding />
- <test:getOrder>
- <Produces>
- <test:Order />
- </Produces>
- </test:getOrder>
</test:Order>
</Beans>
@@ -30,6 +30,6 @@
javax.ejb.ScheduleExpression;
javax.persistence.EntityManager;
javax.xml.ws.Binding;
- javax.inject.Produces;
+ javax.inject.BindingType;
javax.annotation.Resource;
-->
\ No newline at end of file
More information about the weld-commits
mailing list