Author: dallen6 Date: 2009-04-22 05:41:20 -0400 (Wed, 22 Apr 2009) New Revision: 2614 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/SimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/SimpleBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/web.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/persistence.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/ic/ Log: Implemented various resource injection tests for simple beans. Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; + +import javax.inject.manager.Bean; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * EJB injection tests for simple beans. + * + * @author David Allen + * + */ +@Artifact +(a)Packaging(PackagingType.EAR) +@IntegrationTest +@Resources({ + @Resource(source="web.xml", destination="WEB-INF/web.xml") +}) +(a)BeansXml(&quot;beans.xml&quot;) +public class EjbInjectionTest extends AbstractJSR299Test +{ + @Test(groups = { "ri-broken", "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertion(section = "6.4", id = "b") + public void testInjectionOfEjbs() + { + Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); + assert !simpleBean.isMyEjbExists() : "Ejb was injected too early"; + assert simpleBean.getMyEjb() != null : "Ejb was not injected into bean"; + assert simpleBean.getMyEjb().hello().equals("hi!"); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; + +import javax.context.CreationalContext; + +class MyCreationalContext<T> implements CreationalContext<T> +{ + public void push(T incompleteInstance) + { + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; + +import javax.ejb.Stateless; + +@Stateless(name="MyRemoteEjb", mappedName="ejb/MyRemoteEjb") +public class RemoteEjb implements RemoteEjbInterface +{ + + public String hello() + { + return "hi!"; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbInterface.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbInterface.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; + +import javax.ejb.Remote; + +@Remote +public interface RemoteEjbInterface +{ + public String hello(); +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/SimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/SimpleBean.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb; + +import javax.ejb.EJB; + +class SimpleBean +{ + @EJB + private RemoteEjb myEjb; + private boolean myEjbExists; + + public SimpleBean() + { + myEjbExists = myEjb != null; + } + + public RemoteEjb getMyEjb() + { + return myEjb; + } + + public boolean isMyEjbExists() + { + return myEjbExists; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/SimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; + +import javax.context.CreationalContext; + +class MyCreationalContext<T> implements CreationalContext<T> +{ + public void push(T incompleteInstance) + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/DeclarationOfPersistenceUnitAndContextTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,59 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; + +import javax.inject.manager.Bean; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.Resources; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * Injection of persistence related objects. + * + * @author David Allen + * + */ +@Artifact +(a)Packaging(PackagingType.WAR) +@IntegrationTest +@Resources({ + @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml") +}) +(a)BeansXml(&quot;beans.xml&quot;) +public class PersistenceContextInjectionTest extends AbstractJSR299Test +{ + @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertions( { + @SpecAssertion(section = "6.4", id = "c") + }) + public void testInjectionOfPersistenceContext() + { + Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); + EntityManager entityManager = simpleBean.getPersistenceContext(); + assert !simpleBean.isPersistenceContextExistsDuringConstruction() : "Persistence context injected too early"; + assert entityManager != null : "Persistence context was not injected into bean"; + assert entityManager.isOpen() : "persistence context not open injected into bean"; + } + + @Test(groups = { "broken", "beanLifecycle", "commonAnnotations", "integration" }) + public void testInjectionOfPersistenceUnit() + { + //TODO There is no spec assertion for this test and it does not work, but there is bean support for persistence units + Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); + EntityManagerFactory entityManagerFactory = simpleBean.getPersistenceUnit(); + assert !simpleBean.isPersistenceUnitExistsDuringConstruction() : "Persistence unit injected too early"; + assert entityManagerFactory != null : "Persistence unit was not injected into bean"; + assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean"; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/SimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/SimpleBean.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,43 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceContext; +import javax.persistence.PersistenceUnit; + +class SimpleBean +{ + @PersistenceContext + private EntityManager persistenceContext; + private boolean persistenceContextExistsDuringConstruction; + + @PersistenceUnit + private EntityManagerFactory persistenceUnit; + private boolean persistenceUnitExistsDuringConstruction; + + public SimpleBean() + { + persistenceContextExistsDuringConstruction = persistenceContext != null; + persistenceUnitExistsDuringConstruction = persistenceUnit != null; + } + + public EntityManager getPersistenceContext() + { + return persistenceContext; + } + + public EntityManagerFactory getPersistenceUnit() + { + return persistenceUnit; + } + + public boolean isPersistenceContextExistsDuringConstruction() + { + return persistenceContextExistsDuringConstruction; + } + + public boolean isPersistenceUnitExistsDuringConstruction() + { + return persistenceUnitExistsDuringConstruction; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/SimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/Another.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; + +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; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Another +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java (from rev 2611, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/DeclarationOfResourceTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,32 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; + +import javax.inject.manager.Bean; +import javax.inject.manager.Manager; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.WAR) +@IntegrationTest +(a)BeansXml(&quot;beans.xml&quot;) +public class InjectionOfResourceTest extends AbstractJSR299Test +{ + @Test(groups = { "ri-broken", "beanLifecycle", "commonAnnotations", "integration" }) + @SpecAssertion(section = "6.4", id = "d") + public void testInjectionOfResource() + { + Bean<SimpleBean> simpleBeanBean = getCurrentManager().resolveByType(SimpleBean.class).iterator().next(); + SimpleBean simpleBean = simpleBeanBean.create(new MyCreationalContext<SimpleBean>()); + Manager manager = simpleBean.getManager(); + assert !simpleBean.isManagerInjected() : "Manager injected too early"; + assert manager != null : "@Another Manager not found"; + assert manager.equals(getCurrentManager()): "Wrong manager found"; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; + +import javax.context.CreationalContext; + +class MyCreationalContext<T> implements CreationalContext<T> +{ + public void push(T incompleteInstance) + { + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource; + +import javax.annotation.Resource; +import javax.inject.manager.Manager; + +class SimpleBean +{ + @Resource + private Manager manager; + private boolean managerInjected; + + public SimpleBean() + { + managerInjected = manager != null; + } + + public Manager getManager() + { + return manager; + } + + public boolean isManagerInjected() + { + return managerInjected; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/SimpleBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml (from rev 2611, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/beans.xml 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,12 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb"> + <Deploy> + <Standard /> + <Production /> + </Deploy> + <test:RemoteEjbInterface> + <EJB> + <mappedName>ejb/MyRemoteEjb</mappedName> + </EJB> + </test:RemoteEjbInterface> +</Beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/web.xml (from rev 2611, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/web.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/web.xml 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <description>EJB references for Simple Beans.</description> + <display-name>EJB Injection Tests</display-name> + + <ejb-ref> + <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <remote>org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.RemoteEjbInterface</remote> + </ejb-ref> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> \ No newline at end of file Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml (from rev 2611, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/beans.xml 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,13 @@ +<Beans xmlns="urn:java:ee"> + <EntityManager> + <PersistenceContext> + <unitName>test</unitName> + </PersistenceContext> + </EntityManager> + + <EntityManagerFactory> + <PersistenceUnit> + <unitName>test</unitName> + </PersistenceUnit> + </EntityManagerFactory> +</Beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/persistence.xml (from rev 2611, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/persistence.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/persistence.xml 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="test"> + <jta-data-source>java:/DefaultDS</jta-data-source> + </persistence-unit> +</persistence> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml (from rev 2613, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/beans.xml 2009-04-22 09:41:20 UTC (rev 2614) @@ -0,0 +1,11 @@ +<Beans xmlns="urn:java:ee" + xmlns:app="urn:java:org.jboss.jsr299.tck.tests.implementation.simple.resource.resource" + xmlns:m="urn:java:javax.inject.manager"> + + <m:Manager> + <Resource> + <mappedName>java:app/Manager</mappedName> + </Resource> + <app:Another /> + </m:Manager> +</Beans>