[webbeans-commits] Webbeans SVN: r2467 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 09:01:06 -0400 (Fri, 17 Apr 2009)
New Revision: 2467
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
Log:
WBTCK-32
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-04-17 12:49:27 UTC (rev 2466)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-04-17 13:01:06 UTC (rev 2467)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
-
-import static java.lang.annotation.ElementType.METHOD;
-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.DeploymentType;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-@DeploymentType
-@interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-04-17 12:49:27 UTC (rev 2466)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-04-17 13:01:06 UTC (rev 2467)
@@ -2,7 +2,6 @@
import javax.context.RequestScoped;
-@AnotherDeploymentType
@RequestScoped
final class FinalTuna_Broken
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java 2009-04-17 13:01:06 UTC (rev 2467)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.lookup.clientProxy.unproxyable;
+
+import javax.inject.Current;
+
+public class FishFarm
+{
+
+ @Current FinalTuna_Broken tuna;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/FishFarm.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2466 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 08:49:27 -0400 (Fri, 17 Apr 2009)
New Revision: 2466
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
Log:
WBTCK-30
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-17 12:23:16 UTC (rev 2465)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-17 12:49:27 UTC (rev 2466)
@@ -24,6 +24,8 @@
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
import java.util.HashSet;
import java.util.Set;
@@ -77,6 +79,7 @@
this.declaringBean = declaringBean;
}
+ @Override
protected abstract AnnotatedMember<T, S> getAnnotatedItem();
/**
@@ -166,6 +169,14 @@
*/
protected void checkProducerReturnType()
{
+ if (getAnnotatedItem().getType() instanceof TypeVariable<?>)
+ {
+ throw new DefinitionException("Return type must be concrete " + getAnnotatedItem().getType());
+ }
+ if (getAnnotatedItem().getType() instanceof WildcardType)
+ {
+ throw new DefinitionException("Return type must be concrete " + getAnnotatedItem().getType());
+ }
for (Type type : getAnnotatedItem().getActualTypeArguments())
{
if (!(type instanceof Class))
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-04-17 12:49:27 UTC (rev 2466)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2;
+
+import javax.inject.DefinitionException;
+
+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.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section = "3.4", id = "i")
+ public void testParameterizedType()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java 2009-04-17 12:49:27 UTC (rev 2466)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.parametermizedTypeWithTypeParameter2;
+
+import javax.inject.Produces;
+import javax.inject.manager.InjectionPoint;
+
+public class TProducer
+{
+ @Produces
+ public <T> T create(InjectionPoint point)
+ {
+ return null;
+ }
+}
+
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/parametermizedTypeWithTypeParameter2/TProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2465 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 08:23:16 -0400 (Fri, 17 Apr 2009)
New Revision: 2465
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml
Log:
Add persistence unit test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 12:17:11 UTC (rev 2464)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 12:23:16 UTC (rev 2465)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -37,4 +38,19 @@
assert entityManager != null : "Persistence context was not injected into bean";
assert entityManager.isOpen() : "persistence context not open injected into bean";
}
+
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "h"),
+ @SpecAssertion(section = "3.6", id = "c"),
+ @SpecAssertion(section = "3.6", id = "h"),
+ @SpecAssertion(section = "3.6.1", id = "c"),
+ @SpecAssertion(section = "3.6.1", id = "h")
+ })
+ public void testInjectionOfPersistenceUnit()
+ {
+ EntityManagerFactory entityManagerFactory = getCurrentManager().getInstanceByType(EntityManagerFactory.class);
+ assert entityManagerFactory != null : "Persistence unit was not injected into bean";
+ assert entityManagerFactory.isOpen() : "persistence unit not open injected into bean";
+ }
}
Modified: 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/xml/resource/persistenceContext/beans.xml 2009-04-17 12:17:11 UTC (rev 2464)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml 2009-04-17 12:23:16 UTC (rev 2465)
@@ -4,4 +4,10 @@
<unitName>test</unitName>
</PersistenceContext>
</EntityManager>
+
+ <EntityManagerFactory>
+ <PersistenceUnit>
+ <unitName>test</unitName>
+ </PersistenceUnit>
+ </EntityManagerFactory>
</Beans>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2464 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/resource and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 08:17:11 -0400 (Fri, 17 Apr 2009)
New Revision: 2464
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/
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/xml/resource/resource/InjectionOfResourceTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/
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/xml/resource/resource/web.xml
Log:
A working resource injection test
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource (from rev 2457, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant)
Added: 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/xml/resource/resource/Another.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java 2009-04-17 12:17:11 UTC (rev 2464)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.xml.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
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 10:20:14 UTC (rev 2457)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:17:11 UTC (rev 2464)
@@ -1,38 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.constant;
-
-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;
-
-@Artifact
-(a)Packaging(PackagingType.WAR)
-@IntegrationTest
-@Resources({
- @Resource(source="web.xml", destination="WEB-INF/web.xml")
-})
-@BeansXml("beans.xml")
-public class InjectionOfPrimitiveResourceTest extends AbstractJSR299Test
-{
- @Test(groups = { "xml", "broken" })
- @SpecAssertions( {
- @SpecAssertion(section = "6.9", id = "f"),
- @SpecAssertion(section = "3.6", id = "a"),
- @SpecAssertion(section = "3.6", id = "f"),
- @SpecAssertion(section = "3.6.1", id = "a"),
- @SpecAssertion(section = "3.6.1", id = "f")
- })
- public void testInjectionOfSimpleResource()
- {
- SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
- assert bean.getInjectedCode() != null : "Integer code was not injected into bean";
- assert bean.getInjectedCode() == 42 : "Wrong code value injected into bean";
- }
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 12:17:11 UTC (rev 2464)
@@ -0,0 +1,36 @@
+package org.jboss.jsr299.tck.tests.xml.resource.resource;
+
+import javax.inject.AnnotationLiteral;
+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.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
+@BeansXml("beans.xml")
+public class InjectionOfResourceTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "f"),
+ @SpecAssertion(section = "3.6", id = "a"),
+ @SpecAssertion(section = "3.6", id = "f"),
+ @SpecAssertion(section = "3.6.1", id = "a"),
+ @SpecAssertion(section = "3.6.1", id = "f")
+ })
+ public void testInjectionOfResource()
+ {
+ Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {});
+ assert manager != null : "@Another Manager was not injected into bean";
+ assert manager.equals(getCurrentManager()): "Wrong manager injected into bean";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 10:20:14 UTC (rev 2457)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java 2009-04-17 12:17:11 UTC (rev 2464)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.constant;
-
-public class SimpleBean
-{
- private Integer injectedCode = null;
-
- public Integer getInjectedCode()
- {
- return injectedCode;
- }
-
-}
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource (from rev 2457, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant)
Deleted: 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/xml/resource/constant/beans.xml 2009-04-17 10:20:14 UTC (rev 2457)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-04-17 12:17:11 UTC (rev 2464)
@@ -1,12 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <test:SimpleBean>
- <Resource>
- <name>AnswerToLife</name>
- </Resource>
- </test:SimpleBean>
-</Beans>
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml (from rev 2463, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-04-17 12:17:11 UTC (rev 2464)
@@ -0,0 +1,11 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:app="urn:java:org.jboss.jsr299.tck.tests.xml.resource.resource"
+ xmlns:m="urn:java:javax.inject.manager">
+
+ <m:Manager>
+ <Resource>
+ <mappedName>java:app/Manager</mappedName>
+ </Resource>
+ <app:Another />
+ </m:Manager>
+</Beans>
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 10:20:14 UTC (rev 2457)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/web.xml 2009-04-17 12:17:11 UTC (rev 2464)
@@ -1,26 +0,0 @@
-<?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>Test servlets used to test session contexts.</description>
- <display-name>Session Context Tests</display-name>
-
- <!-- resource-ref>
- <res-ref-name>AnswerToLife</res-ref-name>
- <res-type>java.lang.Integer</res-type>
- <mapped-name>constants/AnswerToLife</mapped-name>
- </resource-ref -->
-
- <env-entry>
- <env-entry-name>AnswerToLife</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>42</env-entry-value>
- <mapped-name>constants/AnswerToLife</mapped-name>
- </env-entry>
-
- <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
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2463 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/resource/constant and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 08:07:53 -0400 (Fri, 17 Apr 2009)
New Revision: 2463
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/
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/xml/resource/persistenceContext/persistence.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml
Log:
Add test injection of persistence context
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:06:26 UTC (rev 2462)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:07:53 UTC (rev 2463)
@@ -31,8 +31,8 @@
})
public void testInjectionOfSimpleResource()
{
- SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
- assert bean.getInjectedCode() != null : "Integer code was not injected into bean";
- assert bean.getInjectedCode() == 42 : "Wrong code value injected into bean";
+ Integer integer = getCurrentManager().getInstanceByType(Integer.class);
+ assert integer != null : "Integer code was not injected into bean";
+ assert integer.intValue() == 42 : "Wrong code value injected into bean";
}
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 12:06:26 UTC (rev 2462)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 12:07:53 UTC (rev 2463)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.constant;
-
-public class SimpleBean
-{
- private Integer injectedCode = null;
-
- public Integer getInjectedCode()
- {
- return injectedCode;
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 12:06:26 UTC (rev 2462)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 12:07:53 UTC (rev 2463)
@@ -46,7 +46,7 @@
@EjbJarXml("ejb-jar.xml")
public class InjectionOfEjbTest extends AbstractJSR299Test
{
- @Test(groups = { "xml", "broken" })
+ @Test(groups = { "xml" })
@SpecAssertions( {
@SpecAssertion(section = "6.9", id = "i"),
@SpecAssertion(section = "3.6", id = "d"),
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 12:07:53 UTC (rev 2463)
@@ -0,0 +1,40 @@
+package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext;
+
+import javax.persistence.EntityManager;
+
+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;
+
+@Artifact
+(a)Packaging(PackagingType.WAR)
+@IntegrationTest
+@Resources({
+ @Resource(source="persistence.xml", destination="WEB-INF/persistence.xml")
+})
+@BeansXml("beans.xml")
+public class InjectionOfPersistenceContextTest extends AbstractJSR299Test
+{
+ @Test(groups = { "xml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "6.9", id = "g"),
+ @SpecAssertion(section = "3.6", id = "b"),
+ @SpecAssertion(section = "3.6", id = "g"),
+ @SpecAssertion(section = "3.6.1", id = "b"),
+ @SpecAssertion(section = "3.6.1", id = "g")
+ })
+ public void testInjectionOfPersistenceContext()
+ {
+ EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class);
+ assert entityManager != null : "Persistence context was not injected into bean";
+ assert entityManager.isOpen() : "persistence context not open injected into bean";
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml 2009-04-17 12:06:26 UTC (rev 2462)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml 2009-04-17 12:07:53 UTC (rev 2463)
@@ -1,12 +1,7 @@
-<Beans xmlns="urn:java:ee"
- xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
- <test:SimpleBean>
+<Beans xmlns="urn:java:ee">
+ <Integer>
<Resource>
- <name>AnswerToLife</name>
+ <mappedName>constants/AnswerToLife</mappedName>
</Resource>
- </test:SimpleBean>
+ </Integer>
</Beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 12:06:26 UTC (rev 2462)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 12:07:53 UTC (rev 2463)
@@ -1,6 +1,7 @@
<?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">
+ 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>Test servlets used to test session contexts.</description>
<display-name>Session Context Tests</display-name>
@@ -17,10 +18,4 @@
<mapped-name>constants/AnswerToLife</mapped-name>
</env-entry>
- <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
Added: 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/xml/resource/persistenceContext/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml 2009-04-17 12:07:53 UTC (rev 2463)
@@ -0,0 +1,7 @@
+<Beans xmlns="urn:java:ee">
+ <EntityManager>
+ <PersistenceContext>
+ <unitName>test</unitName>
+ </PersistenceContext>
+ </EntityManager>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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/xml/resource/persistenceContext/persistence.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml 2009-04-17 12:07:53 UTC (rev 2463)
@@ -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>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2462 - ri/trunk/logging.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 08:06:26 -0400 (Fri, 17 Apr 2009)
New Revision: 2462
Modified:
ri/trunk/logging/
Log:
ignores
Property changes on: ri/trunk/logging
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
target
.settings
+ .project
.classpath
target
.settings
test-output
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2461 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: util and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 07:47:03 -0400 (Fri, 17 Apr 2009)
New Revision: 2461
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java
Log:
minor
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-04-17 11:47:03 UTC (rev 2461)
@@ -29,11 +29,13 @@
import javax.context.CreationalContext;
import javax.context.Dependent;
+import javax.inject.Production;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
+import org.jboss.webbeans.literal.CurrentLiteral;
import org.jboss.webbeans.util.Proxies;
/**
@@ -45,6 +47,13 @@
public abstract class AbstractJavaEEResourceBean<T> extends RIBean<T>
{
+ private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+
+ static
+ {
+ DEFAULT_BINDINGS.add(new CurrentLiteral());
+ }
+
private final Class<? extends Annotation> deploymentType;
private final Set<Annotation> bindings;
private final Class<T> type;
@@ -71,8 +80,30 @@
protected AbstractJavaEEResourceBean(ManagerImpl manager, Class<? extends Annotation> deploymentType, Set<Annotation> bindings, Class<T> type, Type... types)
{
super(manager);
- this.deploymentType = deploymentType;
- this.bindings = bindings;
+ if (deploymentType != null)
+ {
+ this.deploymentType = deploymentType;
+ }
+ else
+ {
+ this.deploymentType = Production.class;
+ }
+ if (bindings != null)
+ {
+ this.bindings = bindings;
+ }
+ else
+ {
+ this.bindings = DEFAULT_BINDINGS;
+ }
+ if (type == null)
+ {
+ throw new IllegalStateException("Type must be specified");
+ }
+ if (types == null || types.length == 0)
+ {
+ throw new IllegalStateException("Types must be specified");
+ }
this.type = type;
this.types = new HashSet<Type>();
this.types.addAll(Arrays.asList(types));
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java 2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java 2009-04-17 11:47:03 UTC (rev 2461)
@@ -36,7 +36,7 @@
private static final long serialVersionUID = -3171683636451762591L;
- private static final transient Log log = Logging.getLog(AbstractJavaEEResourceMethodHandler.class);
+ private static final Log log = Logging.getLog(AbstractJavaEEResourceMethodHandler.class);
/**
*
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java 2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java 2009-04-17 11:47:03 UTC (rev 2461)
@@ -55,7 +55,7 @@
{
if (classes.isEmpty())
{
- throw new AssertionError("TypeInfo not properly initialized");
+ return null;
}
Iterator<Class<?>> it = classes.iterator();
Class<?> superclass = it.next();
@@ -79,7 +79,7 @@
{
ProxyFactory proxyFactory = new ProxyFactory();
Class<?> superClass = getSuperClass();
- if(superClass != Object.class)
+ if(superClass != null && superClass != Object.class)
{
proxyFactory.setSuperclass(superClass);
}
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2460 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/xml/resource/ejb and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 07:46:22 -0400 (Fri, 17 Apr 2009)
New Revision: 2460
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
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/xml/resource/ejb/RemoteEjbInterface.java
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/xml/resource/ejb/ejb-jar.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
Log:
Use jboss specific names - later we will generalize this
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 11:46:22 UTC (rev 2460)
@@ -56,8 +56,7 @@
})
public void testEjbInjectionByXml()
{
- SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
- assert bean.getRemoteEjb() != null;
- bean.getRemoteEjb().hello();
+ RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
+ assert remoteEjbInterface.hello().equals("hi!");
}
}
Modified: 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/xml/resource/ejb/RemoteEjb.java 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java 2009-04-17 11:46:22 UTC (rev 2460)
@@ -6,8 +6,9 @@
public class RemoteEjb implements RemoteEjbInterface
{
- public void hello()
+ public String hello()
{
+ return "hi!";
}
}
Modified: 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/xml/resource/ejb/RemoteEjbInterface.java 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java 2009-04-17 11:46:22 UTC (rev 2460)
@@ -5,5 +5,5 @@
@Remote
public interface RemoteEjbInterface
{
- public void hello();
+ public String hello();
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java 2009-04-17 11:46:22 UTC (rev 2460)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.ejb;
-
-class SimpleBean
-{
- private RemoteEjbInterface remoteEjb = null;
-
- public RemoteEjbInterface getRemoteEjb()
- {
- return remoteEjb;
- }
-}
Modified: 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/xml/resource/ejb/beans.xml 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml 2009-04-17 11:46:22 UTC (rev 2460)
@@ -4,9 +4,9 @@
<Standard />
<Production />
</Deploy>
- <test:SimpleBean>
+ <test:RemoteEjbInterface>
<EJB>
- <name>ejb/MyRemoteEjb</name>
+ <mappedName>org.jboss.jsr299.tck.tests.xml.resource.ejb.InjectionOfEjbTest/MyRemoteEjb/remote-org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</mappedName>
</EJB>
- </test:SimpleBean>
+ </test:RemoteEjbInterface>
</Beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml 2009-04-17 11:46:22 UTC (rev 2460)
@@ -4,16 +4,5 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
version="3.0">
- <enterprise-beans>
- <!-- EJB reference required when beans.xml references another EJB component using <EJB> -->
- <session>
- <ejb-name>MyRemoteEjb</ejb-name>
- <ejb-ref>
- <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
- <mapped-name>ejb/MyRemoteEjb</mapped-name>
- </ejb-ref>
- </session>
- </enterprise-beans>
+
</ejb-jar>
Modified: 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/xml/resource/ejb/web.xml 2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml 2009-04-17 11:46:22 UTC (rev 2460)
@@ -8,7 +8,6 @@
<ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
- <mapped-name>ejb/MyRemoteEjb</mapped-name>
</ejb-ref>
<session-config>
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2459 - in ri/trunk/tests/src/test: java/org/jboss/webbeans/test/unit/xml/parser and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: vitold
Date: 2009-04-17 07:44:06 -0400 (Fri, 17 Apr 2009)
New Revision: 2459
Added:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java
Removed:
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/PaymentService.java
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/schema/SchemaValidationTest.java
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace
ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace
Log:
fix BeansXmlParserTest
Deleted: 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 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentResource.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.test.unit.xml.beans;
-
-import javax.annotation.Resource;
-
-@Resource
-public class PaymentResource
-{
-
-}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/beans/PaymentService.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -1,9 +0,0 @@
-package org.jboss.webbeans.test.unit.xml.beans;
-
-import javax.xml.ws.WebServiceRef;
-
-@WebServiceRef
-public class PaymentService
-{
-
-}
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-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/XmlParserImplTest.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -1,13 +1,18 @@
package org.jboss.webbeans.test.unit.xml.parser;
+import java.lang.annotation.Annotation;
import java.net.URL;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
+import javax.inject.manager.Bean;
+
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.ejb.EjbDescriptorCache;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -16,6 +21,7 @@
import org.jboss.webbeans.test.unit.xml.beans.Order;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
+import org.testng.annotations.Test;
@Artifact
@Resources({
@@ -47,21 +53,21 @@
assert parserEnv.getClasses().size() == 1;
}
-// @Test
+ @Test
public void testDd()
{
XmlEnvironment parserEnv = new MockXmlEnvironment(getResources("user-defined-beans.xml"), new EjbDescriptorCache());
XmlParser parser = new XmlParser(parserEnv);
parser.parse();
-// ManagerImpl manager = parserEnv.getManager();
-//
-// Set<Bean<Order>> beansSet = manager.resolveByType(Order.class);
-// List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes();
-// for(Bean<Order> bean : beansSet)
-// {
-// Class<? extends Annotation> deploymentType = bean.getDeploymentType();
-// System.out.println("after parsing: " + deploymentType);
-// }
+ ManagerImpl manager = parserEnv.getManager();
+
+ Set<Bean<Order>> beansSet = manager.resolveByType(Order.class);
+ List<Class<? extends Annotation>> dTypes = manager.getEnabledDeploymentTypes();
+ for(Bean<Order> bean : beansSet)
+ {
+ Class<? extends Annotation> deploymentType = bean.getDeploymentType();
+ System.out.println("after parsing: " + deploymentType);
+ }
}
}
\ No newline at end of file
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/SchemaValidationTest.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -9,7 +9,7 @@
import org.jboss.webbeans.ejb.EjbDescriptorCache;
import org.jboss.webbeans.mock.MockXmlEnvironment;
import org.jboss.webbeans.test.AbstractWebBeansTest;
-import org.jboss.webbeans.test.unit.xml.beans.Order;
+import org.jboss.webbeans.test.unit.xml.parser.schema.foo.Order;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
import org.testng.annotations.Test;
Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/Order.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -0,0 +1,42 @@
+package org.jboss.webbeans.test.unit.xml.parser.schema.foo;
+
+import javax.context.RequestScoped;
+import javax.inject.Initializer;
+
+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 int val;
+
+ private String[] strArr;
+
+ @Initializer
+ public Order()
+ {
+ this.val = 0;
+ }
+
+ public Order(int val)
+ {
+ 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/parser/schema/foo/PaymentResource.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java (rev 0)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/foo/PaymentResource.java 2009-04-17 11:44:06 UTC (rev 2459)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.test.unit.xml.parser.schema.foo;
+
+import javax.annotation.Resource;
+
+@Resource
+public class PaymentResource
+{
+
+}
Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/deploy/user-defined-beans.xml 2009-04-17 11:44:06 UTC (rev 2459)
@@ -5,12 +5,4 @@
<Production />
<test:AnotherDeploymentType />
</Deploy>
- <myapp:Order>
- <ConversationScoped />
- <myapp:PaymentProcessor>
- <myapp:Asynchronous />
- </myapp:PaymentProcessor>
- <myapp:User />
- </myapp:Order>
-
</Beans>
\ No newline at end of file
Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/namespace 2009-04-17 11:44:06 UTC (rev 2459)
@@ -1,2 +1,2 @@
-org.jboss.webbeans.test.unit.xml.beans
-org.jboss.webbeans.test.unit.xml.beans.annotationtype
\ No newline at end of file
+org.jboss.webbeans.test.unit.xml.beans.annotationtype
+org.jboss.webbeans.test.unit.xml.parser.schema.foo
\ No newline at end of file
Modified: ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace
===================================================================
--- ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-17 10:54:49 UTC (rev 2458)
+++ ri/trunk/tests/src/test/resources/org/jboss/webbeans/test/unit/xml/parser/schema/namespace 2009-04-17 11:44:06 UTC (rev 2459)
@@ -1,2 +1,2 @@
-org.jboss.webbeans.test.unit.xml.beans
-org.jboss.webbeans.test.unit.xml.beans.annotationtype
\ No newline at end of file
+org.jboss.webbeans.test.unit.xml.beans.annotationtype
+org.jboss.webbeans.test.unit.xml.parser.schema.foo
\ No newline at end of file
16 years, 12 months
[webbeans-commits] Webbeans SVN: r2458 - ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-04-17 06:54:49 -0400 (Fri, 17 Apr 2009)
New Revision: 2458
Modified:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
Log:
minor
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-17 10:20:14 UTC (rev 2457)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-04-17 10:54:49 UTC (rev 2458)
@@ -3,6 +3,7 @@
import java.net.URL;
import java.util.Iterator;
+import javax.inject.DefinitionException;
import javax.inject.Production;
import javax.inject.Standard;
@@ -11,9 +12,7 @@
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.webbeans.ejb.EjbDescriptorCache;
-import org.jboss.webbeans.mock.MockResourceLoader;
import org.jboss.webbeans.mock.MockXmlEnvironment;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.jboss.webbeans.xml.XmlEnvironment;
import org.jboss.webbeans.xml.XmlParser;
@@ -67,7 +66,7 @@
/**
* Test case for WBRI-21.
*/
- //(a)Test(expectedExceptions=DeploymentException.class, description="WBRI-21")
+ @Test(expectedExceptions=DefinitionException.class, description="WBRI-21")
public void testDuplicateDeployElement()
{
Iterable<URL> urls = getResources("duplicate-deployments-beans.xml");
16 years, 12 months