[webbeans-commits] Webbeans SVN: r2445 - ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl and 21 other directories.

Author: vitold Date: 2009-04-16 15:12:11 -0400 (Thu, 16 Apr 2009) New Revision: 2445 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/ 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/ 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/PaymentResource.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.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/metadata/foo/Order.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.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/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/metadata/beans.xml Log: some changes with tests Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-16 19:10:01 UTC (rev 2444) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/checker/beanchildren/ext/AbstractBeanChildrenChecker.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -210,10 +210,19 @@ "> matches the name of both a method and a field of the bean class '" + beanClass.getName() + "'"); if(isField) + { checkFieldChild(beanChildElement, beanClass); + return; + } if(isMethod) + { checkMethodChild(beanChildElement, beanClass); + return; + } + + throw new DefinitionException("The name of the child element <" + beanChildElement.getName() + + "> not matches the name of a method or a field of the bean class '" + beanClass.getName() + "'"); } private void checkFieldChild(Element beanChildElement, AnnotatedClass<?> beanClass) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-04-16 19:10:01 UTC (rev 2444) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xml/registrator/bean/impl/BeanElementRegistratorImpl.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -142,7 +142,7 @@ if(beanMethod != null) { - Iterator<?> beanChildIt = producesElement.elementIterator(); + Iterator<?> beanChildIt = beanChild.elementIterator(); while(beanChildIt.hasNext()) { Element element = (Element)beanChildIt.next(); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-04-16 19:10:01 UTC (rev 2444) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,34 +1,42 @@ package org.jboss.webbeans.test.unit.xml.beans; -import javax.context.Dependent; -import javax.inject.Current; +import javax.context.RequestScoped; import javax.inject.Initializer; -import javax.inject.manager.Manager; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestBindingType; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestDeploymentType; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestInterceptorBindingType; import org.jboss.webbeans.test.unit.xml.beans.annotationtype.TestStereotype; +@RequestScoped @TestBindingType @TestInterceptorBindingType @TestStereotype @TestDeploymentType public class Order -{ - private boolean active; +{ + private int val; + private String[] strArr; + @Initializer - public Order(@Current Manager manager) + public Order() { - if (manager.getContext(Dependent.class).isActive()) - { - active = true; - } + this.val = 0; } - public boolean isActive() + public Order(int val) { - return active; + this.val = val; } + + public int getVal() + { + return this.val; + } + + public String[] getStrArr() + { + return this.strArr; + } } Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.unit.xml.beans; + +import javax.annotation.Resource; + +@Resource +public class PaymentResource +{ + +} Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/JavaEePkgTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.test.unit.xml.javaeepkg; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.webbeans.test.unit.xml.javaeepkg.foo.Order; +import org.testng.annotations.Test; + +@Artifact +(a)Classes({Order.class}) +(a)BeansXml(&quot;beans.xml&quot;) +public class JavaEePkgTest extends AbstractWebBeansTest +{ + @Test + public void testJavaEePkg() + { + assert getCurrentManager().resolveByType(Order.class).size() == 2; + } +} \ No newline at end of file Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,53 @@ +package org.jboss.webbeans.test.unit.xml.javaeepkg.foo; + +import java.util.Date; + +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.ejb.ScheduleExpression; +import javax.event.Event; +import javax.inject.Initializer; +import javax.inject.Produces; +import javax.interceptor.InvocationContext; +import javax.jms.Connection; +import javax.persistence.EntityManager; +import javax.sql.CommonDataSource; +import javax.xml.ws.Binding; + +@Named("orderBean") +@RequestScoped +public class Order +{ + private Integer integer; + + private Date date; + + @Initializer + public Order() + { + this(0, new Date(), null, null, null, null, null, null, null); + } + + public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule, + EntityManager entityManager, Binding binding, Connection conn) + { + this.integer = integer; + this.date = date; + } + + @Produces + public Order getOrder() + { + return new Order(); + } + + public Integer getInteger() + { + return integer; + } + + public Date getDate() + { + return date; + } +} Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/foo/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.unit.xml.javaeepkg.foo; + +import javax.annotation.Resource; + +@Resource +public class PaymentResource +{ + +} Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-16 19:10:01 UTC (rev 2444) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -59,6 +59,7 @@ XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache()); XmlParser parser = new XmlParser(parserEnv); + Set<Bean<Order>> beansSet1 = parserEnv.getManager().resolveByType(Order.class); List<Class<? extends Annotation>> dTypes1 = parserEnv.getManager().getEnabledDeploymentTypes(); parser.parse(); Added: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml (rev 0) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/javaeepkg/beans.xml 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,43 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml.javaeepkg.foo"> + + <test:Order> + <RequestScoped /> + <Integer /> + <Date /> + <CommonDataSource /> + <InvocationContext /> + <Event /> + <ScheduleExpression /> + <EntityManager /> + <Binding /> + <Connection /> + <test:getOrder> + <Produces> + <test:Order /> + </Produces> + </test:getOrder> + </test:Order> + + <test:PaymentResource> + <Resource> + <name>java:app/service/PaymentService</name> + </Resource> + </test:PaymentResource> +</Beans> + + +<!-- + javax.context.RequestScoped; + java.lang.Integer; + java.util.Date; + javax.sql.CommonDataSource; + javax.interceptor.InvocationContext; + javax.event.Event; + javax.ejb.ScheduleExpression; + javax.persistence.EntityManager; + javax.xml.ws.Binding; + javax.jms.Connection; + javax.inject.Produces; + javax.annotation.Resource; +--> \ No newline at end of file Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml =================================================================== --- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-16 19:10:01 UTC (rev 2444) +++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/user-defined-beans.xml 2009-04-16 19:12:11 UTC (rev 2445) @@ -30,10 +30,14 @@ <myapp:TestInterceptorBindingType /> <myapp:TestStereotype /> <myapp:TestDeploymentType /> - <myapp:isActive /> - <manager:Manager /> + <Array> + <String /> + </Array> + <myapp:getVal /> + <myapp:val /> + <Integer /> </myapp:Order> - <myapp:PaymentService> + <myapp:PaymentResource> <RequestScoped /> <myapp:TestBindingType /> <myapp:TestInterceptorBindingType /> @@ -42,7 +46,7 @@ <Resource> <name>java:app/service/PaymentService</name> </Resource> - </myapp:PaymentService> + </myapp:PaymentResource> <Decorators> <myapp:TestDecorator /> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/AnnotationTypesTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -10,7 +10,7 @@ import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestNamed; import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestScopeType; import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.TestStereotype; -import org.jboss.jsr299.tck.tests.xml.metadata.foo.Order; +import org.jboss.jsr299.tck.tests.xml.annotationtypes.foo.Order; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; @@ -18,6 +18,7 @@ @Artifact @Classes({ + Order.class, TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, @@ -30,7 +31,7 @@ { @Test @SpecAssertions({ - @SpecAssertion(section="9", id="b"), + @SpecAssertion(section="9", id="d"),//without schema @SpecAssertion(section="9.4", id="a"), @SpecAssertion(section="9.4", id="b"), @SpecAssertion(section="9.4", id="c"), @@ -47,7 +48,6 @@ }) public void testAnnotationTypes() { -// assert getCurrentManager().resolveByType(Order.class).size() == 1; - assert true; + assert getCurrentManager().resolveByType(Order.class).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,22 +1,28 @@ package org.jboss.jsr299.tck.tests.xml.annotationtypes.foo; -import javax.context.RequestScoped; +import javax.context.Dependent; +import javax.inject.Current; +import javax.inject.Initializer; +import javax.inject.manager.Manager; -@RequestScoped @TestBindingType @TestInterceptorBindingType @TestStereotype public class Order -{ - private int val; +{ + private boolean active; - public Order(int val) + @Initializer + public Order(@Current Manager manager) { - this.val = val; + if (manager.getContext(Dependent.class).isActive()) + { + active = true; + } } - public int getVal() + public boolean isActive() { - return this.val; + return active; } } 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-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/XmlBasedMetadataTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -29,7 +29,7 @@ @SpecAssertions({ @SpecAssertion(section="9", id="b"), @SpecAssertion(section="9", id="c"), - @SpecAssertion(section="9", id="d"), + @SpecAssertion(section="9", id="d"),//with schema @SpecAssertion(section="9.1", id="a"), @SpecAssertion(section="9.1", id="b"), @SpecAssertion(section="9.1", id="c"), @@ -37,8 +37,7 @@ }) public void testXmlBasedMetadata() { -// assert getCurrentManager().resolveByType(Order.class).size() == 1; -// assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1; - assert true; + assert getCurrentManager().resolveByType(Order.class).size() == 1; + assert getCurrentManager().resolveByType(AnotherOrder.class).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,19 +1,32 @@ package org.jboss.jsr299.tck.tests.xml.metadata.foo; -import javax.context.RequestScoped; +import javax.context.Dependent; +import javax.inject.Current; +import javax.inject.Initializer; +import javax.inject.manager.Manager; -@RequestScoped public class Order { - public String str; + private String str; - public Order(String str) + private boolean active; + + @Initializer + public Order(@Current Manager manager) { - this.str = str; + if (manager.getContext(Dependent.class).isActive()) + { + active = true; + } } public String getStr() { return str; } + + public boolean isActive() + { + return active; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/metadata/foo/another/AnotherOrder.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,16 +1,33 @@ package org.jboss.jsr299.tck.tests.xml.metadata.foo.another; +import javax.context.Dependent; +import javax.inject.Current; +import javax.inject.Initializer; +import javax.inject.manager.Manager; + public class AnotherOrder { - public String str; + private String str; - public AnotherOrder(String str) + private boolean active; + + @Initializer + public AnotherOrder(@Current Manager manager) { - this.str = str; + if (manager.getContext(Dependent.class).isActive()) + { + active = true; + } } public String getStr() { return str; } + + public boolean isActive() + { + return active; + } } + 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-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/JavaEeNamespaceTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -25,15 +25,13 @@ @SpecAssertion(section="9.1", id="e"), @SpecAssertion(section="9.1", id="f"), @SpecAssertion(section="9.2", id="f"), - @SpecAssertion(section="9.2.1", id="a"), - @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") + @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; - assert true; + assert getCurrentManager().resolveByType(Order.class).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,15 +1,22 @@ package org.jboss.jsr299.tck.tests.xml.namespace.javaee.foo; import javax.context.RequestScoped; +import javax.inject.Initializer; @RequestScoped @AnotherDeploymentType public class Order { - public int val; + private int val; - public String[] strArr; + private String[] strArr; + @Initializer + public Order() + { + this.val = 0; + } + public Order(int val) { this.val = val; @@ -19,4 +26,9 @@ { return this.val; } + + public String[] getStrArr() + { + return this.strArr; + } } Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/JavaEePkgTest.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg; + +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.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)Classes({Order.class}) +(a)BeansXml(&quot;beans.xml&quot;) +public class JavaEePkgTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions({ + @SpecAssertion(section="9.2.1", id="a") + }) + public void testJavaEePkg() + { + assert getCurrentManager().resolveByType(Order.class).size() == 2; + } +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,52 @@ +package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo; + +import java.util.Date; + +import javax.annotation.Named; +import javax.context.RequestScoped; +import javax.ejb.ScheduleExpression; +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; + +@Named("orderBean") +@RequestScoped +public class Order +{ + private Integer integer; + + private Date date; + + @Initializer + public Order() + { + this(0, new Date(), null, null, null, null, null, null); + } + + public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule, + EntityManager entityManager, Binding binding) + { + this.integer = integer; + this.date = date; + } + + @Produces + public Order getOrder() + { + return new Order(); + } + + public Integer getInteger() + { + return integer; + } + + public Date getDate() + { + return date; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo; + +import javax.annotation.Resource; + +@Resource +public class PaymentResource +{ + +} 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-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/beans.xml 2009-04-16 19:12:11 UTC (rev 2445) @@ -1,5 +1,6 @@ <Beans xmlns="urn:java:ee" - xmlns:dd="urn:java:ee urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.foo"> + xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.foo" + xmlns:manager="urn:java:javax.inject.manager"> <dd:TestBindingType> <BindingType /> </dd:TestBindingType> @@ -15,10 +16,9 @@ <dd:TestNamed /> </dd:TestStereotype> <dd:Order> - <RequestScoped /> <dd:TestBindingType /> <dd:TestInterceptorBindingType /> <dd:TestStereotype /> - <Integer /> + <manager:Manager /> </dd:Order> </Beans> \ No newline at end of file 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-16 19:10:01 UTC (rev 2444) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/metadata/beans.xml 2009-04-16 19:12:11 UTC (rev 2445) @@ -7,13 +7,15 @@ <dd:AnotherDeploymentType /> </Deploy> <dd:Order> - <RequestScoped /> - <dd:str>hello</dd:str> + <dd:str> + <value>hello</value> + </dd:str> <dd:getStr /> </dd:Order> <bb:AnotherOrder> - <RequestScoped /> - <bb:str>hello one more time</bb:str> + <bb:str> + <value>hello one more time</value> + </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/namespace/javaee/pkg/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-16 19:12:11 UTC (rev 2445) @@ -0,0 +1,41 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo"> + + <test:Order> + <RequestScoped /> + <Integer /> + <Date /> + <CommonDataSource /> + <InvocationContext /> + <Event /> + <ScheduleExpression /> + <EntityManager /> + <Binding /> + <test:getOrder> + <Produces> + <test:Order /> + </Produces> + </test:getOrder> + </test:Order> + + <test:PaymentResource> + <Resource> + <name>java:app/service/PaymentService</name> + </Resource> + </test:PaymentResource> +</Beans> + + +<!-- + javax.context.RequestScoped; + java.lang.Integer; + java.util.Date; + javax.sql.CommonDataSource; + javax.interceptor.InvocationContext; + javax.event.Event; + javax.ejb.ScheduleExpression; + javax.persistence.EntityManager; + javax.xml.ws.Binding; + javax.inject.Produces; + javax.annotation.Resource; +--> \ No newline at end of file