February 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1533 - doc/trunk/reference/zh-CN.

by webbeans-commits＠lists.jboss.org

Author: alartin Date: 2009-02-15 21:53:34 -0500 (Sun, 15 Feb 2009) New Revision: 1533 Modified: doc/trunk/reference/zh-CN/ee.po Log: Modified: doc/trunk/reference/zh-CN/ee.po =================================================================== --- doc/trunk/reference/zh-CN/ee.po 2009-02-16 01:03:53 UTC (rev 1532) +++ doc/trunk/reference/zh-CN/ee.po 2009-02-16 02:53:34 UTC (rev 1533) @@ -6,7 +6,7 @@ "Project-Id-Version: master.xml\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-12-20 22:08+0000\n" -"PO-Revision-Date: 2009-02-10 15:58+0800\n" +"PO-Revision-Date: 2009-02-11 13:00+0800\n" "Last-Translator: Sean Wu <alartin(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n"

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1532 - ri/trunk/jboss-tck-runner.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 20:03:53 -0500 (Sun, 15 Feb 2009) New Revision: 1532 Modified: ri/trunk/jboss-tck-runner/pom.xml Log: some improvements for windows incontainer runs, but not quite right yet Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-16 00:27:29 UTC (rev 1531) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-16 01:03:53 UTC (rev 1532) @@ -149,7 +149,7 @@ </property> <property> <name>org.jboss.jsr299.tck.libraryDirectory</name> - <value>${project.build.directory}/dependency/lib</value> + <value>target/dependency/lib</value> </property> </systemProperties> </configuration> @@ -188,7 +188,7 @@ </property> <property> <name>org.jboss.jsr299.tck.libraryDirectory</name> - <value>${project.build.directory}/dependency/lib</value> + <value>target/dependency/lib</value> </property> </systemProperties> </configuration>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1531 - tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi and 13 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 19:27:29 -0500 (Sun, 15 Feb 2009) New Revision: 1531 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml Removed: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java Log: Support for reading deployment types from beans.xml Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-15 23:00:58 UTC (rev 1530) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,11 +1,9 @@ package org.jboss.webbeans.tck; import java.lang.annotation.Annotation; -import java.util.Arrays; +import java.net.URL; import java.util.List; -import javax.inject.manager.Manager; - import org.jboss.jsr299.tck.api.DeploymentException; import org.jboss.jsr299.tck.spi.StandaloneContainers; import org.jboss.webbeans.ManagerImpl; @@ -15,8 +13,13 @@ public class StandaloneContainersImpl implements StandaloneContainers { - public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes) throws DeploymentException + public void deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Iterable<Class<?>> classes) throws DeploymentException { + deploy(enabledDeploymentTypes, classes, null); + } + + public void deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException + { try { MockBootstrap bootstrap = new MockBootstrap(); @@ -26,10 +29,13 @@ manager.setEnabledDeploymentTypes(enabledDeploymentTypes); } MockWebBeanDiscovery discovery = new MockWebBeanDiscovery(); - discovery.setWebBeanClasses(Arrays.asList(classes)); + discovery.setWebBeanClasses(classes); + if (beansXml != null) + { + discovery.setWebBeansXmlFiles(beansXml); + } bootstrap.setWebBeanDiscovery(discovery); bootstrap.boot(); - return manager; } catch (Exception e) { @@ -37,9 +43,14 @@ } } - public Manager deploy(java.lang.Class<?>... classes) throws DeploymentException + public void deploy(Iterable<Class<?>> classes) throws DeploymentException { - return deploy(null, classes); + deploy(null, classes, null); } + public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException + { + deploy(null, classes, beansXml); + } + } Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -23,7 +23,7 @@ * * @return the Manager */ - Manager getManager(); + public Manager getManager(); /** * Returns a list of the enabled deployment types for the current manager @@ -32,5 +32,4 @@ */ List<Class<? extends Annotation>> getEnabledDeploymentTypes(); - public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes); } Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,10 +1,9 @@ package org.jboss.jsr299.tck.spi; import java.lang.annotation.Annotation; +import java.net.URL; import java.util.List; -import javax.inject.manager.Manager; - import org.jboss.jsr299.tck.api.DeploymentException; /** @@ -42,7 +41,51 @@ * @param classes the classes to deploy * @return the manager created as a result of initializing the container */ - public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>...classes) throws DeploymentException; + @Deprecated + public void deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Iterable<Class<?>> classes) throws DeploymentException; - public Manager deploy(Class<?>...classes) throws DeploymentException; + /** + * <p>Bootstrap the container by registering Beans and Observers, raising + * @Initialized event, validating the deployment, and raising the + * @Deployed event.</p> + * + * <p>Any classes passed in should be fully deployed. This includes:</p> + * + * <ul> + * <li>Simple beans</li> + * <li>Session beans</li> + * <li>Producer methods and producer fields</li> + * <li>Observer methods</li> + * <li>support for Event and Instance injection points</li> + * </ul> + * + * The container should be in an fully initialized state when the + * method returns + * + * @param classes the classes to deploy + */ + public void deploy(Iterable<Class<?>> classes) throws DeploymentException; + + /** + * <p>Bootstrap the container by registering Beans and Observers, raising + * @Initialized event, validating the deployment, and raising the + * @Deployed event.</p> + * + * <p>Any classes passed in should be fully deployed. This includes:</p> + * + * <ul> + * <li>Simple beans</li> + * <li>Session beans</li> + * <li>Producer methods and producer fields</li> + * <li>Observer methods</li> + * <li>support for Event and Instance injection points</li> + * </ul> + * + * The container should be in an fully initialized state when the + * method returns + * + * @param classes the classes to deploy + * @param beansXmls the beans.xml files to deploy + */ + public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXmls) throws DeploymentException; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -2,6 +2,7 @@ import java.io.IOException; import java.lang.reflect.Method; +import java.util.Arrays; import java.util.Set; import org.apache.log4j.Logger; @@ -81,7 +82,7 @@ { if (isDeployToContainerNeeded()) { - getCurrentConfiguration().getContainers().deploy(artifact.getJar(), artifact.getDefaultName()); + getCurrentConfiguration().getContainers().deploy(artifact.getJarAsStream(), artifact.getDefaultName()); } else if (artifact != null) { @@ -89,11 +90,11 @@ Set<Class<?>> classes = artifact.getClasses(); if (getEnabledDeploymentTypes().size() > 0) { - getCurrentConfiguration().getStandaloneContainers().deploy(getEnabledDeploymentTypes(), classes.toArray(EMPTY_CLASS_ARRAY)); + getCurrentConfiguration().getStandaloneContainers().deploy(getEnabledDeploymentTypes(), classes); } else { - getCurrentConfiguration().getStandaloneContainers().deploy(classes.toArray(EMPTY_CLASS_ARRAY)); + getCurrentConfiguration().getStandaloneContainers().deploy(classes, Arrays.asList(artifact.getBeansXml().getSource())); } } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -110,7 +110,7 @@ { try { - getCurrentConfiguration().getStandaloneContainers().deploy(getEnabledDeploymentTypes(), classes); + getCurrentConfiguration().getStandaloneContainers().deploy(getEnabledDeploymentTypes(), Arrays.asList(classes)); } catch (DeploymentException e) { @@ -128,7 +128,7 @@ { try { - getCurrentConfiguration().getStandaloneContainers().deploy(classes); + getCurrentConfiguration().getStandaloneContainers().deploy(Arrays.asList(classes)); } catch (DeploymentException e) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -221,7 +221,7 @@ this.libraries = new HashSet<ResourceDescriptor>(); } - public InputStream getJar() throws IOException + public InputStream getJarAsStream() throws IOException { if (jar == null) { @@ -230,6 +230,15 @@ return jar; } + public URL getJar() throws IOException + { + InputStream is = getJarAsStream(); + File file = File.createTempFile(ArtifactDescriptor.class.getCanonicalName(), ".jar"); + file.deleteOnExit(); + copy(is, file); + return file.toURI().toURL(); + } + public File getExplodedJar() throws IOException { if (explodedJar == null) @@ -289,7 +298,7 @@ File file = new File(directory, fileName); file.createNewFile(); file.deleteOnExit(); - copy(resourceDescriptor.getSource(), file); + copy(resourceDescriptor.getSource().openStream(), file); } private static void copyClass(String className, File root) throws IOException @@ -325,7 +334,7 @@ File file = new File(outputDirectory, fileName + getExtension()); file.createNewFile(); OutputStream os = new BufferedOutputStream(new FileOutputStream(file)); - InputStream jar = getJar(); + InputStream jar = getJarAsStream(); Files.copy(jar, os); jar.close(); os.close(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -5,8 +5,6 @@ import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; @@ -140,9 +138,9 @@ { try { - this.extraLibraries.add(new ResourceDescriptor(file.getName(), new FileInputStream(file))); + this.extraLibraries.add(new ResourceDescriptor(file.getName(), file.toURI().toURL())); } - catch (FileNotFoundException e) + catch (IOException e) { log.warn("Unable to load extra library", e); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,23 +1,30 @@ package org.jboss.jsr299.tck.impl.packaging; -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResourceAsStream; +import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.net.URL; public class ResourceDescriptor { - private String name; - private InputStream source; - - public ResourceDescriptor(String name, URL source) throws IOException + private final String name; + private final URL source; + + public ResourceDescriptor(String name, InputStream source) throws IOException { - this(name, source.openStream()); + this.name = name; + File file = File.createTempFile(ResourceDescriptor.class.getName(), null); + file.deleteOnExit(); + copy(source, file); + this.source = file.toURI().toURL(); } - public ResourceDescriptor(String name, InputStream source) + public ResourceDescriptor(String name, URL source) { this.name = name; this.source = source; @@ -30,7 +37,7 @@ { throw new IllegalArgumentException("Unable to have a null resource"); } - this.source = loadResourceAsStream(source); + this.source = loadResource(source); if (this.source == null) { throw new IllegalArgumentException("Unable to load file for " + source); @@ -42,7 +49,7 @@ return name; } - public InputStream getSource() + public URL getSource() { return source; } @@ -73,4 +80,23 @@ return name + " (" + source.toString() + ")"; } + private static void copy(InputStream inputStream, File file) throws IOException + { + OutputStream os = new FileOutputStream(file); + try + { + byte[] buf = new byte[1024]; + int i = 0; + while ((i = inputStream.read(buf)) != -1) + { + os.write(buf, 0, i); + } + } + finally + { + os.close(); + } + + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/JSR299ArtifactDescriptor.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -11,6 +11,8 @@ public static final String BEANS_XML_DESTINATION = "META-INF/web-beans.xml"; public static final String STANDARD_BEANS_XML_FILE_NAME = "org/jboss/jsr299/tck/impl/packaging/jsr299/default/beans.xml"; + private final ResourceDescriptor beansXml; + public JSR299ArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName) { super(declaringClass); @@ -18,7 +20,8 @@ { beansXmlSourceFileName = STANDARD_BEANS_XML_FILE_NAME; } - getResources().add(new ResourceDescriptor(getBeansDestination(), beansXmlSourceFileName)); + this.beansXml = new ResourceDescriptor(getBeansDestination(), beansXmlSourceFileName); + getResources().add(beansXml); } public String getBeansDestination() @@ -26,4 +29,9 @@ return BEANS_XML_DESTINATION; } + public ResourceDescriptor getBeansXml() + { + return beansXml; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.impl.packaging.war; -import static org.jboss.jsr299.tck.impl.util.Reflections.loadResourceAsStream; +import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource; import java.io.File; -import java.io.InputStream; +import java.net.URL; import org.jboss.jsr299.tck.impl.packaging.ResourceDescriptor; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; @@ -20,10 +20,10 @@ public WarArtifactDescriptor(Class<?> declaringClass, String beansXmlSourceFileName) { super(declaringClass, beansXmlSourceFileName); - InputStream webXml = loadResourceAsStream(CUSTOM_WEB_XML_FILE_NAME); + URL webXml = loadResource(CUSTOM_WEB_XML_FILE_NAME); if (webXml == null) { - webXml = loadResourceAsStream(STANDARD_WEB_XML_FILE_NAME); + webXml = loadResource(STANDARD_WEB_XML_FILE_NAME); } getResources().add(new ResourceDescriptor(WEB_XML_DESTINATION, webXml)); } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,43 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.List; - -import javax.inject.Standard; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -public class CustomDeploymentTypeTest extends AbstractDeclarativeTest -{ - - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - return Arrays.asList(Standard.class, AnotherDeploymentType.class, - HornedAnimalDeploymentType.class); - } - - @SuppressWarnings("unchecked") - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "unknown"), - @SpecAssertion(section = "2.5.7", id = "unknown") - }) - public void testCustomDeploymentTypes() - { - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().size() == 3; - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -1,34 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.deployment; - -import javax.inject.Production; -import javax.inject.Standard; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractDeclarativeTest; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.testng.annotations.Test; - -/** - * - * Spec version: PRD2 - * - */ -//@Artifact(addCurrentPackage=false) -(a)Classes(DefaultDeploymentTypeTest.class) -public class DefaultDeploymentTypeTest extends AbstractDeclarativeTest -{ - - @Test - @SpecAssertions({ - @SpecAssertion(section = "2.5.6", id = "unknown"), - @SpecAssertion(section = "2.5.7", id = "unknown") - }) - public void testDefaultEnabledDeploymentTypes() - { - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().size() == 2; - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); - assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.definition.deployment.custom; + +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.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface AnotherDeploymentType +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java (from rev 1524, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -0,0 +1,36 @@ +package org.jboss.jsr299.tck.unit.definition.deployment.custom; + +import javax.inject.Standard; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +@BeansXml("beans.xml") +public class CustomDeploymentTypeTest extends AbstractDeclarativeTest +{ + + @SuppressWarnings("unchecked") + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.5.6", id = "unknown"), + @SpecAssertion(section = "2.5.7", id = "unknown") + }) + public void testCustomDeploymentTypes() + { + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().size() == 3; + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.definition.deployment.custom; + +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 HornedAnimalDeploymentType +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/HornedAnimalDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java (from rev 1524, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -0,0 +1,34 @@ +package org.jboss.jsr299.tck.unit.definition.deployment.defaultDeploymentType; + +import javax.inject.Production; +import javax.inject.Standard; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Classes; +import org.testng.annotations.Test; + +/** + * + * Spec version: PRD2 + * + */ +@Artifact +public class DefaultDeploymentTypeTest extends AbstractDeclarativeTest +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.5.6", id = "unknown"), + @SpecAssertion(section = "2.5.7", id = "unknown") + }) + public void testDefaultEnabledDeploymentTypes() + { + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().size() == 2; + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert getCurrentConfiguration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class); + } + +} Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml 2009-02-16 00:27:29 UTC (rev 1531) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment.custom"> + <Deploy> + <Standard /> + <test:AnotherDeploymentType /> + <test:HornedAnimalDeploymentType /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java 2009-02-15 23:00:58 UTC (rev 1530) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java 2009-02-16 00:27:29 UTC (rev 1531) @@ -75,7 +75,7 @@ { WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null); war.getClasses().add(Cow.class); - JarInputStream is = new JarInputStream(war.getJar()); + JarInputStream is = new JarInputStream(war.getJarAsStream()); JarEntry entry; List<String> fileNames = new ArrayList<String>(); while ((entry = is.getNextJarEntry()) != null)

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1530 - in tck/trunk/impl/src: test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 18:00:58 -0500 (Sun, 15 Feb 2009) New Revision: 1530 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java Log: Fix tck tests on windows Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-15 22:37:46 UTC (rev 1529) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-15 23:00:58 UTC (rev 1530) @@ -7,7 +7,6 @@ class AndalusianChicken implements LocalChicken { - @Override public void firstBusinessMethod() { } Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java 2009-02-15 22:37:46 UTC (rev 1529) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java 2009-02-15 23:00:58 UTC (rev 1530) @@ -29,7 +29,7 @@ List<String> fileNames = new ArrayList<String>(); while ((entry = is.getNextJarEntry()) != null) { - fileNames.add(entry.getName()); + fileNames.add(entry.getName().replace(File.separator, "/")); } assert fileNames.contains("org/jboss/jsr299/tck/impl/util/Reflections.class"); assert fileNames.contains("org/jboss/jsr299/tck/literals/NewLiteral.class"); Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java 2009-02-15 22:37:46 UTC (rev 1529) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java 2009-02-15 23:00:58 UTC (rev 1530) @@ -80,7 +80,7 @@ List<String> fileNames = new ArrayList<String>(); while ((entry = is.getNextJarEntry()) != null) { - fileNames.add(entry.getName()); + fileNames.add(entry.getName().replace(File.separator, "/")); } is.close(); assert fileNames.contains("WEB-INF/web-beans.xml");

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1529 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 17:37:46 -0500 (Sun, 15 Feb 2009) New Revision: 1529 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java Log: Allow an empty beans.xml Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java 2009-02-15 22:08:56 UTC (rev 1528) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java 2009-02-15 22:37:46 UTC (rev 1529) @@ -1,6 +1,7 @@ package org.jboss.webbeans.bootstrap; import java.io.IOException; +import java.io.InputStream; import java.lang.annotation.Annotation; import java.net.URL; import java.util.ArrayList; @@ -100,50 +101,64 @@ List<DeployElement> deployElements = new ArrayList<DeployElement>(); for (URL url : beansXml) { - Document document; + InputStream is; + boolean fileHasContents; try { - document = documentBuilder.parse(url.openStream()); - document.normalize(); + is = url.openStream(); + fileHasContents = is.available() > 0; } - catch (SAXException e) - { - throw new DeploymentException("Error parsing beans.xml " + url.toString()); - } catch (IOException e) { - throw new DeploymentException("Error loading beans.xml " + url.toString()); + throw new DeploymentException("Error loading beans.xml " + url.toString(), e); } - Element beans = document.getDocumentElement(); - Map<String, String> namespaces = new HashMap<String, String>(); - for (int i = 0; i < beans.getAttributes().getLength(); i++) + if (fileHasContents) { - Node child = beans.getAttributes().item(i); - if (child instanceof Attr) + Document document; + try { - Attr attr = (Attr) child; - if (attr.getName().startsWith("xmlns")) + document = documentBuilder.parse(is); + document.normalize(); + } + catch (SAXException e) + { + throw new DeploymentException("Error parsing beans.xml " + url.toString(), e); + } + catch (IOException e) + { + throw new DeploymentException("Error loading beans.xml " + url.toString(), e); + } + Element beans = document.getDocumentElement(); + Map<String, String> namespaces = new HashMap<String, String>(); + for (int i = 0; i < beans.getAttributes().getLength(); i++) + { + Node child = beans.getAttributes().item(i); + if (child instanceof Attr) { - String namespacePrefix; - if (attr.getName().length() == 5) + Attr attr = (Attr) child; + if (attr.getName().startsWith("xmlns")) { - namespacePrefix = ""; + String namespacePrefix; + if (attr.getName().length() == 5) + { + namespacePrefix = ""; + } + else + { + namespacePrefix = attr.getName().substring(6); + } + + String namespace = attr.getValue(); + namespaces.put(namespacePrefix, namespace); } - else - { - namespacePrefix = attr.getName().substring(6); - } - - String namespace = attr.getValue(); - namespaces.put(namespacePrefix, namespace); } } - } - for (Node child : new NodeListIterable(beans.getChildNodes())) - { - if (child instanceof Element && "Deploy".equals(child.getNodeName())) + for (Node child : new NodeListIterable(beans.getChildNodes())) { - deployElements.add(new DeployElement(url, (Element) child, namespaces)); + if (child instanceof Element && "Deploy".equals(child.getNodeName())) + { + deployElements.add(new DeployElement(url, (Element) child, namespaces)); + } } } }

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1528 - in ri/trunk: jboss-as and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 17:08:56 -0500 (Sun, 15 Feb 2009) New Revision: 1528 Modified: ri/trunk/jboss-as/build.xml ri/trunk/pom.xml Log: minor Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-02-15 17:09:33 UTC (rev 1527) +++ ri/trunk/jboss-as/build.xml 2009-02-15 22:08:56 UTC (rev 1528) @@ -24,6 +24,7 @@ <artifact:dependencies filesetId="webbeans.deployer.fileset" versionsId="webbeans.deployer.versions"> <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-deployer" version="${webbeans-ri-int.version}" type="zip"/> + <dependency groupId="org.jboss.webbeans" artifactId="webbeans-ri" version="${webbeans-ri.version}" /> <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" /> </artifact:dependencies> @@ -44,6 +45,12 @@ <include name="**/*" /> </fileset> </copy> + + <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int/" overwrite="true"> + <fileset dir="target"> + <include name="webbeans-ri.jar" /> + </fileset> + </copy> </target> Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-02-15 17:09:33 UTC (rev 1527) +++ ri/trunk/pom.xml 2009-02-15 22:08:56 UTC (rev 1528) @@ -415,6 +415,11 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-1</version> + </plugin> </plugins> </pluginManagement> </build>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1527 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/producer/method and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-02-15 12:09:33 -0500 (Sun, 15 Feb 2009) New Revision: 1527 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Split most of the "or" conditioned assertions into separate tests. Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java 2009-02-15 17:09:33 UTC (rev 1527) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer; + +import javax.ejb.Stateless; +import javax.inject.Initializer; + +@Stateless +class AndalusianChicken implements LocalChicken +{ + + @Override + public void firstBusinessMethod() + { + } + + @Initializer + public void nonBusinessMethod() + { + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/AndalusianChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-15 16:57:27 UTC (rev 1526) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-15 17:09:33 UTC (rev 1527) @@ -15,134 +15,126 @@ */ public class InitializerMethodTest extends AbstractDeclarativeTest { - - @Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") - @SpecAssertion(section="3.8", id = "unknown") + + @Test(expectedExceptions = DefinitionException.class, groups = "initializerMethod") + @SpecAssertion(section = "3.8", id = "unknown") public void testStaticInitializerMethodNotAllowed() { createSimpleBean(Dottrel.class); } - - @Test(groups={"stub", "initializerMethod", "servlet"}) - @SpecAssertion(section="3.9", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "servlet" }) + @SpecAssertion(section = "3.9", id = "unknown") public void testInitializerMethodCalledOnServlet() { assert false; } - - @Test(groups={"stub", "initializerMethod", "ejb3"}) - @SpecAssertion(section="3.9", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "ejb3", "integration" }) + @SpecAssertion(section = "3.9", id = "unknown") public void testInitializerMethodCalledOnEJBSessionBean() { assert false; } - - @Test(groups={"stub", "initializerMethod", "ejb3"}) - @SpecAssertion(section="3.9", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "ejb3" }) + @SpecAssertion(section = "3.9", id = "unknown") public void testInitializerMethodCalledOnEJBMDB() { assert false; } - - @Test(groups={"stub", "initializerMethod", "ejb3", "singletons"}) - @SpecAssertion(section="3.9", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "ejb3", "singletons" }) + @SpecAssertion(section = "3.9", id = "unknown") public void testInitializerMethodCalledOnEJBSingleton() { assert false; } - - @Test(groups={"stub", "initializerMethod", "ejb3"}) - @SpecAssertion(section="3.9", id = "unknown") + + /** + * If the bean is a session bean, the initializer method is not required to + * be a business method of the session bean + */ + @Test(groups = { "stub", "initializerMethod", "ejb3" }) + @SpecAssertion(section = "3.9", id = "c") public void testInitializerMethodNotABusinessMethod() { - assert false; + deployBeans(LocalChicken.class, AndalusianChicken.class); } - - @Test(groups={"stub", "initializerMethod", "interceptors"}) - @SpecAssertion(section="3.9", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "interceptors" }) + @SpecAssertion(section = "3.9", id = "unknown") public void testMethodInterceptorNotCalledOnInitializerMethod() { assert false; } - - @Test(groups={"initializerMethod"}) - @SpecAssertions({ - @SpecAssertion(section = "3.9", id = "unknown"), - @SpecAssertion(section = "5.3", id = "unknown"), - @SpecAssertion(section = "3.9.2", id = "unknown"), - @SpecAssertion(section = "3.9.3", id = "unknown") - }) + + @Test(groups = { "initializerMethod" }) + @SpecAssertions( { @SpecAssertion(section = "3.9", id = "unknown"), @SpecAssertion(section = "5.3", id = "unknown"), @SpecAssertion(section = "3.9.2", id = "unknown"), @SpecAssertion(section = "3.9.3", id = "unknown") }) public void testMultipleInitializerMethodsAreCalled() { getCurrentManager().addBean(createSimpleBean(Fox.class)); getCurrentManager().addBean(createSimpleBean(Chicken.class)); - + Bean<ChickenHutch> chickenHutchBean = createSimpleBean(ChickenHutch.class); ChickenHutch chickenHutch = chickenHutchBean.create(new MockCreationalContext<ChickenHutch>()); assert chickenHutch.fox != null; assert chickenHutch.chicken != null; } - - @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertions({ - @SpecAssertion(section = "3.9.1", id = "unknown"), - @SpecAssertion(section = "3.4.2", id = "unknown") - }) + + @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertions( { @SpecAssertion(section = "3.9.1", id = "unknown"), @SpecAssertion(section = "3.4.2", id = "unknown") }) public void testInitializerMethodAnnotatedProduces() { createSimpleBean(Pheasant.class); } - - @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.9.1", id = "unknown") + + @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.9.1", id = "unknown") public void testInitializerMethodHasParameterAnnotatedDisposes() { createSimpleBean(Capercaillie.class); } - - @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.9.1", id = "unknown") + + @Test(groups = "initializerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.9.1", id = "unknown") public void testInitializerMethodHasParameterAnnotatedObserves() { createSimpleBean(Grouse.class); } - - @Test(groups={"stub", "initializerMethod", "webbeansxml"}) - @SpecAssertion(section="3.9.2", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9.2", id = "unknown") public void testInitializerMethodDeclaredInXml() { assert false; } - - @Test(groups={"stub", "initializerMethod", "webbeansxml"}) - @SpecAssertion(section="3.9.2", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9.2", id = "unknown") public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava() { assert false; } - - @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.9.2", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.9.2", id = "unknown") public void testInitializerMethodDeclaredInXmlDoesNotExist() { assert false; } - - @Test(groups={"stub", "initializerMethod", "webbeansxml"}) - @SpecAssertion(section="3.9.2", id = "unknown") + + @Test(groups = { "stub", "initializerMethod", "webbeansxml" }) + @SpecAssertion(section = "3.9.2", id = "unknown") public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml() { assert false; } - - /* - @Test(groups="initializerMethod") @SpecAssertion(section="3.8") - public void test - { - assert false; - } - + /* + * + * @Test(groups="initializerMethod") @SpecAssertion(section="3.8") public + * void test { assert false; } */ - + } \ No newline at end of file Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java 2009-02-15 17:09:33 UTC (rev 1527) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.implementation.initializer; + +import javax.ejb.Local; + +@Local +public interface LocalChicken +{ + public void firstBusinessMethod(); +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/LocalChicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-15 16:57:27 UTC (rev 1526) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-15 17:09:33 UTC (rev 1527) @@ -16,13 +16,13 @@ /** * * Spec version: PRD2 - * + * */ public class ProducerMethodDefinitionTest extends AbstractDeclarativeTest { - - @Test(groups="producerMethod") - @SpecAssertion(section="2.5.3", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "2.5.3", id = "unknown") public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -31,9 +31,9 @@ Bean<Tarantula> tarantulaModel = createProducerMethodBean(method, bean); tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "unknown") public void testStaticMethod() throws Exception { Bean<BeanWithStaticProducerMethod> bean = createSimpleBean(BeanWithStaticProducerMethod.class); @@ -41,16 +41,16 @@ Method method = BeanWithStaticProducerMethod.class.getMethod("getString"); createProducerMethodBean(method, bean); } - - @Test(groups={"stub", "producerMethod", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = { "stub", "producerMethod", "enterpriseBeans" }, expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.4", id = "unknown") public void testProducerMethodIsNotBusinessMethod() throws Exception { assert false; } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4", id = "unknown") public void testParameterizedReturnType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -58,9 +58,9 @@ Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider"); createProducerMethodBean(method, bean); } - - @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.4", id = "unknown") public void testParameterizedReturnTypeWithWildcard() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -68,9 +68,9 @@ Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver"); createProducerMethodBean(method, bean); } - - @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.4", id = "unknown") public void testParameterizedReturnTypeWithTypeParameter() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -78,12 +78,9 @@ Method method = SpiderProducer.class.getMethod("getFunnelWeaver"); createProducerMethodBean(method, bean); } - - @Test(groups="producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4", id = "unknown"), - @SpecAssertion(section = "2.3.1", id = "unknown") - }) + + @Test(groups = "producerMethod") + @SpecAssertions( { @SpecAssertion(section = "3.4", id = "unknown"), @SpecAssertion(section = "2.3.1", id = "unknown") }) public void testDefaultBindingType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -93,9 +90,9 @@ assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.1", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.1", id = "unknown") public void testApiTypeForClassReturn() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -110,9 +107,9 @@ assert tarantulaModel.getTypes().contains(DeadlyAnimal.class); assert tarantulaModel.getTypes().contains(Object.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.1", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.1", id = "unknown") public void testApiTypeForInterfaceReturn() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -123,9 +120,9 @@ assert animalModel.getTypes().contains(Animal.class); assert animalModel.getTypes().contains(Object.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.1", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.1", id = "unknown") public void testApiTypeForPrimitiveReturn() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -136,12 +133,9 @@ assert intModel.getTypes().contains(int.class); assert intModel.getTypes().contains(Object.class); } - - @Test(groups="producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "3.4.1", id = "unknown"), - @SpecAssertion(section = "2.2", id = "unknown") - }) + + @Test(groups = "producerMethod") + @SpecAssertions( { @SpecAssertion(section = "3.4.1", id = "unknown"), @SpecAssertion(section = "2.2", id = "unknown") }) public void testApiTypeForArrayTypeReturn() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -152,9 +146,9 @@ assert spidersModel.getTypes().contains(Spider[].class); assert spidersModel.getTypes().contains(Object.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.2", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "unknown") public void testBindingType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -164,9 +158,9 @@ assert tarantulaModel.getBindings().size() == 1; assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.2", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "unknown") public void testScopeType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -174,12 +168,12 @@ Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); Bean<DaddyLongLegs> daddyLongLegsModel = createProducerMethodBean(method, bean); assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); - + // TODO Inherit scope from returned web bean? } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.2", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "unknown") public void testDeploymentType() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -188,9 +182,9 @@ Bean<LadybirdSpider> ladybirdSpiderModel = createProducerMethodBean(method, bean); assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.2", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "unknown") public void testNamedMethod() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -199,9 +193,9 @@ Bean<BlackWidow> blackWidowSpiderModel = createProducerMethodBean(method, bean); assert blackWidowSpiderModel.getName().equals("blackWidow"); } - - @Test(groups="producerMethod") - @SpecAssertion(section="3.4.2", id = "unknown") + + @Test(groups = "producerMethod") + @SpecAssertion(section = "3.4.2", id = "unknown") public void testDefaultNamedMethod() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); @@ -210,9 +204,9 @@ Bean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerMethodBean(method, bean); assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); } - - @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.4", id = "unknown") public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception { Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); @@ -220,9 +214,9 @@ Method method = SpiderProducer_Broken.class.getMethod("dispose", String.class); createProducerMethodBean(method, bean); } - - @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="3.4", id = "unknown") + + @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertion(section = "3.4", id = "unknown") public void testProducerMethodWithParameterAnnotatedObserves() throws Exception { Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); @@ -230,30 +224,24 @@ Method method = SpiderProducer_Broken.class.getMethod("observe", String.class); createProducerMethodBean(method, bean); } - - @Test(groups="producerMethod") - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "unknown"), - @SpecAssertion(section = "3.4.2", id = "unknown"), - @SpecAssertion(section = "2.2", id = "unknown") - }) + + @Test(groups = "producerMethod") + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "unknown"), @SpecAssertion(section = "3.4.2", id = "unknown"), @SpecAssertion(section = "2.2", id = "unknown") }) public void testStereotypeSpecifiesScope() throws Exception { Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class); getCurrentManager().addBean(bean); Method method = SpiderProducer.class.getMethod("produceWolfSpider"); Bean<WolfSpider> wolfSpider = createProducerMethodBean(method, bean); - //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1; - //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); + // assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() + // == 1; + // assert + // wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); assert wolfSpider.getScopeType().equals(RequestScoped.class); } - - @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) - @SpecAssertions({ - @SpecAssertion(section = "2.7.2", id = "unknown"), - @SpecAssertion(section = "3.4.2", id = "unknown"), - @SpecAssertion(section = "2.2", id = "unknown") - }) + + @Test(groups = "producerMethod", expectedExceptions = DefinitionException.class) + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "unknown"), @SpecAssertion(section = "3.4.2", id = "unknown"), @SpecAssertion(section = "2.2", id = "unknown") }) public void testStereotypeEnforcesTypes() throws Exception { Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class); @@ -261,13 +249,13 @@ Method method = SpiderProducer_Broken.class.getMethod("produceInteger"); createProducerMethodBean(method, bean); } - - @Test - @SpecAssertion(section="4.2", id = "unknown") + + @Test + @SpecAssertion(section = "4.2", id = "unknown") public void testNonStaticProducerMethodNotInherited() { deployBeans(InfertileChicken.class); assert getCurrentManager().resolveByType(Egg.class).size() == 0; } - + } Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-15 16:57:27 UTC (rev 1526) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-15 17:09:33 UTC (rev 1527) @@ -1,7 +1,5 @@ <specification xmlns="http://jboss.com/products/webbeans/tck/audit" - name="JSR-299: Java Contexts and Dependency Injection" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/webbeans/tck/audit http://snapshots.jboss.org/maven2/org/hibernate/tck-utils-api/0.9-SNAPSHO..." + name="JSR-299: Java Contexts and Dependency Injection" version="Revised Public Review Draft"> <section id="2" title="Bean definition"> @@ -46,42 +44,46 @@ </assertion> <assertion id="c"> - <text>Bean types may not declare a type variable or wildcard. If the type of an injection point is a parameterized type with a type variable or wildcard, a DefinitionException is thrown by the container at deployment time.</text> + <text>Bean types may not declare a type variable. If the type of an injection point is a parameterized type with a type variable, a DefinitionException is thrown by the container at deployment time.</text> </assertion> <assertion id="d"> + <text>Bean types may not declare a wildcard. If the type of an injection point is a parameterized type with a wildcard, a DefinitionException is thrown by the container at deployment time.</text> + </assertion> + + <assertion id="e"> <text>A bean type may be an interface</text> </assertion> - <assertion id="e"> + <assertion id="f"> <text>A bean type may be a concrete class</text> </assertion> - <assertion id="f"> + <assertion id="g"> <text>A bean type may be an abstract class</text> </assertion> - <assertion id="g"> + <assertion id="h"> <text>A bean type may be declared final</text> </assertion> - <assertion id="h"> + <assertion id="i"> <text>A bean type may have final methods</text> </assertion> - <assertion id="i"> + <assertion id="j"> <text>A bean type may be an array type. Two array types are considered identical only if the element type is identical</text> </assertion> - <assertion id="j"> + <assertion id="k"> <text>A bean type may be a primitive types. Primitive types are considered to be identical to their corresponding wrapper types in java.lang.</text> </assertion> - <assertion id="k"> + <assertion id="l"> <text>All beans have the bean type java.lang.Object</text> </assertion> - <assertion id="l"> + <assertion id="m"> <text>A client of a bean may typecast its reference to any instance of the bean to any bean type of the bean</text> </assertion> @@ -119,10 +121,18 @@ <section id="2.3.3" title="Declaring the bindings of a bean using annotations"> <assertion id="a"> - <text>A bean's bindings are declared by annotating the bean class or producer method or field with the binding types</text> + <text>A bean's bindings are declared by annotating the bean class with the binding types</text> </assertion> <assertion id="b"> + <text>A bean's bindings are declared by annotating the producer method with the binding types</text> + </assertion> + + <assertion id="c"> + <text>A bean's bindings are declared by annotating the field with the binding types</text> + </assertion> + + <assertion id="d"> <text>Any bean may declare multiple binding types</text> </assertion> </section> @@ -156,14 +166,26 @@ <section id="2.3.6" title="Specifying bindings of a method or constructor parameter"> <assertion id="a"> - <text>Binding types may be applied to parameters of producer methods, initializer methods, disposal methods or bean constructors (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container</text> + <text>Binding types may be applied to parameters of producer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container</text> </assertion> <assertion id="b"> + <text>Binding types may be applied to parameters of initializer methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container</text> + </assertion> + + <assertion id="c"> + <text>Binding types may be applied to parameters of disposal methods (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container</text> + </assertion> + + <assertion id="d"> + <text>Binding types may be applied to parameters of bean constructors (see Chapter 3, Bean implementation) to determine the bean instance that is passed when the method is called by the container</text> + </assertion> + + <assertion id="e"> <text>For a bean defined in XML, the bindings of a method parameter may be specified using XML</text> </assertion> - <assertion id="c"> + <assertion id="f"> <text>When the bindings of a parameter are specified using XML, any binding annotations of the parameter are ignored</text> </assertion> </section> @@ -223,18 +245,38 @@ <section id="2.5.3" title="Declaring the deployment type of a bean using annotations"> <assertion id="a"> - <text>The deployment type of the bean is declared by annotating the bean class or producer method or field</text> + <text>The deployment type of the bean is declared by annotating the bean class</text> </assertion> <assertion id="b"> - <text>An bean class or producer method or field may specify at most one deployment type. If multiple deployment type annotations are specified, a DefinitionException is thrown by the container at deployment time.</text> + <text>The deployment type of the bean is declared by annotating the producer method</text> </assertion> <assertion id="c"> - <text>By default, if no deployment type annotation is explicitly specified, a producer method or field inherits the deployment type of the bean in which it is defined.</text> + <text>The deployment type of the bean is declared by annotating the field</text> </assertion> <assertion id="d"> + <text>An bean class may specify at most one deployment type. If multiple deployment type annotations are specified, a DefinitionException is thrown by the container at deployment time.</text> + </assertion> + + <assertion id="e"> + <text>A producer method may specify at most one deployment type. If multiple deployment type annotations are specified, a DefinitionException is thrown by the container at deployment time.</text> + </assertion> + + <assertion id="f"> + <text>A field may specify at most one deployment type. If multiple deployment type annotations are specified, a DefinitionException is thrown by the container at deployment time.</text> + </assertion> + + <assertion id="g"> + <text>By default, if no deployment type annotation is explicitly specified, a producer method inherits the deployment type of the bean in which it is defined.</text> + </assertion> + + <assertion id="h"> + <text>By default, if no deployment type annotation is explicitly specified, a field inherits the deployment type of the bean in which it is defined.</text> + </assertion> + + <assertion id="i"> <text>a deployment type may be specified using a stereotype annotation, as defined in Section 2.7.2, "Declaring the stereotypes for a bean using annotations".</text> </assertion> @@ -289,10 +331,18 @@ <section id="2.6.1" title="Declaring the bean name using annotations"> <assertion id="a"> - <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the bean class or producer method or field.</text> + <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the bean class.</text> </assertion> <assertion id="b"> + <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the producer method.</text> + </assertion> + + <assertion id="c"> + <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the field.</text> + </assertion> + + <assertion id="d"> <text>If the @Named annotation does not specify the value member, the default name is assumed</text> </assertion> </section> @@ -311,14 +361,22 @@ <section id="2.6.3" title="Default bean names"> <assertion id="a"> - <text>A default name must be assigned by the container when a bean class or producer method or field of a bean defined using annotations declares a @Named annotation and no name is explicitly specified by the value member</text> + <text>A default name must be assigned by the container when a bean class defined using annotations declares a @Named annotation and no name is explicitly specified by the value member</text> </assertion> <assertion id="b"> + <text>A default name must be assigned by the container when a producer method of a bean defined using annotations declares a @Named annotation and no name is explicitly specified by the value member</text> + </assertion> + + <assertion id="c"> + <text>A default name must be assigned by the container when a field of a bean defined using annotations declares a @Named annotation and no name is explicitly specified by the value member</text> + </assertion> + + <assertion id="d"> <text>A default name must be assigned by the container when an empty <Named> element is specified by a bean defined in XML</text> </assertion> - <assertion id="c"> + <assertion id="e"> <text>A default name must be assigned by the container when a bean declares a stereotype that declares an empty @Named annotation, and the bean does not explicitly specify a name.</text> </assertion> </section> @@ -337,9 +395,17 @@ </assertion> <assertion id="b"> - <text>A bean may declare zero, one or multiple stereotypes</text> + <text>A bean may declare zero stereotypes</text> </assertion> + <assertion id="c"> + <text>A bean may declare one stereotype</text> + </assertion> + + <assertion id="d"> + <text>A bean may declare multiple stereotypes</text> + </assertion> + </section> <section id="3" title="Bean Implementation"> @@ -358,22 +424,26 @@ <section id="3.2" title="Simple beans"> <assertion id="a"> - <text>The bean class of a simple bean may not be a non-static inner class or a parameterized type</text> + <text>The bean class of a simple bean may not be a non-static inner class</text> </assertion> <assertion id="b"> + <text>The bean class of a simple bean may not be a parameterized type</text> + </assertion> + + <assertion id="c"> <text>The bean class of a simple bean may not be an abstract class, unless the simple bean is a decorator</text> </assertion> - <assertion id="c"> + <assertion id="d"> <text>If the bean class of a simple bean is annotated with both the @Interceptor and @Decorator stereotypes, a DefinitionException is thrown by the container at deployment time.</text> </assertion> - <assertion id="d"> + <assertion id="e"> <text>Multiple simple beans may share the same bean class. This occurs when beans are defined using XML. Only one simple bean per bean class may be defined using annotations.</text> </assertion> - <assertion id="e"> + <assertion id="f"> <text>If a simple bean has a public field, it must have scope @Dependent. If a simple bean with a public field declares any scope other than @Dependent, a DefinitionException is thrown by the container at deployment time.</text> </assertion> @@ -387,45 +457,51 @@ <text>A top-level Java class is not a simple bean if it is a non-static inner class</text> </assertion> <assertion id="c"> - <text>A top-level Java class is only a simple bean if it is a concrete class, or annotated @Decorator.</text> + <text>A top-level Java class is only a simple bean if it is a concrete class.</text> </assertion> <assertion id="d"> - <text>A top-level Java class is not a simple bean if it is annotated with the JPA @Entity annotation</text> + <text>A top-level Java class is only a simple bean if it is annotated @Decorator.</text> </assertion> <assertion id="e"> - <text>A top-level Java class is not a simple bean if it is annotated with any of the EJB component-defining annotations</text> + <text>A top-level Java class is not a simple bean if it is annotated with the JPA @Entity annotation</text> </assertion> <assertion id="f"> - <text>A top-level Java class is not a simple bean if it implements the javax.servlet.Servlet interface</text> + <text>A top-level Java class is not a simple bean if it is annotated with any of the EJB component-defining annotations</text> </assertion> <assertion id="g"> - <text>A top-level Java class is not a simple bean if it implements the javax.servlet.Filter interface</text> + <text>A top-level Java class is not a simple bean if it implements the javax.servlet.Servlet interface</text> </assertion> <assertion id="h"> - <text>A top-level Java class is not a simple bean if it implements the javax.servlet.ServletContextListener interface</text> + <text>A top-level Java class is not a simple bean if it implements the javax.servlet.Filter interface</text> </assertion> <assertion id="i"> - <text>A top-level Java class is not a simple bean if it implements the javax.servlet.http.HttpSessionListener interface</text> + <text>A top-level Java class is not a simple bean if it implements the javax.servlet.ServletContextListener interface</text> </assertion> <assertion id="j"> - <text>A top-level Java class is not a simple bean if it implements the javax.servlet.ServletRequestListener interface</text> + <text>A top-level Java class is not a simple bean if it implements the javax.servlet.http.HttpSessionListener interface</text> </assertion> <assertion id="k"> - <text>A top-level Java class is not a simple bean if it implements the javax.ejb.EnterpriseBean interface</text> + <text>A top-level Java class is not a simple bean if it implements the javax.servlet.ServletRequestListener interface</text> </assertion> <assertion id="l"> - <text>A top-level Java class is not a simple bean if it extends javax.faces.component.UIComponent</text> + <text>A top-level Java class is not a simple bean if it implements the javax.ejb.EnterpriseBean interface</text> </assertion> <assertion id="m"> - <text>A top-level Java class is not a simple bean if it is declared as an EJB bean class in ejb-jar.xml</text> + <text>A top-level Java class is not a simple bean if it extends javax.faces.component.UIComponent</text> </assertion> <assertion id="n"> - <text>A top-level Java class is not a simple bean if it is declared as a JPA entity in orm.xml</text> + <text>A top-level Java class is not a simple bean if it is declared as an EJB bean class in ejb-jar.xml</text> </assertion> <assertion id="o"> - <text>A top-level Java class is only a simple bean if it has an appropriate constructor - either a constructor with no parameters, or declares a constructor annotated @Initializer</text> + <text>A top-level Java class is not a simple bean if it is declared as a JPA entity in orm.xml</text> </assertion> <assertion id="p"> + <text>A top-level Java class is only a simple bean if it has an appropriate constructor - a constructor with no parameters</text> + </assertion> + <assertion id="q"> + <text>A top-level Java class is only a simple bean if it has an appropriate constructor - a constructor annotated @Initializer</text> + </assertion> + <assertion id="r"> <text>Additional simple beans with the same bean class may be defined using XML, by specifying the class in beans.xml.</text> </assertion> @@ -461,20 +537,24 @@ </assertion> <assertion id="c"> - <text>If the bean class of a simple bean defined in XML is a parameterized type or a non-static inner class, a DefinitionException is thrown by the container at deployment time.</text> + <text>If the bean class of a simple bean defined in XML is a parameterized type , a DefinitionException is thrown by the container at deployment time.</text> </assertion> <assertion id="d"> + <text>If the bean class of a simple bean defined in XML is a non-static inner class, a DefinitionException is thrown by the container at deployment time.</text> + </assertion> + + <assertion id="e"> <text>If the bean class of a simple bean defined in XML is an abstract class, and the simple bean is not a decorator, a DefinitionException is thrown by the container at deployment time</text> </assertion> - <assertion id="e"> + <assertion id="f"> <text>If the bean class of a simple bean defined in XML is annotated @Interceptor, then the bean must be explicitly declared as an interceptor in XML, as defined in Section A.3.5.2, "Declaring an interceptor using XML". If a simple bean defined in XML has a bean class annotated @Interceptor and is not declared as an interceptor in XML, a DefinitionException is thrown by the container at deployment time.</text> </assertion> - <assertion id="f"> + <assertion id="g"> <text>If the bean class of a simple bean defined in XML is annotated @Interceptor, then the bean must be explicitly declared as an interceptor in XML, as defined in Section A.3.5.2, "Declaring an interceptor using XML". If a simple bean defined in XML has a bean class annotated @Interceptor and is not declared as an interceptor in XML, a DefinitionException is thrown by the container at deployment time.</text> </assertion> @@ -542,9 +622,13 @@ </assertion> <assertion id="d"> - <text>If a bean constructor has a parameter annotated @Disposes, or @Observes, a DefinitionException is thrown by the container at deployment time</text> + <text>If a bean constructor has a parameter annotated @Disposes, a DefinitionException is thrown by the container at deployment time</text> </assertion> + <assertion id="e"> + <text>If a bean constructor has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + </section> <section id="3.2.6.2" title="Declaring a bean constructor using XML"> @@ -579,21 +663,21 @@ </assertion> <assertion id="b"> - <text>We say that X directly specializes Y, and we can be certain that Y will never be instantiated or called by the container if X is enabled.</text> + <text>We say that X directly specializes Y, and we can be certain that Y will never be instantiated by the container if X is enabled.</text> <note>This assertion relates to specialized beans declared using annotations</note> </assertion> <assertion id="c"> - <text>If the bean class of X does not directly extend the bean class of another simple bean, a DefinitionException is thrown by the container at deployment time.</text> + <text>We say that X directly specializes Y, and we can be certain that Y will never be called by the container if X is enabled.</text> + <note>This assertion relates to specialized beans declared using annotations</note> </assertion> <assertion id="d"> - <text>If a simple bean X defined in XML declares the <Specializes> element, then the bean class of X must be the bean class of another simple bean Y defined using annotations. Then X inherits all bindings of Y, and if Y has a name, X has the same name as Y</text> + <text>If the bean class of X does not directly extend the bean class of another simple bean, a DefinitionException is thrown by the container at deployment time.</text> </assertion> <assertion id="e"> - <text>We say that X directly specializes Y, and we can be certain that Y will never be instantiated or called by the container if X is enabled</text> - <note>This assertion relates to specialized beans declared in XML</note> + <text>If a simple bean X defined in XML declares the <Specializes> element, then the bean class of X must be the bean class of another simple bean Y defined using annotations. Then X inherits all bindings of Y, and if Y has a name, X has the same name as Y</text> </assertion> </section> @@ -625,8 +709,12 @@ </assertion> <assertion id="f"> - <text>If the bean class of a session bean is annotated @Interceptor or @Decorator, a DefinitionException is thrown by the container at deployment time</text> + <text>If the bean class of a session bean is annotated @Interceptor, a DefinitionException is thrown by the container at deployment time</text> </assertion> + + <assertion id="g"> + <text>If the bean class of a session bean is annotated @Decorator, a DefinitionException is thrown by the container at deployment time</text> + </assertion> </section> <section id="3.3.1" title="EJB remove methods of session beans"> @@ -702,8 +790,12 @@ </assertion> <assertion id="c"> - <text>If an entity or message-driven bean class is declared in XML, a DefinitionException is thrown by the container at deployment time</text> + <text>If an entity bean class is declared in XML, a DefinitionException is thrown by the container at deployment time</text> </assertion> + + <assertion id="d"> + <text>If a message-driven bean class is declared in XML, a DefinitionException is thrown by the container at deployment time</text> + </assertion> </section> <section id="3.3.6" title="Session beans with the @New binding"> @@ -763,14 +855,18 @@ </assertion> <assertion id="b"> - <text>We say that X directly specializes Y, and we can be certain that Y will never be instantiated or called by the container if X is enabled</text> + <text>We say that X directly specializes Y, and we can be certain that Y will never be instantiated by the container if X is enabled</text> </assertion> <assertion id="c"> + <text>We say that X directly specializes Y, and we can be certain that Y will never be called by the container if X is enabled</text> + </assertion> + + <assertion id="d"> <text>If the bean class of X does not directly extend the bean class of another session bean, a DefinitionException is thrown by the container at deployment time</text> </assertion> - <assertion id="d"> + <assertion id="e"> <text>If a session bean X defined in XML declares the <Specializes> element, then the bean class of X must be the bean class of another session bean Y defined using annotations. Then X inherits all bindings of Y, and if Y has a name, X has the same name as Y.</text> </assertion> </section> @@ -797,34 +893,42 @@ </assertion> <assertion id="b"> - <text>A producer method may be either static or non-static</text> + <text>A producer method may be static</text> </assertion> <assertion id="c"> - <text>If the bean is a session bean, the producer method must be either a business method of the EJB or a static method of the bean class</text> + <text>A producer method may be non-static</text> </assertion> <assertion id="d"> - <text>If a producer method sometimes returns a null value, then the producer method must have scope @Dependent</text> + <text>If the bean is a session bean, the producer method must be either a business method of the EJB or a static method of the bean class</text> </assertion> <assertion id="e"> - <text>If a producer method returns a null value at runtime, and the producer method declares any other scope, an IllegalProductException is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.4, "Client proxies".</text> + <text>If a producer method sometimes returns a null value, then the producer method must have scope @Dependent</text> </assertion> <assertion id="f"> - <text>If the producer method return type is a parameterized type, it must specify actual type parameters for each type parameter</text> + <text>If a producer method returns a null value at runtime, and the producer method declares any other scope, an IllegalProductException is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.4, "Client proxies".</text> </assertion> <assertion id="g"> - <text>If a producer method return type contains a wildcard type parameter or type variable, a DefinitionException is thrown by the container at deployment time</text> + <text>If the producer method return type is a parameterized type, it must specify actual type parameters for each type parameter</text> </assertion> <assertion id="h"> + <text>If a producer method return type contains a wildcard type parameter, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="i"> + <text>If a producer method return type contains a type variable, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="j"> <text>The application may call producer methods directly. However, if the application calls a producer method directly, no parameters will be passed to the producer method by the container; the returned object is not bound to any context; and its lifecycle is not managed by the container</text> </assertion> - <assertion id="i"> + <assertion id="k"> <text>A bean may declare multiple producer methods</text> </assertion> </section> @@ -855,10 +959,18 @@ </assertion> <assertion id="c"> - <text>If a producer method is annotated @Initializer, has a parameter annotated @Disposes, or has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text> + <text>If a producer method is annotated @Initializer, a DefinitionException is thrown by the container at deployment time</text> </assertion> <assertion id="d"> + <text>If a producer method has a parameter annotated @Disposes, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="e"> + <text>If a producer method has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="f"> <text>If a non-static method of a session bean class is annotated @Produces, and the method is not a business method of the EJB, a DefinitionException is thrown by the container at deployment time</text> </assertion> </section> @@ -891,8 +1003,12 @@ </assertion> <assertion id="b"> - <text>If the method is static or does not directly override another producer method, a DefinitionException is thrown by the container at deployment time</text> + <text>If the method is static, a DefinitionException is thrown by the container at deployment time</text> </assertion> + + <assertion id="c"> + <text>If the method does not directly override another producer method, a DefinitionException is thrown by the container at deployment time</text> + </assertion> </section> <section id="3.4.6" title="Disposal methods"> @@ -902,14 +1018,18 @@ </assertion> <assertion id="b"> - <text>A disposal method may be either static or non-static</text> + <text>A disposal method may be static</text> </assertion> <assertion id="c"> + <text>A disposal method may be non-static</text> + </assertion> + + <assertion id="d"> <text>If the bean is a session bean, the disposal method must be a business method of the EJB or a static method of the bean class</text> </assertion> - <assertion id="d"> + <assertion id="e"> <text>A bean may declare multiple disposal methods</text> </assertion> </section> @@ -1007,30 +1127,38 @@ </assertion> <assertion id="b"> - <text>A producer field may be either static or nonstatic</text> + <text>A producer field may be static</text> </assertion> <assertion id="c"> - <text>If a producer field sometimes contains a null value when accessed, then the producer field must have scope @Dependent</text> + <text>A producer field may be nonstatic</text> </assertion> <assertion id="d"> - <text>If a producer method contains a null value at runtime, and the producer field declares any other scope, an IllegalProductException is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.4, "Client proxies"</text> + <text>If a producer field sometimes contains a null value when accessed, then the producer field must have scope @Dependent</text> </assertion> <assertion id="e"> - <text>If the producer field return type is a parameterized type, it must specify actual type parameters for each type parameter</text> + <text>If a producer method contains a null value at runtime, and the producer field declares any other scope, an IllegalProductException is thrown by the container. This restriction allows the container to use a client proxy, as defined in Section 5.4, "Client proxies"</text> </assertion> <assertion id="f"> - <text>If a producer field return type contains a wildcard type parameter or type variable, a DefinitionException is thrown by the container at deployment time</text> + <text>If the producer field return type is a parameterized type, it must specify actual type parameters for each type parameter</text> </assertion> <assertion id="g"> + <text>If a producer field return type contains a wildcard type parameter, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="h"> + <text>If a producer field return type contains a type variable, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="i"> <text>The application may access producer fields directly. However, if the application accesses a producer field directly, the returned object is not bound to any context; and its lifecycle is not managed by the container</text> </assertion> - <assertion id="h"> + <assertion id="j"> <text>A bean may declare multiple producer fields</text> </assertion> </section> @@ -1085,22 +1213,54 @@ <section id="3.6" title="Resources"> <assertion id="a"> - <text>Resources may be declared in beans.xml, allowing direct injection of an EE resource, entity manager, entity manager factory, EJB remote object or web service reference</text> + <text>Resources may be declared in beans.xml, allowing direct injection of an EE resource</text> </assertion> <assertion id="b"> - <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @Resource, @PersistenceContext, @PersistenceUnit, @EJB or @WebServiceRef</text> + <text>Resources may be declared in beans.xml, allowing direct injection of an entity manager</text> </assertion> <assertion id="c"> + <text>Resources may be declared in beans.xml, allowing direct injection of an entity manager factory</text> + </assertion> + + <assertion id="d"> + <text>Resources may be declared in beans.xml, allowing direct injection of an EJB remote object</text> + </assertion> + + <assertion id="e"> + <text>Resources may be declared in beans.xml, allowing direct injection of a web service reference</text> + </assertion> + + <assertion id="f"> + <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @Resource</text> + </assertion> + + <assertion id="g"> + <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @PersistenceContext</text> + </assertion> + + <assertion id="h"> + <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @PersistenceUnit</text> + </assertion> + + <assertion id="i"> + <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @EJB</text> + </assertion> + + <assertion id="j"> + <text>The lifecycle of an injected reference is identical to the semantics of Java EE injection using @WebServiceRef</text> + </assertion> + + <assertion id="k"> <text>A resource always has scope @Dependent</text> </assertion> - <assertion id="d"> + <assertion id="l"> <text>A resource may not declare a bean name</text> </assertion> - <assertion id="e"> + <assertion id="m"> <text>Resources are always declared using XML</text> </assertion> </section> @@ -1153,11 +1313,11 @@ <WebServiceRef> element. For a web service, a JNDI name or mapped name must be specified using the <name> or <mappedName> child elements of the <WebServiceRef> element. Optionally, a URL pointing to a WSDL document may be specified using the <wsdlLocation> child element</text> </assertion> - <assertion id="k"> + <assertion name="k"> <text>The JNDI name specified by the <name> element must be a name in the global java:global or application java:app naming context</text> </assertion> - <assertion id="l"> + <assertion name="l"> <text>Optionally, one or more bindings may be specified for resources in XML. If no binding is explicitly specified, the default binding @Current is assumed.</text> </assertion> @@ -1169,26 +1329,158 @@ </assertion> <assertion id="b"> - <text>JMS queue resources must allow the direct injection of the Queue, QueueConnection, QueueSession, QueueReceiver and/or QueueSender</text> + <text>JMS queue resources must allow the direct injection of the Queue</text> </assertion> <assertion id="c"> - <text>JMS topic resources must allow the direct injection of the Topic, TopicConnection, TopicSession, TopicSubscriber and/or TopicPublisher</text> + <text>JMS queue resources must allow the direct injection of the QueueConnection</text> </assertion> <assertion id="d"> - <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a JMS resource, an UnsupportedOperationException is thrown by the container.</text> + <text>JMS queue resources must allow the direct injection of the QueueSession</text> </assertion> <assertion id="e"> - <text>A JMS resource always has scope @Dependent</text> + <text>JMS queue resources must allow the direct injection of the QueueReceiver</text> </assertion> <assertion id="f"> - <text>A JMS resource may not declare a bean name</text> + <text>JMS queue resources must allow the direct injection of the QueueSender</text> </assertion> <assertion id="g"> + <text>JMS topic resources must allow the direct injection of the Topic</text> + </assertion> + + <assertion id="h"> + <text>JMS topic resources must allow the direct injection of the TopicConnection</text> + </assertion> + + <assertion id="i"> + <text>JMS topic resources must allow the direct injection of the TopicSession</text> + </assertion> + + <assertion id="j"> + <text>JMS topic resources must allow the direct injection of the TopicSubscriber</text> + </assertion> + + <assertion id="k"> + <text>JMS topic resources must allow the direct injection of the TopicPublisher</text> + </assertion> + + <assertion id="l"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a QueueConnection, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="m"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a QueueSession, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="n"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a QueueReceiver, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="o"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a QueueSender, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="p"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a TopicConnection, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="q"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a TopicSession, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="r"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a TopicSubscriber, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="s"> + <text>The lifecycles of the injected objects are managed by the container, and therefore the application need not explicitly close() any injected JMS object. If the application calls close() on an instance of a TopicPublisher, an UnsupportedOperationException is thrown by the container.</text> + </assertion> + + <assertion id="t"> + <text>A JMS Queue resource always has scope @Dependent</text> + </assertion> + + <assertion id="u"> + <text>A JMS QueueConnection resource always has scope @Dependent</text> + </assertion> + + <assertion id="v"> + <text>A JMS QueueSession resource always has scope @Dependent</text> + </assertion> + + <assertion id="w"> + <text>A JMS QueueReceiver resource always has scope @Dependent</text> + </assertion> + + <assertion id="x"> + <text>A JMS QueueSender resource always has scope @Dependent</text> + </assertion> + + <assertion id="y"> + <text>A JMS Topic resource always has scope @Dependent</text> + </assertion> + + <assertion id="z"> + <text>A JMS TopicConnection resource always has scope @Dependent</text> + </assertion> + + <assertion id="aa"> + <text>A JMS TopicSession resource always has scope @Dependent</text> + </assertion> + + <assertion id="ab"> + <text>A JMS TopicSubscriber resource always has scope @Dependent</text> + </assertion> + + <assertion id="ac"> + <text>A JMS TopicPublisher resource always has scope @Dependent</text> + </assertion> + + <assertion id="ad"> + <text>A JMS Queue resource may not declare a bean name</text> + </assertion> + + <assertion id="ae"> + <text>A JMS QueueConnection resource may not declare a bean name</text> + </assertion> + + <assertion id="af"> + <text>A JMS QueueSession resource may not declare a bean name</text> + </assertion> + + <assertion id="ag"> + <text>A JMS QueueReceiver resource may not declare a bean name</text> + </assertion> + + <assertion id="ah"> + <text>A JMS QueueSender resource may not declare a bean name</text> + </assertion> + + <assertion id="ai"> + <text>A JMS Topic resource may not declare a bean name</text> + </assertion> + + <assertion id="aj"> + <text>A JMS TopicConnection resource may not declare a bean name</text> + </assertion> + + <assertion id="ak"> + <text>A JMS TopicSession resource may not declare a bean name</text> + </assertion> + + <assertion id="al"> + <text>A JMS TopicSubscriber resource may not declare a bean name</text> + </assertion> + + <assertion id="am"> + <text>A JMS TopicPublisher resource may not declare a bean name</text> + </assertion> + + <assertion id="an"> <text>JMS resources are always declared using XML</text> </assertion> </section> @@ -1222,20 +1514,40 @@ <section id="3.8" title="Injected fields"> <assertion id="a"> - <text>An injected field is a non-static, non-final field of a bean class, of a servlet, or of any EJB session or message driven bean class.</text> + <text>An injected field is a non-static, non-final field of a bean class.</text> </assertion> <assertion id="b"> - <text>Injected fields are initialized by the container immediately after instantiation and before any methods of the instance are invoked. The container calls the method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving dependencies" to determine a value for each injected field</text> + <text>An injected field is a non-static, non-final field of a servlet.</text> </assertion> <assertion id="c"> - <text>Any EJB session or message driven bean may declare injected fields and have those fields injected by the container</text> + <text>An injected field is a non-static, non-final field of any EJB session bean class.</text> </assertion> <assertion id="d"> - <text>If a field is a producer field or a decorator delegate attribute, it is not an injected field</text> + <text>An injected field is a non-static, non-final field of any message driven bean class.</text> </assertion> + + <assertion id="e"> + <text>Injected fields are initialized by the container immediately after instantiation and before any methods of the instance are invoked. The container calls the method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving dependencies" to determine a value for each injected field</text> + </assertion> + + <assertion id="f"> + <text>Any EJB session bean may declare injected fields and have those fields injected by the container</text> + </assertion> + + <assertion id="g"> + <text>Any EJB message driven bean may declare injected fields and have those fields injected by the container</text> + </assertion> + + <assertion id="h"> + <text>If a field is a producer field, it is not an injected field</text> + </assertion> + + <assertion id="i"> + <text>If a field is a decorator delegate attribute, it is not an injected field</text> + </assertion> </section> <section id="3.8.1" title="Declaring an injected field using annotations"> @@ -1265,32 +1577,48 @@ <section id="3.9" title="Initializer methods"> <assertion id="a"> - <text>An initializer method is a non-static method of a bean class, of a servlet, or of any EJB session or message driven bean class.</text> + <text>An initializer method is a non-static method of a bean class.</text> </assertion> + <assertion id="a"> + <text>An initializer method is a non-static method of a servlet.</text> + </assertion> + <assertion id="b"> - <text>Initializer methods are called by the container immediately after injected fields have been initialized by the container and before any other methods of the instance are invoked.</text> + <text>An initializer method is a non-static method of any EJB session bean class.</text> </assertion> <assertion id="c"> - <text>If the bean is a session bean, the initializer method is not required to be a business method of the session bean</text> + <text>An initializer method is a non-static method of a of any EJB message driven bean class.</text> </assertion> <assertion id="d"> - <text>Method interceptors are never called when the container calls an initializer method</text> + <text>Initializer methods are called by the container immediately after injected fields have been initialized by the container and before any other methods of the instance are invoked.</text> </assertion> <assertion id="e"> - <text>A bean class may declare multiple (or zero) initializer methods</text> + <text>If the bean is a session bean, the initializer method is not required to be a business method of the session bean</text> </assertion> <assertion id="f"> - <text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text> + <text>Method interceptors are never called when the container calls an initializer method</text> </assertion> <assertion id="g"> - <text>Any EJB session or message driven bean may declare initializer methods and have the methods called by the container</text> + <text>A bean class may declare multiple (or zero) initializer methods</text> </assertion> + + <assertion id="h"> + <text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text> + </assertion> + + <assertion id="i"> + <text>Any EJB session bean may declare initializer methods and have the methods called by the container</text> + </assertion> + + <assertion id="j"> + <text>Any EJB message driven bean may declare initializer methods and have the methods called by the container</text> + </assertion> </section> <section id="3.9.1" title="Declaring an initializer method using annotations"> @@ -1299,9 +1627,17 @@ </assertion> <assertion id="b"> - <text>If an initializer method is annotated @Produces, has a parameter annotated @Disposes, or has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text> + <text>If an initializer method is annotated @Produces, a DefinitionException is thrown by the container at deployment time</text> </assertion> + <assertion id="c"> + <text>If an initializer method has a parameter annotated @Disposes, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + + <assertion id="d"> + <text>If an initializer method has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text> + </assertion> + </section> <section id="3.9.2" title="Declaring an initializer method using XML"> @@ -1327,18 +1663,34 @@ <section id="3.10" title="Support for Common Annotations"> <assertion id="a"> - <text>Dependency injection via @EJB, @Resource, @PersistenceUnit and @PersistenceContext is provided by the container when annotations are applied to the bean class of a simple bean</text> + <text>Dependency injection via @EJB is provided by the container when annotations are applied to the bean class of a simple bean</text> </assertion> <assertion id="b"> - <text>@PostConstruct and @PreDestroy callbacks are provided by the container when annotations are applied to the bean class of a simple bean</text> + <text>Dependency injection via @Resource is provided by the container when annotations are applied to the bean class of a simple bean</text> </assertion> <assertion id="c"> + <text>Dependency injection via @PersistenceUnit is provided by the container when annotations are applied to the bean class of a simple bean</text> + </assertion> + + <assertion id="d"> + <text>Dependency injection via @PersistenceContext is provided by the container when annotations are applied to the bean class of a simple bean</text> + </assertion> + + <assertion id="e"> + <text>@PostConstruct callbacks are provided by the container when annotations are applied to the bean class of a simple bean</text> + </assertion> + + <assertion id="f"> + <text>@PreDestroy callbacks are provided by the container when annotations are applied to the bean class of a simple bean</text> + </assertion> + + <assertion id="g"> <text>Interception, as defined in javax.interceptor is provided by the container when annotations are applied to the bean class of a simple bean</text> </assertion> - <assertion id="d"> + <assertion id="h"> <text>@PersistenceContext(type=EXTENDED) is not supported for simple beans</text> </assertion> </section> @@ -1520,8 +1872,20 @@ </assertion> <assertion id="c"> - <text>Any non-static producer methods (see Section 3.4, "Producer methods"), producer fields (see Section 3.5, "Producer fields"), disposal methods (see Section 3.4.6, "Disposal methods") or observer methods (see Section 7.5, "Observer methods") of any bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 6.7, "Lifecycle of producer methods", Section 6.8, "Lifecycle of producer fields" and Section 7.4, "Observer notification".</text> + <text>Any non-static producer methods (see Section 3.4, "Producer methods") of any bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 6.7, "Lifecycle of producer methods".</text> </assertion> + + <assertion id="d"> + <text>Any non-static producer fields (see Section 3.5, "Producer fields") of any bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 6.8, "Lifecycle of producer fields".</text> + </assertion> + + <assertion id="e"> + <text>Any non-static disposal methods (see Section 3.4.6, "Disposal methods") of any bean are invoked upon an instance of the most specialized enabled bean that specializes the bean.</text> + </assertion> + + <assertion id="f"> + <text>Any non-static observer methods (see Section 7.5, "Observer methods") of any bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 7.4, "Observer notification".</text> + </assertion> </section> <section id="4.3.3" title="Inconsistent specialization">

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1526 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 11:57:27 -0500 (Sun, 15 Feb 2009) New Revision: 1526 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java Log: Accurately count incontainer tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-15 16:06:55 UTC (rev 1525) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-15 16:57:27 UTC (rev 1526) @@ -204,19 +204,22 @@ public void run(IHookCallBack callback, ITestResult testResult) { - if (deploymentException != null) - { - testResult.setThrowable(deploymentException.getCause()); - } - else if (!isDeployToContainerNeeded()) + if(isDeployToContainerNeeded()) { + numberOfTestsRunInContainer++; + } + if (deploymentException != null) + { + testResult.setThrowable(deploymentException.getCause()); + } + else if (!isDeployToContainerNeeded()) + { callback.runTestMethod(testResult); } else { try { - numberOfTestsRunInContainer++; TestResult result = getCurrentConfiguration().getInContainerTestLauncher().launchTest(testResult.getMethod().getMethod()); if (result.getStatus().equals(Status.FAILED) || result.getStatus().equals(Status.SKIPPED)) {

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1525 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap and 14 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-15 11:06:55 -0500 (Sun, 15 Feb 2009) New Revision: 1525 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationVector.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterable.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterator.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java ri/trunk/webbeans-ri/src/test/resources/org/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/test-beans.xml ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java Log: Initial work on reading enabled deployment types from XML. Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -1,6 +1,7 @@ package org.jboss.webbeans.tck; import java.lang.annotation.Annotation; +import java.util.Arrays; import java.util.List; import javax.inject.manager.Manager; @@ -24,7 +25,9 @@ { manager.setEnabledDeploymentTypes(enabledDeploymentTypes); } - bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes)); + MockWebBeanDiscovery discovery = new MockWebBeanDiscovery(); + discovery.setWebBeanClasses(Arrays.asList(classes)); + bootstrap.setWebBeanDiscovery(discovery); bootstrap.boot(); return manager; } Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,205 @@ +package org.jboss.webbeans.bootstrap; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.inject.DeploymentException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.jboss.webbeans.resources.spi.ResourceLoader; +import org.jboss.webbeans.util.dom.NodeListIterable; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + +/** + * Temporary XML parser to get essential data (like enabled deployment types) + * until we have a full XML parser/binder + * + * @author Pete Muir + * + */ +public class BeansXmlParser +{ + + private static class DeployElement + { + private URL file; + private Element element; + private Map<String, String> namespaces; + + public DeployElement(URL file, Element element, Map<String, String> namespaces) + { + super(); + this.file = file; + this.element = element; + this.namespaces = namespaces; + } + + public URL getFile() + { + return file; + } + + public Element getElement() + { + return element; + } + + public Map<String, String> getNamespaces() + { + return namespaces; + } + + @Override + public String toString() + { + return "File: " + getFile() + "; Node: " + getElement(); + } + + } + + public static final String EE_NAMESPACE = "urn:java:ee"; + + private final Iterable<URL> beansXml; + private final ResourceLoader resourceLoader; + + private List<Class<? extends Annotation>> enabledDeploymentTypes; + + public List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + return enabledDeploymentTypes; + } + + public BeansXmlParser(ResourceLoader resourceLoader, Iterable<URL> beansXml) + { + this.beansXml = beansXml; + this.resourceLoader = resourceLoader; + } + + public void parse() + { + DocumentBuilder documentBuilder; + try + { + documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + } + catch (ParserConfigurationException e) + { + throw new DeploymentException("Error configuring XML parser", e); + } + List<DeployElement> deployElements = new ArrayList<DeployElement>(); + for (URL url : beansXml) + { + Document document; + try + { + document = documentBuilder.parse(url.openStream()); + document.normalize(); + } + catch (SAXException e) + { + throw new DeploymentException("Error parsing beans.xml " + url.toString()); + } + catch (IOException e) + { + throw new DeploymentException("Error loading beans.xml " + url.toString()); + } + Element beans = document.getDocumentElement(); + Map<String, String> namespaces = new HashMap<String, String>(); + for (int i = 0; i < beans.getAttributes().getLength(); i++) + { + Node child = beans.getAttributes().item(i); + if (child instanceof Attr) + { + Attr attr = (Attr) child; + if (attr.getName().startsWith("xmlns")) + { + String namespacePrefix; + if (attr.getName().length() == 5) + { + namespacePrefix = ""; + } + else + { + namespacePrefix = attr.getName().substring(6); + } + + String namespace = attr.getValue(); + namespaces.put(namespacePrefix, namespace); + } + } + } + for (Node child : new NodeListIterable(beans.getChildNodes())) + { + if (child instanceof Element && "Deploy".equals(child.getNodeName())) + { + deployElements.add(new DeployElement(url, (Element) child, namespaces)); + } + } + } + if (deployElements.size() > 1) + { + throw new DeploymentException("<Deploy> can only be specified once, but it is specified muliple times " + deployElements); + } + else if (deployElements.size() == 1) + { + DeployElement deployElement = deployElements.get(0); + enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + for (Node child : new NodeListIterable(deployElement.getElement().getChildNodes())) + { + if (child instanceof Element) + { + String className = getAsClassName(child.getNodeName(), deployElement.getNamespaces()); + if (className != null) + { + enabledDeploymentTypes.add(resourceLoader.classForName(className).asSubclass(Annotation.class)); + } + } + } + } + } + + private static String getAsClassName(String nodeName, Map<String, String> namespaces) + { + String namespacePrefix; + String simpleClassName; + if (nodeName.contains(":")) + { + namespacePrefix = nodeName.substring(0, nodeName.indexOf(":")); + simpleClassName = nodeName.substring(nodeName.indexOf(":") + 1); + } + else + { + namespacePrefix = ""; + simpleClassName = nodeName; + } + String namespace = namespaces.get(namespacePrefix); + String packageName; + if (namespace.startsWith("urn:java:ee")) + { + // Hack for now to return the correct package for this composite package deployment types + packageName = "javax.inject"; + } + else if (namespace.startsWith("urn:java:")) + { + packageName = namespace.substring(9); + } + else + { + // Not a Java package + return null; + } + return packageName + "." + simpleClassName; + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeansXmlParser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -17,6 +17,9 @@ package org.jboss.webbeans.bootstrap; +import java.lang.annotation.Annotation; +import java.util.List; + import org.jboss.webbeans.BeanValidator; import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; @@ -25,9 +28,9 @@ import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.conversation.ConversationImpl; -import org.jboss.webbeans.conversation.ServletConversationManager; import org.jboss.webbeans.conversation.JavaSEConversationTerminator; import org.jboss.webbeans.conversation.NumericConversationIdGenerator; +import org.jboss.webbeans.conversation.ServletConversationManager; import org.jboss.webbeans.ejb.spi.EjbResolver; import org.jboss.webbeans.literal.DeployedLiteral; import org.jboss.webbeans.literal.InitializedLiteral; @@ -126,6 +129,13 @@ // Must populate EJB cache first, as we need it to detect whether a // bean is an EJB! getManager().getEjbDescriptorCache().addAll(getEjbDiscovery().discoverEjbs()); + BeansXmlParser parser = new BeansXmlParser(getResourceLoader(), getWebBeanDiscovery().discoverWebBeansXml()); + parser.parse(); + List<Class<? extends Annotation>> enabledDeploymentTypes = parser.getEnabledDeploymentTypes(); + if (enabledDeploymentTypes != null) + { + getManager().setEnabledDeploymentTypes(enabledDeploymentTypes); + } registerBeans(getWebBeanDiscovery().discoverWebBeanClasses()); getManager().fireEvent(getManager(), new InitializedLiteral()); log.info("Web Beans initialized. Validating beans."); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -198,10 +198,6 @@ public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery) { this.webBeanDiscovery = webBeanDiscovery; - if (webBeanDiscovery != null) - { - this.ejbDiscovery = new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses()); - } } @Override @@ -224,7 +220,7 @@ @Override protected EjbDiscovery getEjbDiscovery() { - return ejbDiscovery; + return new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses()); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -17,7 +17,6 @@ package org.jboss.webbeans.mock; import java.net.URL; -import java.util.Arrays; import java.util.HashSet; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; @@ -29,22 +28,6 @@ private Iterable<URL> webBeansXmlFiles = new HashSet<URL>(); - /** - * Simple constructor that auto discovers EJBs - * @param webBeanClasses - */ - public MockWebBeanDiscovery(Class<?>... webBeanClasses) - { - this(Arrays.asList(webBeanClasses), null); - } - - public MockWebBeanDiscovery(Iterable<Class<?>> webBeanClasses, Iterable<URL> webBeansXmlFiles) - { - super(); - this.webBeanClasses = webBeanClasses; - this.webBeansXmlFiles = webBeansXmlFiles; - } - public Iterable<Class<?>> discoverWebBeanClasses() { return webBeanClasses; @@ -54,5 +37,15 @@ { return webBeansXmlFiles; } + + public void setWebBeanClasses(Iterable<Class<?>> webBeanClasses) + { + this.webBeanClasses = webBeanClasses; + } + + public void setWebBeansXmlFiles(Iterable<URL> webBeansXmlFiles) + { + this.webBeansXmlFiles = webBeansXmlFiles; + } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterable.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -17,8 +17,11 @@ package org.jboss.webbeans.util; +import java.util.ArrayList; +import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; +import java.util.List; /** * An Enumeration -> Iteratble adaptor @@ -28,8 +31,8 @@ */ public class EnumerationIterable<T> implements Iterable<T> { - // The enumeration-iteartor - private EnumerationIterator<T> iterator; + // The enumeration as a list + private final List<T> list = new ArrayList<T>(); /** * Constructor @@ -38,7 +41,10 @@ */ public EnumerationIterable(Enumeration<T> enumeration) { - this.iterator = new EnumerationIterator<T>(enumeration); + while (enumeration.hasMoreElements()) + { + list.add(enumeration.nextElement()); + } } /** @@ -48,7 +54,7 @@ */ public Iterator<T> iterator() { - return iterator; + return Collections.unmodifiableList(list).iterator(); } } Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationVector.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationVector.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationVector.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,3 @@ +package org.jboss.webbeans.util; + + Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationVector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterable.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterable.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,23 @@ +package org.jboss.webbeans.util.dom; + +import java.util.Iterator; + +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class NodeListIterable implements Iterable<Node> +{ + + private final NodeList nodeList; + + public NodeListIterable(NodeList nodeList) + { + this.nodeList = nodeList; + } + + public Iterator<Node> iterator() + { + return new NodeListIterator(nodeList); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterable.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterator.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterator.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterator.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,36 @@ +package org.jboss.webbeans.util.dom; + +import java.util.Iterator; + +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class NodeListIterator implements Iterator<Node> +{ + + private final NodeList nodeList; + private int index; + + public NodeListIterator(NodeList nodeList) + { + this.nodeList = nodeList; + index = 0; + } + + public boolean hasNext() + { + return index < nodeList.getLength() - 1; + } + + public Node next() + { + index++; + return nodeList.item(index); + } + + public void remove() + { + throw new UnsupportedOperationException("XML DOM is readonly"); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/dom/NodeListIterator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractEjbEmbeddableTest.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -42,13 +42,13 @@ public void before() throws Exception { super.before(); - webBeansBootstrap.getNaming().setContext(new InitialContext()); + bootstrap.getNaming().setContext(new InitialContext()); } @AfterMethod public void after() throws Exception { - webBeansBootstrap.getNaming().setContext(null); + bootstrap.getNaming().setContext(null); } @@ -66,7 +66,7 @@ public Context getContext() { - return webBeansBootstrap.getNaming().getContext(); + return bootstrap.getNaming().getContext(); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -1,8 +1,10 @@ package org.jboss.webbeans.test.unit; +import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.net.URL; import java.util.Arrays; import java.util.List; @@ -21,6 +23,7 @@ import org.jboss.webbeans.mock.MockBootstrap; import org.jboss.webbeans.mock.MockEjbDescriptor; import org.jboss.webbeans.mock.MockWebBeanDiscovery; +import org.jboss.webbeans.util.EnumerationIterable; import org.testng.annotations.BeforeMethod; public class AbstractTest @@ -59,16 +62,18 @@ protected static final int BUILT_IN_BEANS = 3; protected ManagerImpl manager; - protected MockBootstrap webBeansBootstrap; + protected MockBootstrap bootstrap; + protected MockWebBeanDiscovery discovery; public static boolean visited = false; @BeforeMethod public void before() throws Exception { - webBeansBootstrap = new MockBootstrap(); - manager = webBeansBootstrap.getManager(); - manager.setEnabledDeploymentTypes(getEnabledDeploymentTypes()); + bootstrap = new MockBootstrap(); + manager = bootstrap.getManager(); + this.discovery = new MockWebBeanDiscovery(); + bootstrap.setWebBeanDiscovery(discovery); } protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() @@ -126,9 +131,29 @@ protected void deployBeans(Class<?>... classes) { - MockBootstrap bootstrap = new MockBootstrap(); - bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes)); + discovery.setWebBeanClasses(Arrays.asList(classes)); bootstrap.boot(); manager = bootstrap.getManager(); } + + + protected Iterable<URL> getResources(String name) + { + if (name.startsWith("/")) + { + name = name.substring(1); + } + else + { + name = getClass().getPackage().getName().replace(".", "/") + "/" + name; + } + try + { + return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name)); + } + catch (IOException e) + { + throw new RuntimeException("Error loading resource from classloader" + name, e); + } + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-02-15 11:10:56 UTC (rev 1524) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -4,8 +4,11 @@ import java.util.List; import java.util.Map; +import javax.inject.Production; +import javax.inject.Standard; import javax.inject.manager.Bean; +import org.jboss.webbeans.WebBean; import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.RIBean; @@ -16,6 +19,19 @@ public class BootstrapTest extends AbstractTest { + + @Test + public void testDeploymentTypesLoadedFromBeansXml() + { + discovery.setWebBeansXmlFiles(getResources("test-beans.xml")); + deployBeans(); + assert manager.getEnabledDeploymentTypes().size() == 4; + assert manager.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert manager.getEnabledDeploymentTypes().get(1).equals(WebBean.class); + assert manager.getEnabledDeploymentTypes().get(2).equals(Production.class); + assert manager.getEnabledDeploymentTypes().get(3).equals(AnotherDeploymentType.class); + } + @Test(groups="bootstrap") public void testSingleSimpleBean() { Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.test.unit.xml; + +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 +{ + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,52 @@ +package org.jboss.webbeans.test.unit.xml; + +import java.net.URL; +import java.util.Iterator; + +import javax.inject.Production; +import javax.inject.Standard; + +import org.jboss.webbeans.bootstrap.BeansXmlParser; +import org.jboss.webbeans.mock.MockResourceLoader; +import org.jboss.webbeans.resources.spi.ResourceLoader; +import org.jboss.webbeans.test.unit.AbstractTest; +import org.testng.annotations.Test; + +public class BeansXmlParserTest extends AbstractTest +{ + + private static final ResourceLoader RESOURCE_LOADER = new MockResourceLoader(); + + // Quick unit tests for the parser + @Test + public void testDefaultDeploymentTypes() + { + Iterable<URL> urls = getResources("default-beans.xml"); + int i = 0; + Iterator<URL> it = urls.iterator(); + while (it.hasNext()) + { + i++; + it.next(); + } + assert i == 1; + BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls); + parser.parse(); + assert parser.getEnabledDeploymentTypes().size() == 2; + assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class); + } + + @Test + public void testUserDefinedDeploymentType() + { + Iterable<URL> urls = getResources("user-defined-beans.xml"); + BeansXmlParser parser = new BeansXmlParser(RESOURCE_LOADER, urls); + parser.parse(); + assert parser.getEnabledDeploymentTypes().size() == 3; + assert parser.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class); + assert parser.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/test-beans.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/test-beans.xml (rev 0) +++ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/test-beans.xml 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.webbeans.test.unit.bootstrap"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/bootstrap/test-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml (rev 0) +++ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee"> + <Deploy> + <Standard /> + <Production /> + </Deploy> +</Beans> Property changes on: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/default-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml =================================================================== --- ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml (rev 0) +++ ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-02-15 16:06:55 UTC (rev 1525) @@ -0,0 +1,8 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans> Property changes on: ri/trunk/webbeans-ri/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1524 - in tck/trunk/impl/src/main: resources and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-15 06:10:56 -0500 (Sun, 15 Feb 2009) New Revision: 1524 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: chapter 8 assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java 2009-02-15 09:40:57 UTC (rev 1523) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java 2009-02-15 11:10:56 UTC (rev 1524) @@ -25,82 +25,52 @@ */ public class DependentContextTest { - /** - * when the container is injecting dependencies of an EJB or servlet or when - * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. - */ @Test(groups = { "contexts", "injection", "stub", "ejb3", "integration" }) - @SpecAssertion(section = "8.3", id = "unknown") + @SpecAssertion(section = "8.3", id = "k") public void testContextIsActiveDuringEJBDependencyInjection() { assert false; } - /** - * when the container is injecting dependencies of an EJB or servlet or when - * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. - */ - @Test(groups = { "contexts", "injection", "stub", "servlet", "integration" }) - @SpecAssertion(section = "8.3", id = "unknown") - public void testContextIsActiveDuringServletDependencyInjection() - { - assert false; - } - - /** - * when the container is injecting dependencies of an EJB or servlet or when - * a @PostConstruct or @PreDestroy callback is invoked by the EJB container. - */ @Test(groups = { "contexts", "postconstruct", "stub", "ejb3", "integration" }) - @SpecAssertion(section = "8.3", id = "unknown") + @SpecAssertion(section = "8.3", id = "l") public void testContextIsActiveDuringEJBPostConstruct() { assert false; } - /** - * A bean, EJB or servlet may obtain an instance of a bean with scope @Dependent - * via dependency injection or by calling Manager.getInstance(), - * Manager.getInstanceByType() or Instance.get() when the @Dependent scope is - * active. - */ + + @Test(groups = { "contexts", "injection", "stub", "servlet", "integration" }) + @SpecAssertion(section = "8.3", id = "m") + public void testContextIsActiveDuringServletDependencyInjection() + { + assert false; + } + @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.3.1", id = "unknown") + @SpecAssertion(section = "8.3.1", id = "a") public void testEjbBeanMayCreateInstanceWheneverScopeActive() { assert false; } - /** - * A bean, EJB or servlet may obtain an instance of a bean with scope @Dependent - * via dependency injection or by calling Manager.getInstance(), - * Manager.getInstanceByType() or Instance.get() when the @Dependent scope is - * active. - */ + @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.3.1", id = "unknown") + @SpecAssertion(section = "8.3.1", id = "a") public void testServletBeanMayCreateInstanceWheneverScopeIsActive() { assert false; } - /** - * destroy all dependent objects of an EJB bean or Servlet when the EJB bean - * or Servlet is destroyed, - */ @Test(groups = { "stub", "contexts", "ejb3", "integration" }) - @SpecAssertion(section = "8.3.2", id = "unknown") + @SpecAssertion(section = "8.3.2", id = "b") public void testDestroyingEjbDestroysDependents() { assert false; } - /** - * destroy all dependent objects of an EJB bean or Servlet when the EJB bean - * or Servlet is destroyed, - */ @Test(groups = { "stub", "contexts", "servlet", "integration" }) - @SpecAssertion(section = "8.3.2", id = "unknown") + @SpecAssertion(section = "8.3.2", id = "b") public void testDestroyingServletDestroysDependents() { assert false; Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-15 09:40:57 UTC (rev 1523) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-15 11:10:56 UTC (rev 1524) @@ -1650,7 +1650,178 @@ </section> + <section id="8" title="Scopes and contexts"> + </section> + <section id="8.1" title="The Context interface"> + + <assertion id="a"> + <text>The get() method of the Context object may return an existing instance of the given contextual type</text> + </assertion> + + <assertion id="b"> + <text>The get() method of the Context object may return a null value if no CreationalContext is given</text> + </assertion> + + <assertion id="c"> + <text>The get() method of the Context object may create a new instance of the given contextual type by calling Contextual.create() and return the new instance, if a CreationalContext is given</text> + </assertion> + + <assertion id="d"> + <text>The get() method of a Context object may not return a null value unless no CreationalContext is given, or Contextual.create() returns a null value</text> + </assertion> + + <assertion id="e"> + <text>The get() method of a Context object may not create a new instance of the given contextual type unless a CreationalContext is given</text> + </assertion> + + <assertion id="f"> + <text>The Context implementation is responsible for destroying any contextual instance it creates by passing the instance to the destroy() method of the Contextual object representing the contextual type</text> + </assertion> + + <assertion id="g"> + <text>A destroyed instance must not subsequently be returned by a Context object's get() method</text> + </assertion> + + <assertion id="h"> + <text>When a scope is inactive, any invocation of the get() from the current thread upon the Context object for that scope results in a ContextNotActiveException</text> + </assertion> + + <assertion id="i"> + <text>The isActive() method returns false when the scope of the context object is inactive, and true when it is active</text> + </assertion> + + </section> + + <section id="8.2" title="Normal scopes and pseudo-scopes"> + <assertion id="a"> + <text>There may be no more than one mapped instance of a context object per contextual type per thread</text> + </assertion> + + <assertion id="b"> + <text>A context may be associated with one or more threads</text> + </assertion> + + <assertion id="c"> + <text>The get() operation of the Context object for an active normal scope returns the current instance of the given contextual type</text> + </assertion> + + <assertion id="d"> + <text>When a context is destroyed, all mapped instances of contextual types with that scope are destroyed by passing them to the Contextual.destroy() method</text> + </assertion> + + <assertion id="e"> + <text>Contexts with normal scopes must obey the following rule: Suppose beans A, B and Z all have normal scopes. Suppose A has an injection point x, and B has an injection point y. Suppose further that both x and y resolve to bean Z according to the typesafe resolution algorithm. If a is the current instance of A, and b is the current instance of B, then both a.x and b.y refer to the same instance of Z. This instance is the current instance of Z.</text> + </assertion> + + <assertion id="f"> + <text>All pseudo-scopes must be explicitly declared @ScopeType(normal=false), to indicate to the container that no client proxy is required</text> + </assertion> + + <assertion id="g"> + <text>All scopes defined by this specification, except for the @Dependent pseudo-scope, are normal scopes</text> + </assertion> + </section> + + <section id="8.3" title="Dependent pseudo-scope"> + + <assertion id="a"> + <text>When a bean is declared to have @Dependent scope, no injected instance of the bean is ever shared between multiple injection points</text> + </assertion> + + <assertion id="b"> + <text>When a bean is declared to have @Dependent scope, any injected instance of the bean is bound to the lifecycle of the bean, servlet or EJB into which it is injected</text> + </assertion> + + <assertion id="c"> + <text>When a bean is declared to have @Dependent scope, any instance of the bean that is used to evaluate a Unified EL expression exists to service that evaluation only</text> + </assertion> + + <assertion id="d"> + <text>When a bean is declared to have @Dependent scope, any instance of the bean that receives a producer method, producer field, disposal method or observer method invocation exists to service that invocation only</text> + </assertion> + + <assertion id="e"> + <text>Every invocation of the get() operation of the Context object for the @Dependent scope with a CreationalContext returns a new instance of the given bean</text> + </assertion> + + <assertion id="f"> + <text>Every invocation of the get() operation of the Context object for the @Dependent scope with no CreationalContext returns a null value</text> + </assertion> + + <assertion id="g"> + <text>The @Dependent scope is inactive except when an instance of a bean with scope @Dependent is created by the container to receive a producer method, producer +field, disposal method or observer method invocation</text> + <note>Assertions g through k are all related and should be treated as "or" conditions</note> + </assertion> + + <assertion id="h"> + <text>The @Dependent scope is inactive except while a Unified EL expression is evaluated</text> + </assertion> + + <assertion id="i"> + <text>The @Dependent scope is inactive except while an observer method is invoked</text> + </assertion> + + <assertion id="j"> + <text>The @Dependent scope is inactive except when the container is creating or destroying a contextual instance of a bean or injecting its dependencies</text> + </assertion> + + <assertion id="k"> + <text>The @Dependent scope is inactive except when the container is injecting dependencies of an EJB</text> + </assertion> + + <assertion id="l"> + <text>The @Dependent scope is inactive except when a @PostConstruct or @PreDestroy callback is invoked by the EJB container</text> + </assertion> + + <assertion id="m"> + <text>The @Dependent scope is inactive except when the container is injecting dependencies of a servlet</text> + </assertion> + + <assertion id="n"> + <text>The @Dependent scope is even active during invocation of interceptors and decorators of observer methods and interceptors and decorators of @PostConstruct and @PreDestroy callbacks</text> + </assertion> + + </section> + + <section id="8.3.1" title="Dependent objects"> + <assertion id="a"> + <text>A bean, EJB or servlet may obtain an instance of a bean with scope @Dependent via dependency injection or by calling Manager.getInstance(), Manager.getInstanceByType() or Instance.get() when the @Dependent scope is active</text> + </assertion> + + <assertion id="b"> + <text>Instances of interceptors or decorators with scope @Dependent are also dependent objects of the bean they intercept or decorate</text> + </assertion> + </section> + + <section id="8.3.2" title="Dependent object destruction"> + + <assertion id="a"> + <text>The container must destroy all dependent objects of a contextual bean instance when the instance is destroyed</text> + </assertion> + + <assertion id="b"> + <text>The container must destroy all dependent objects of an EJB or servlet when the EJB or servlet is destroyed</text> + </assertion> + + <assertion id="c"> + <text>The container must destroy all @Dependent scoped contextual instances created during an EL expression evaluation when the evaluation completes</text> + </assertion> + + <assertion id="d"> + <text>The container must destroy any @Dependent scoped contextual instance created to receive a producer method, producer field, disposal method or observer method invocation when the invocation completes</text> + </assertion> + + <assertion id="e"> + <text>The container is permitted to destroy any @Dependent scoped contextual instance at any time if the instance is no Scopes and contexts longer referenced by the application (excluding weak, soft and phantom references)</text> + </assertion> + </section> + + <section id="8.4" title="Passivating scopes and serialization"> + + </section> + </specification>

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009