June 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r2866 - in ri/trunk: jboss-tck-runner/src/test/java/org/jboss/webbeans and 5 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 10:18:45 -0400 (Tue, 23 Jun 2009) New Revision: 2866 Added: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java Removed: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java Log: further support for deployment errors Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-06-23 10:23:28 UTC (rev 2865) +++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/jboss-test-harness.properties 2009-06-23 14:18:45 UTC (rev 2866) @@ -1 +1,2 @@ -org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher \ No newline at end of file +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher +org.jboss.testharness.container.deploymentExceptionTransformer=org.jboss.webbeans.tck.jbossas.WebBeansProfileServiceDeploymentExceptionTransformer Deleted: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java =================================================================== --- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-06-23 10:23:28 UTC (rev 2865) +++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-06-23 14:18:45 UTC (rev 2866) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans; - -import java.util.Map.Entry; - -import org.jboss.deployers.client.spi.IncompleteDeploymentException; -import org.jboss.testharness.api.DeploymentException; -import org.jboss.testharness.api.DeploymentExceptionTransformer; - -/** - * An implementation which can transform deployment exceptions from JBoss AS - * reported via the Profile Service - * - * @author Pete Muir - * - */ -public class WebBeansProfileServiceDeploymentExceptionTransformer implements DeploymentExceptionTransformer -{ - - public DeploymentException transform(DeploymentException exception) - { - Throwable failure = exception.getCause(); - if (failure.getCause() instanceof IncompleteDeploymentException) - { - IncompleteDeploymentException incompleteDeploymentException = (IncompleteDeploymentException) failure.getCause(); - for (Entry<String, Throwable> entry : incompleteDeploymentException.getIncompleteDeployments().getContextsInError().entrySet()) - { - if (entry.getKey().endsWith(exception.getName() + "/_WebBeansBootstrapBean")) - { - return new DeploymentException(exception, entry.getValue()); - } - } - } - return exception; - } - -} Copied: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java (from rev 2864, ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java) =================================================================== --- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java (rev 0) +++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-06-23 14:18:45 UTC (rev 2866) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.tck.jbossas; + +import java.util.Map.Entry; + +import org.jboss.deployers.client.spi.IncompleteDeploymentException; +import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.api.DeploymentExceptionTransformer; + +/** + * An implementation which can transform deployment exceptions from JBoss AS + * reported via the Profile Service + * + * @author Pete Muir + * + */ +public class WebBeansProfileServiceDeploymentExceptionTransformer implements DeploymentExceptionTransformer +{ + + public DeploymentException transform(DeploymentException exception) + { + Throwable failure = exception.getCause().getCause(); + if (failure instanceof IncompleteDeploymentException) + { + IncompleteDeploymentException incompleteDeploymentException = (IncompleteDeploymentException) failure; + for (Entry<String, Throwable> entry : incompleteDeploymentException.getIncompleteDeployments().getContextsInError().entrySet()) + { + if (entry.getKey().endsWith(exception.getName() + "/_WebBeansBootstrapBean")) + { + return new DeploymentException(exception, entry.getValue()); + } + } + } + return exception; + } + +} Property changes on: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/tck/jbossas/WebBeansProfileServiceDeploymentExceptionTransformer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-23 10:23:28 UTC (rev 2865) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-06-23 14:18:45 UTC (rev 2866) @@ -14,12 +14,12 @@ public class ManagersImpl implements Managers { - + public BeanManager getManager() { return CurrentManager.rootManager(); } - + public void setEnabledDeploymentTypes(List<Class<? extends Annotation>> enabledDeploymentTypes) { CurrentManager.rootManager().setEnabledDeploymentTypes(enabledDeploymentTypes); @@ -32,35 +32,45 @@ return deploymentTypes; } - public boolean isDefinitionError(Throwable throwable) + public boolean isDefinitionError(org.jboss.testharness.api.DeploymentException deploymentException) { - if (throwable == null) + return isDefinitionException(deploymentException.getCause()); + } + + private boolean isDefinitionException(Throwable t) + { + if (t == null) { return false; } - else if (DefinitionException.class.isAssignableFrom(throwable.getClass())) + else if (DefinitionException.class.isAssignableFrom(t.getClass())) { return true; } else { - return isDefinitionError(throwable.getCause()); + return isDefinitionException(t.getCause()); } } - - public boolean isDeploymentError(Throwable throwable) + + public boolean isDeploymentError(org.jboss.testharness.api.DeploymentException deploymentException) { - if (throwable == null) + return isDeploymentException(deploymentException.getCause()); + } + + public boolean isDeploymentException(Throwable t) + { + if (t == null) { return false; } - else if (DeploymentException.class.isAssignableFrom(throwable.getClass())) + else if (DeploymentException.class.isAssignableFrom(t.getClass())) { return true; } else { - return isDeploymentError(throwable.getCause()); + return isDeploymentException(t.getCause()); } } } Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java 2009-06-23 10:23:28 UTC (rev 2865) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java 2009-06-23 14:18:45 UTC (rev 2866) @@ -9,10 +9,12 @@ public abstract class AbstractStandaloneContainersImpl implements StandaloneContainers { - + + private DeploymentException deploymentException; + private MockServletLifecycle lifecycle; - - public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) throws DeploymentException + + public boolean deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml) { this.lifecycle = newLifecycle(); lifecycle.initialize(); @@ -28,12 +30,14 @@ } catch (Exception e) { - throw new DeploymentException("Error deploying beans", e); + this.deploymentException = new DeploymentException("Error deploying beans", e); + return false; } lifecycle.beginSession(); lifecycle.beginRequest(); + return true; } - + protected abstract MockServletLifecycle newLifecycle(); public void deploy(Iterable<Class<?>> classes) throws DeploymentException @@ -44,20 +48,26 @@ public void cleanup() { // Np-op - + } - + public void setup() { // No-op } + public DeploymentException getDeploymentException() + { + return deploymentException; + } + public void undeploy() { lifecycle.endRequest(); lifecycle.endSession(); lifecycle.endApplication(); lifecycle = null; + deploymentException = null; } - + } \ No newline at end of file Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-06-23 10:23:28 UTC (rev 2865) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/deploy/BeansXmlParserTest.java 2009-06-23 14:18:45 UTC (rev 2866) @@ -27,9 +27,9 @@ ) public class BeansXmlParserTest extends AbstractWebBeansTest { - + // Quick unit tests for the parser - @Test + @Test(groups="incontainer-broken") public void testDefaultDeploymentTypes() { Iterable<URL> urls = getResources("default-beans.xml"); @@ -43,13 +43,13 @@ assert i == 1; BeansXmlParser parser = new BeansXmlParser(new MockResourceLoader(), 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 + + @Test(groups="incontainer-broken") public void testUserDefinedDeploymentType() { Iterable<URL> urls = getResources("user-defined-beans.xml"); @@ -60,16 +60,16 @@ assert parser.getEnabledDeploymentTypes().get(1).equals(Production.class); assert parser.getEnabledDeploymentTypes().get(2).equals(AnotherDeploymentType.class); } - + /** * Test case for WBRI-21. */ - @Test(expectedExceptions=DeploymentException.class, description="WBRI-21") + @Test(expectedExceptions=DeploymentException.class, description="WBRI-21", groups="incontainer-broken") public void testDuplicateDeployElement() { Iterable<URL> urls = getResources("duplicate-deployments-beans.xml"); BeansXmlParser parser = new BeansXmlParser(new MockResourceLoader(), urls); parser.parse(); } - + }

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2865 - tck/trunk.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-06-23 06:23:28 -0400 (Tue, 23 Jun 2009) New Revision: 2865 Modified: tck/trunk/readme.txt Log: note on running the tck audit Modified: tck/trunk/readme.txt =================================================================== --- tck/trunk/readme.txt 2009-06-23 10:22:14 UTC (rev 2864) +++ tck/trunk/readme.txt 2009-06-23 10:23:28 UTC (rev 2865) @@ -21,3 +21,9 @@ coverage.html -- TCD + +Generating the TCK audit coverage report +---------------------------------------- +Run the following command to generate the TCK audit report: + + mvn clean install -Dtck-audit \ No newline at end of file

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2864 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/resources and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 06:22:14 -0400 (Tue, 23 Jun 2009) New Revision: 2864 Added: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java ri/trunk/parent/pom.xml ri/trunk/version-matrix/pom.xml Log: fix minor errors Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-23 10:21:40 UTC (rev 2863) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-23 10:22:14 UTC (rev 2864) @@ -18,7 +18,6 @@ import java.lang.annotation.Annotation; - import org.jboss.webbeans.DefinitionException; import org.jboss.webbeans.introspector.WBAnnotation; import org.jboss.webbeans.resources.ClassTransformer; @@ -42,7 +41,7 @@ */ public AnnotationModel(Class<T> type, ClassTransformer transformer) { - this.annotatedAnnotation = transformer.classForName(type); + this.annotatedAnnotation = transformer.annotationTypeForName(type); init(); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-06-23 10:21:40 UTC (rev 2863) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resources/ClassTransformer.java 2009-06-23 10:22:14 UTC (rev 2864) @@ -28,11 +28,11 @@ public class ClassTransformer implements Service { - + private final ConcurrentCache<Class<?>, WBClass<?>> classes; private final ConcurrentCache<Class<?>, WBAnnotation<?>> annotations; private final ClassTransformer transformer = this; - + /** * */ @@ -41,31 +41,31 @@ classes = new ConcurrentCache<Class<?>, WBClass<?>>(); annotations = new ConcurrentCache<Class<?>, WBAnnotation<?>>(); } - + public <T> WBClass<T> classForName(final Class<T> clazz) { return classes.putIfAbsent(clazz, new Callable<WBClass<T>>() - { + { public WBClass<T> call() throws Exception { return WBClassImpl.of(clazz, transformer); } - - }); + + }); } - - public <T extends Annotation> WBAnnotation<T> classForName(final Class<T> clazz) + + public <T extends Annotation> WBAnnotation<T> annotationTypeForName(final Class<T> clazz) { return annotations.putIfAbsent(clazz, new Callable<WBAnnotation<T>>() - { + { public WBAnnotation<T> call() throws Exception { return WBAnnotationImpl.of(clazz, transformer); } - - }); + + }); } } Added: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java =================================================================== --- ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java (rev 0) +++ ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java 2009-06-23 10:22:14 UTC (rev 2864) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans; + +import java.util.Map.Entry; + +import org.jboss.deployers.client.spi.IncompleteDeploymentException; +import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.api.DeploymentExceptionTransformer; + +/** + * An implementation which can transform deployment exceptions from JBoss AS + * reported via the Profile Service + * + * @author Pete Muir + * + */ +public class WebBeansProfileServiceDeploymentExceptionTransformer implements DeploymentExceptionTransformer +{ + + public DeploymentException transform(DeploymentException exception) + { + Throwable failure = exception.getCause(); + if (failure.getCause() instanceof IncompleteDeploymentException) + { + IncompleteDeploymentException incompleteDeploymentException = (IncompleteDeploymentException) failure.getCause(); + for (Entry<String, Throwable> entry : incompleteDeploymentException.getIncompleteDeployments().getContextsInError().entrySet()) + { + if (entry.getKey().endsWith(exception.getName() + "/_WebBeansBootstrapBean")) + { + return new DeploymentException(exception, entry.getValue()); + } + } + } + return exception; + } + +} Property changes on: ri/trunk/jboss-tck-runner/src/test/java/org/jboss/webbeans/WebBeansProfileServiceDeploymentExceptionTransformer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/parent/pom.xml =================================================================== --- ri/trunk/parent/pom.xml 2009-06-23 10:21:40 UTC (rev 2863) +++ ri/trunk/parent/pom.xml 2009-06-23 10:22:14 UTC (rev 2864) @@ -97,6 +97,24 @@ true </addDefaultSpecificationEntries> </manifest> + <manifestEntries> + <Implementation-URL>${pom.url}</Implementation-URL> + </manifestEntries> + <manifestSections> + <manifestSection> + <name>Build-Information</name> + <manifestEntries> + <Maven-Version>${maven.version}</Maven-Version> + <Java-Version>${java.version}</Java-Version> + <Java-Vendor>${java.vendor}</Java-Vendor> + <Os-Name>${os.name}</Os-Name> + <Os-Arch>${os.arch}</Os-Arch> + <Os-Version>${os.version}</Os-Version> + <Scm-Revision>${buildNumber}</Scm-Revision> + <Build-Time>${timestamp}</Build-Time> + </manifestEntries> + </manifestSection> + </manifestSections> </archive> </configuration> </plugin> @@ -109,6 +127,38 @@ <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>maven-version</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <id>set-build-properties</id> + <goals> + <goal>create</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <inherited>true</inherited> + <configuration> +  + <getRevisionOnlyOnce>true</getRevisionOnlyOnce> + <revisionOnScmFailure>unavailable</revisionOnScmFailure> + <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> + </configuration> + </plugin> </plugins> </pluginManagement> </build> Modified: ri/trunk/version-matrix/pom.xml =================================================================== --- ri/trunk/version-matrix/pom.xml 2009-06-23 10:21:40 UTC (rev 2863) +++ ri/trunk/version-matrix/pom.xml 2009-06-23 10:22:14 UTC (rev 2864) @@ -477,6 +477,11 @@ <version>0.6.3.CR2</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.0-beta-3</version> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0-beta-1</version>

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2863 - in tck/trunk: impl and 2 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-06-23 06:21:40 -0400 (Tue, 23 Jun 2009) New Revision: 2863 Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/ Removed: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/ Modified: tck/trunk/api/pom.xml tck/trunk/impl/pom.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml Log: fix minor errors Modified: tck/trunk/api/pom.xml =================================================================== --- tck/trunk/api/pom.xml 2009-06-23 03:11:17 UTC (rev 2862) +++ tck/trunk/api/pom.xml 2009-06-23 10:21:40 UTC (rev 2863) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>parent</artifactId> + <artifactId>jsr299-tck-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-06-23 03:11:17 UTC (rev 2862) +++ tck/trunk/impl/pom.xml 2009-06-23 10:21:40 UTC (rev 2863) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>parent</artifactId> + <artifactId>jsr299-tck-parent</artifactId> <groupId>org.jboss.jsr299.tck</groupId> <version>1.0.0-SNAPSHOT</version> </parent> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes (from rev 2862, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes) Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/beans.xml 2009-06-23 03:11:17 UTC (rev 2862) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/beans.xml 2009-06-23 10:21:40 UTC (rev 2863) @@ -2,7 +2,7 @@ <deploy> <type>javax.enterprise.inject.deployment.Standard</type> <type>javax.enterprise.inject.deployment.Production</type> - <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes.AnotherDeploymentType</type> - <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes.HornedAnimalDeploymentType</type> + <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes.AnotherDeploymentType</type> + <type>org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes.HornedAnimalDeploymentType</type> </deploy> </beans> \ No newline at end of file

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2862 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/passivating/broken10 and 25 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-22 23:11:17 -0400 (Mon, 22 Jun 2009) New Revision: 2862 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/ Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/District.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/EspooLocal_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/Espoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/BeanWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/FallowDeer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/StereotypeWithNonEmptyNamed_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ApplicationScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/SessionScopedHornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/Gazelle_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/StereotypeWithTooManyDeploymentTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/Elk_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/StereotypeWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/Asynchronous.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/RoeDeer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereotypeWithBindingTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/Goat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedAnimalDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanWithInjection.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/NotABean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java Log: repackaging to put tests which demonstrate bootstrap failure into folders that contain the word "broken" Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/District.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/District.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/District.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.broken10; import javax.enterprise.context.Dependent; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/EspooLocal_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/EspooLocal_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/EspooLocal_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.broken10; import javax.ejb.Local; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/Espoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/Espoo_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/Espoo_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.broken10; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.context.passivating.unserializableSimpleInjectedIntoPassivatingEnterpriseBean; +package org.jboss.jsr299.tck.tests.context.passivating.broken10; import javax.inject.UnserializableDependencyException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/Gazelle_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.nonBuiltInUsesStandard; import javax.enterprise.inject.deployment.Standard; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/nonBuiltInUsesStandard/NonBuiltInUsesStandardTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.nonBuiltInUsesStandard; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.nonBuiltInUsesStandard; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; + +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.enterprise.inject.deployment.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@Inherited +@interface AnotherDeploymentType +{ +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; + +import javax.enterprise.inject.deployment.Production; + +@Production +@AnotherDeploymentType +class BeanWithTooManyDeploymentTypes_Broken +{ +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany; + + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.api.DefinitionError; +import org.testng.annotations.Test; + +/** + * Single test for a bean with too many deployment types. + * Spec version: 20090519 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class TooManyDeploymentTypesTest extends AbstractJSR299Test +{ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.3", id = "da") + public void testTooManyDeploymentTypes() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/AnotherDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/ProducerFieldDeploymentTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField; - - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.testng.annotations.Test; - -/** - * Validate that a producer field specifies at most one deployment type. - * Spec version: 20090519 - */ -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -public class ProducerFieldDeploymentTest extends AbstractJSR299Test -{ - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "fa") - public void testTooManyDeploymentTypes() - { - assert false; - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/SpiderProducer_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/SpiderProducer_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; import javax.enterprise.inject.Produces; import javax.enterprise.inject.deployment.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/Tarantula.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/Tarantula.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerField; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; class Tarantula { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerField/ProducerFieldDeploymentTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerField/TooManyProducerFieldDeploymentTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerField; + + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.api.DefinitionError; +import org.testng.annotations.Test; + +/** + * Validate that a producer field specifies at most one deployment type. + * Spec version: 20090519 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class TooManyProducerFieldDeploymentTest extends AbstractJSR299Test +{ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.3", id = "fa") + public void testTooManyDeploymentTypes() + { + assert false; + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/AnotherDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/ProducerMethodDeploymentTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod; - - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.testng.annotations.Test; - -/** - * Validate that a producer method declares at most one deployment type. - * Spec version: 20090519 - */ -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -public class ProducerMethodDeploymentTest extends AbstractJSR299Test -{ - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "ea") - public void testTooManyDeploymentTypes() - { - assert false; - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/SpiderProducer_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/SpiderProducer_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; import javax.enterprise.inject.Produces; import javax.enterprise.inject.deployment.Production; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/Tarantula.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/Tarantula.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany.producerMethod; +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; class Tarantula { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/producerMethod/ProducerMethodDeploymentTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/broken/tooMany/producerMethod/TooManyProducerMethodDeploymentTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.definition.deployment.broken.tooMany.producerMethod; + + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.api.DefinitionError; +import org.testng.annotations.Test; + +/** + * Validate that a producer method declares at most one deployment type. + * Spec version: 20090519 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class TooManyProducerMethodDeploymentTest extends AbstractJSR299Test +{ + @Test(groups = { "deploymentType" }) + @SpecAssertion(section = "2.5.3", id = "ea") + public void testTooManyDeploymentTypes() + { + assert false; + } +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany; - -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.enterprise.inject.deployment.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@Inherited -@interface AnotherDeploymentType -{ -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/BeanWithTooManyDeploymentTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany; - -import javax.enterprise.inject.deployment.Production; - -@Production -@AnotherDeploymentType -class BeanWithTooManyDeploymentTypes_Broken -{ -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/deployment/tooMany/TooManyDeploymentTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.tests.definition.deployment.tooMany; - - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.testng.annotations.Test; - -/** - * Single test for a bean with too many deployment types. - * Spec version: 20090519 - */ -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -public class TooManyDeploymentTypesTest extends AbstractJSR299Test -{ - @Test(groups = { "deploymentType" }) - @SpecAssertion(section = "2.5.3", id = "da") - public void testTooManyDeploymentTypes() - { - assert false; - } - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/ResolvedIncompatibleStereotypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/Scallop.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; import javax.enterprise.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/incompatibleStereotypes/Scallop_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.incompatibleStereotypes; +package org.jboss.jsr299.tck.tests.definition.scope.broken1; /** * This bean definition is invalid because it declares two stereotypes Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/BeanWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/BeanWithTooManyScopeTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.tooMany; +package org.jboss.jsr299.tck.tests.definition.scope.broken2; import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/tooMany/TooManyScopesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.tooMany; +package org.jboss.jsr299.tck.tests.definition.scope.broken2; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/FallowDeer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/FallowDeer_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/FallowDeer_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.scope.broken3; @StereotypeWithNonEmptyNamed_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/NonEmptyNamedTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.scope.broken3; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/StereotypeWithNonEmptyNamed_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/StereotypeWithNonEmptyNamed_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.nonEmptyNamed; +package org.jboss.jsr299.tck.tests.definition.scope.broken3; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ApplicationScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ApplicationScopedHornedMammalStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ApplicationScopedHornedMammalStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; import javax.enterprise.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/Deer_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/Deer_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; @ApplicationScopedHornedMammalStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/MultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/ResolvedMultipleStereotypesWithMultipleScopeTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/SessionScopedHornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleScopeTypes/SessionScopedHornedMammalStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken1/SessionScopedHornedMammalStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken1; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken2/TooManyDeployElementsTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeployElements; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken2; import javax.inject.DeploymentException; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/AnotherDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken3; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/Gazelle_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/Gazelle_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/Gazelle_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken3; @StereotypeWithTooManyDeploymentTypes_Broken class Gazelle_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/StereotypeWithTooManyDeploymentTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/StereotypeWithTooManyDeploymentTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken3; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyDeploymentTypes/TooManyDeploymentTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken3/TooManyDeploymentTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken3; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/Elk_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/Elk_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/Elk_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken4; @StereotypeWithTooManyScopeTypes_Broken class Elk_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/StereotypeWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/StereotypeWithTooManyScopeTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken4; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/tooManyScopeTypes/TooManyScopeTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken4/TooManyScopeTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.tooManyScopeTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken4; import org.hibernate.tck.annotations.SpecAssertion; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/Asynchronous.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/Asynchronous.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/Asynchronous.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken5; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/RoeDeer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/RoeDeer_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/RoeDeer_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken5; @StereotypeWithBindingTypes_Broken class RoeDeer_Broken Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereoTypeWithBindingTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereoTypeWithBindingTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken5; import org.hibernate.tck.annotations.SpecAssertion; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereotypeWithBindingTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/withBindingTypes/StereotypeWithBindingTypes_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken5/StereotypeWithBindingTypes_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.withBindingTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.broken5; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/AnotherStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/AnotherStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/Goat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/Goat.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/Goat.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; @HornedMammalStereotype @AnotherStereotype Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedAnimalDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedAnimalDeploymentType.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/HornedMammalStereotype.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/HornedMammalStereotype.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/multipleStereotypesMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesWithMultipleDeploymentTypes; +package org.jboss.jsr299.tck.tests.definition.stereotype.multipleStereotypesMultipleDeploymentTypes; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.event.Observes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/DeploymentFailureTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/DeploymentFailureTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail/InitializerBean_Broken.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken1/InitializerBean_Broken.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken1; import javax.enterprise.inject.Initializer; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/AfterBeanDiscoveryFailureTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; import javax.enterprise.inject.UnsatisfiedResolutionException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.AfterDeploymentValidation; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanWithInjection.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/BeanWithInjection.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/BeanWithInjection.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; import javax.enterprise.inject.Current; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/NotABean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/NotABean.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken2/NotABean.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail2; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken2; class NotABean { Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail3/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken3/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail3; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken3; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken4; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail4/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail4; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken4; import javax.enterprise.inject.spi.AfterDeploymentValidation; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/AddDefinitionErrorTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail5; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken5; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail5/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail5; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken5; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.event.Observes; Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6 (from rev 2861, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/AddDeploymentProblemTest.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/AddDeploymentProblemTest.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail6; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken6; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail6/BeanDiscoveryObserver.java 2009-06-23 02:41:14 UTC (rev 2861) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken6/BeanDiscoveryObserver.java 2009-06-23 03:11:17 UTC (rev 2862) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.deployment.lifecycle.fail6; +package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken6; import javax.enterprise.inject.spi.AfterDeploymentValidation; import javax.event.Observes;

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2861 - ri/trunk/impl/src/main/java/org/jboss/webbeans/event and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-22 22:41:14 -0400 (Mon, 22 Jun 2009) New Revision: 2861 Added: ri/trunk/api/src/main/java/javax/event/Notify.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingTypeNotRuntime.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingEvent.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spun.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Web.java Removed: ri/trunk/api/src/main/java/javax/event/Asynchronously.java ri/trunk/api/src/main/java/javax/event/IfExists.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java Modified: ri/trunk/api/src/main/java/javax/event/Observes.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java Log: Refactor @IfExists and @Asynchronously as Notify annotation attributes on @Observes Update tests in the EventTest class to the 20090519 spec (actually a bit beyond that) Deleted: ri/trunk/api/src/main/java/javax/event/Asynchronously.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/Asynchronously.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/api/src/main/java/javax/event/Asynchronously.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.event; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is to be notified asynchronously - * with respect to the firing of the event. - * - * @author Gavin King - * @author David Allen - * - */ -@Retention(RUNTIME) -@Target(PARAMETER) -public @interface Asynchronously -{ -} Deleted: ri/trunk/api/src/main/java/javax/event/IfExists.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/IfExists.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/api/src/main/java/javax/event/IfExists.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,40 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2008, Red Hat Middleware LLC, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package javax.event; - -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Specifies that an observer method is only called if the current instance of - * the bean declaring the observer method already exists. - * - * @author Gavin King - * @author Pete Muir - */ - -@Target(PARAMETER) -@Retention(RUNTIME) -@Documented -public @interface IfExists -{ -} Added: ri/trunk/api/src/main/java/javax/event/Notify.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/Notify.java (rev 0) +++ ri/trunk/api/src/main/java/javax/event/Notify.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,28 @@ +package javax.event; + +/** + * An enumeration that is used to declare the condition under which an + * observer method should be called. The default behavior is to + * create the bean and invoke the observer method synchronously. + * + * @author Gavin King + * @author Dan Allen + */ +public enum Notify { + /** + * Specifies that an observer method is only called if the current instance of + * the bean declaring the observer method already exists. + */ + IF_EXISTS, + + /** + * Specifies that an observer method is called synchronously. + */ + SYNCHRONOUSLY, + + /** + * Specifies that an observer method receives the event notifications + * asynchronously. + */ + ASYNCHRONOUSLY +} \ No newline at end of file Modified: ri/trunk/api/src/main/java/javax/event/Observes.java =================================================================== --- ri/trunk/api/src/main/java/javax/event/Observes.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/api/src/main/java/javax/event/Observes.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, +* distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,8 +25,8 @@ import java.lang.annotation.Target; /** - * Specifies that a parameter of a method of a bean - * implementation class is the event parameter + * Specifies that a parameter of a method of a bean + * implementation class is the event parameter * of an observer method. * * @author Gavin King @@ -38,4 +38,5 @@ @Documented public @interface Observes { + public Notify notifyObserver() default Notify.SYNCHRONOUSLY; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,8 +27,7 @@ import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; -import javax.event.Asynchronously; -import javax.event.IfExists; +import javax.event.Notify; import javax.event.Observer; import javax.event.ObserverException; import javax.event.Observes; @@ -82,8 +81,9 @@ this.eventType = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBaseType(); this.bindings = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingsAsArray(); - this.conditional = !observerMethod.getAnnotatedParameters(IfExists.class).isEmpty(); - this.asynchronous = !observerMethod.getAnnotatedParameters(Asynchronously.class).isEmpty(); + Observes observesAnnotation = observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class); + this.conditional = observesAnnotation.notifyObserver().equals(Notify.IF_EXISTS); + this.asynchronous = observesAnnotation.notifyObserver().equals(Notify.ASYNCHRONOUSLY); } /** @@ -204,7 +204,7 @@ } /** - * Queues the event for later execution + * Queues the event for later execution * @param event */ protected void sendEventAsynchronously(final T event) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,8 +22,9 @@ import javax.event.AfterTransactionCompletion; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; -import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; +import javax.event.Notify; +import javax.event.Observes; import javax.transaction.Synchronization; import org.jboss.webbeans.BeanManagerImpl; @@ -104,9 +105,9 @@ if (!observerMethod.getAnnotatedParameters(BeforeTransactionCompletion.class).isEmpty()) { observationPhases.add(TransactionObservationPhase.BEFORE_COMPLETION); - if (!observerMethod.getAnnotatedParameters(Asynchronously.class).isEmpty()) + if (observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class).notifyObserver().equals(Notify.ASYNCHRONOUSLY)) { - throw new DefinitionException("@BeforeTransactionCompletion cannot be used with @Asynchronously on " + observerMethod); + throw new DefinitionException("@BeforeTransactionCompletion cannot be used on an asynchronous observer on " + observerMethod); } } if (!observerMethod.getAnnotatedParameters(AfterTransactionCompletion.class).isEmpty()) @@ -144,7 +145,7 @@ private void deferEvent(T event) { DeferredEventNotification<T> deferredEvent = null; - if (this.observerMethod.getAnnotatedParameters(Asynchronously.class).isEmpty()) + if (this.observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class).notifyObserver().equals(Notify.ASYNCHRONOUSLY)) { deferredEvent = new DeferredEventNotification<T>(event, this); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMethod.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMethod.java 2009-06-23 02:38:25 UTC (rev 2860) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMethod.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,9 +28,7 @@ import javax.event.AfterTransactionCompletion; import javax.event.AfterTransactionFailure; import javax.event.AfterTransactionSuccess; -import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; -import javax.event.IfExists; import javax.event.Observes; /** @@ -43,7 +41,7 @@ public interface WBMethod<T> extends WBMember<T, Method> { @SuppressWarnings("unchecked") - public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class, Asynchronously.class, Disposes.class)); + public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class, Disposes.class)); /** * Gets the abstracted parameters of the method @@ -77,7 +75,7 @@ public T invoke(Object instance, Object... parameters) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException; /** - * Invokes the method on the class of the passed instance, not the declaring + * Invokes the method on the class of the passed instance, not the declaring * class. Useful with proxies * * @param instance The instance to invoke Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasDisplay.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -3,7 +3,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; -import javax.event.Asynchronously; +import javax.event.Notify; import javax.event.Observes; class TcasDisplay @@ -13,7 +13,7 @@ private static boolean applicationScopeActive = false; - public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent) + public void drawTarget(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) TargetEvent targetEvent) { if (beanManager.getContext(ApplicationScoped.class).isActive()) { @@ -25,7 +25,7 @@ } } - public void drawNearMiss(@Observes @Asynchronously NearMiss event) + public void drawNearMiss(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) NearMiss event) { event.setBean(org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(beanManager,SimpleApplicationBean.class)); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/TcasToFmsLink.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -2,7 +2,7 @@ import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; -import javax.event.Asynchronously; +import javax.event.Notify; import javax.event.Observes; class TcasToFmsLink @@ -10,7 +10,7 @@ @Current private BeanManager beanManager; - public void avoidanceAction(@Observes @Asynchronously NearMiss event) + public void avoidanceAction(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) NearMiss event) { event.setBean(org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(beanManager,SimpleApplicationBean.class)); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/TcasDisplay.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -3,7 +3,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; -import javax.event.Asynchronously; +import javax.event.Notify; import javax.event.Observes; class TcasDisplay @@ -13,7 +13,7 @@ private static boolean requestScopeActive = false; - public void drawTarget(@Observes @Asynchronously TargetEvent targetEvent) + public void drawTarget(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) TargetEvent targetEvent) { if (beanManager.getContext(RequestScoped.class).isActive()) { @@ -25,7 +25,7 @@ } } - public void drawNearMiss(@Observes @Asynchronously NearMiss event) + public void drawNearMiss(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) NearMiss event) { event.setBean(org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(beanManager,SimpleRequestBean.class)); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,18 +1,18 @@ package org.jboss.jsr299.tck.tests.event; -import javax.event.Asynchronously; +import javax.event.Notify; import javax.event.Observes; public class AsynchronousObserver { private static Thread threadObservingEvent = null; - public void observes(@Observes @Asynchronously Boolean event) + public void observes(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) Boolean event) { threadObservingEvent = Thread.currentThread(); } - public void observes(@Observes @Asynchronously Character event) + public void observes(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) Character event) { throw new RuntimeException("RE1"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -2,23 +2,25 @@ import java.util.Set; -import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; import javax.event.Observer; import javax.event.Observes; /** * Simple bean with observer method and another injectable parameter. - * */ class BananaSpider { - public void observeStringEvent(@Observes String someEvent, @Current BeanManager beanManager) + public void observeStringEvent(@Observes String event, BeanManager beanManager, @Spun Web web) { - assert someEvent != null; - assert beanManager != null; - Set<Observer<String>> allStringObservers = beanManager.resolveObservers(someEvent); + assert event != null; + Set<Observer<String>> allStringObservers = beanManager.resolveObservers(event); assert allStringObservers != null; assert allStringObservers.size() > 0; + if ("validate injected parameters".equals(event)) + { + assert beanManager != null; + assert web != null; + } } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.tests.event; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; - -import java.lang.annotation.Target; - -import javax.enterprise.inject.BindingType; - -@Target( { FIELD, PARAMETER }) -@BindingType -@interface BindingNotRuntime -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingTypeNotRuntime.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingNotRuntime.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingTypeNotRuntime.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BindingTypeNotRuntime.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +@Target( { FIELD, PARAMETER }) +@BindingType +@interface BindingTypeNotRuntime +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -7,12 +7,12 @@ private static boolean multiBindingEventObserved = false; private static boolean singleBindingEventObserved = false; - public void observesEvent(@Observes @Role("Admin") @Tame MultiBindingType someEvent) + public void observesEvent(@Observes @Role("Admin") @Tame MultiBindingEvent someEvent) { multiBindingEventObserved = true; } - public void observesMoreEvent(@Observes @Tame MultiBindingType someEvent) + public void observesMoreEvent(@Observes @Tame MultiBindingEvent someEvent) { singleBindingEventObserved = true; } @@ -26,4 +26,10 @@ { return singleBindingEventObserved; } + + public static void reset() + { + multiBindingEventObserved = false; + singleBindingEventObserved = false; + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledDeploymentType.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.event; + +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.enterprise.inject.deployment.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface DisabledDeploymentType +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DisabledStringObserver.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.event.Observes; + +@DisabledDeploymentType +class DisabledStringObserver +{ + public void disabledObserver(@Observes String event) + { + if ("fail if disable observer invoked".equals(event)) + { + assert false : "This observer should not be invoked since it resides on a bean which is disabled"; + } + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.event; + +import javax.enterprise.inject.Any; +import javax.event.Event; + +class DogWhisperer +{ + private @Any Event<MultiBindingEvent> event; + + public void issueTamingCommand() + { + event.fire(new MultiBindingEvent(), new TameAnnotationLiteral(), new RoleBinding("Admin")); + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,4 +1,3 @@ - package org.jboss.jsr299.tck.tests.event; import java.lang.annotation.Annotation; @@ -29,13 +28,15 @@ * @author Nicklas Karlsson * @author David Allen * - * Spec version: Public Release Draft 2 + * Spec version: Public Release Draft 2 */ @Artifact @BeansXml("beans.xml") public class EventTest extends AbstractJSR299Test { - + private static final String FIRE_EVENT_METHOD_NAME = "fireEvent"; + private static final String RESOLVE_OBSERVERS_METHOD_NAME = "resolveObservers"; + public static class AnEventType { } @@ -92,27 +93,27 @@ /** * An event binding type is a Java annotation defined as @Target({FIELD, * PARAMETER}) ~or @Target({METHOD, FIELD, PARAMETER, TYPE}) and - * - * @Retention(RUNTIME)~ + * @Retention(RUNTIME)~. All event binding types must specify the + * @BindingType meta-annotation. */ @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "d") }) + @SpecAssertion(section = "10.1", id = "d") public void testEventBindingTypeTargetMostAndRuntime() { - getCurrentManager().fireEvent("event", new TameAnnotationLiteral()); + getCurrentManager().fireEvent("string event", new TameAnnotationLiteral()); } /** * An event binding type is a Java annotation defined as ~@Target({FIELD, * PARAMETER}) or~ @Target({METHOD, FIELD, PARAMETER, TYPE}) ~and - * - * @Retention(RUNTIME)~ + * @Retention(RUNTIME)~. All event binding types must specify the + * @BindingType meta-annotation. */ @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e") }) + @SpecAssertion(section = "10.1", id = "e") public void testEventBindingTypeTargetsFieldParameterAndRuntime() { - getCurrentManager().fireEvent("event", new RoleBinding("Admin")); + getCurrentManager().fireEvent("string event", new RoleBinding("Admin")); } /** @@ -120,23 +121,28 @@ * PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and * ~@Retention(RUNTIME) */ - @Test(groups = { "events", "ri-broken" }, expectedExceptions = { IllegalArgumentException.class } ) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "f") }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class } ) + @SpecAssertion(section = "10.1", id = "f") public void testEventBindingTypeNotRuntime() { - //TODO This should throw an exception since by definition this is not an event binding type - getCurrentManager().fireEvent("event", new AnnotationLiteral<BindingNotRuntime>(){}); + getCurrentManager().fireEvent("string event", new AnnotationLiteral<BindingTypeNotRuntime>(){}); } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class } ) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "g") }) - public void testEventBindingTypesSpecifyBinding() + @SpecAssertions({ + @SpecAssertion(section = "10.1", id = "g"), + @SpecAssertion(section = "11.2.8", id = "e") + }) + public void testManagerFireEventWithNonBindingAnnotationsFails() { - getCurrentManager().fireEvent("event", new AnnotationLiteral<NotABindingType>(){}); + getCurrentManager().fireEvent("string event", new AnnotationLiteral<NotABindingType>(){}); } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"), @SpecAssertion(section = "7.2", id = "b") }) + @SpecAssertions({ + @SpecAssertion(section = "10.1", id = "aa"), + @SpecAssertion(section = "11.2.8", id = "c") + }) public void testManagerFireEventWithEventTypeParametersFails() { ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>(); @@ -144,37 +150,35 @@ } @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.1", id = "b"), @SpecAssertion(section = "7.2", id = "c") }) + @SpecAssertions({ + @SpecAssertion(section = "10.1", id = "aa"), + @SpecAssertion(section = "11.2.8", id = "c") + }) public void testManagerFireEventWithEventTypeWildcardsFails() { ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>(); getCurrentManager().fireEvent(anEventOnAnyType); } + @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) + @SpecAssertion(section = "11.2.8", id = "d") + public void testDuplicateBindingsToFireEventFails() throws Exception + { + getCurrentManager().fireEvent("string event", new TameAnnotationLiteral(), new TameAnnotationLiteral()); + } + @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") }) + @SpecAssertion(section = "11.2.8", id = "a") public void testManagerInterfaceForFireEventMethod() throws Exception { - assert BeanManager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null; + assert BeanManager.class.getDeclaredMethod(FIRE_EVENT_METHOD_NAME, Object.class, Annotation[].class) != null; } - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.2", id = "d") }) - public void testManagerFireEventWithNonBindingAnnotationsFails() - { - // The specs are not exactly clear on what is supposed to happen here, - // but borrowing from Section 8.3, we'll expect the same behavior here - // for a consistent API. - // TODO Verify that fireEvent should fail on non-binding annotations - AnEventType anEvent = new AnEventType(); - getCurrentManager().fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral()); - } - /** * The Manager interface provides a method for firing events: */ @Test(groups = { "events" }) - @SpecAssertion(section = "7.2", id = "a") + @SpecAssertion(section = "11.2.8", id = "a") public void testManagerFireEvent() { // First a simple event with no bindings is fired @@ -185,9 +189,8 @@ getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin")); } - // TODO This is not an assertion but a definition which is circular @Test(groups = { "events" }) - @SpecAssertion(section = "7.3", id = "a") + @SpecAssertion(section = "10.3", id = "a") public void testObserversImplementObserverInterface() { Observer<String> observer = new Observer<String>() @@ -197,88 +200,50 @@ return false; } }; - assert observer != null; - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "f") }) - public void testManagerAddObserverWithEventTypeParametersFails() - { - observerWithEventObjectContainsTypeVariables(); - } - - private <E> void observerWithEventObjectContainsTypeVariables() - { - Observer<ArrayList<E>> observer = new Observer<ArrayList<E>>() { - - public boolean notify(ArrayList<E> event) - { - return false; - } - - }; getCurrentManager().addObserver(observer); } - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "g") }) - public void testManagerAddObserverWithEventTypeWildcardsFails() - { - Observer<ArrayList<?>> observer = new Observer<ArrayList<?>>() { - - public boolean notify(ArrayList<?> event) - { - return false; - } - - }; - getCurrentManager().addObserver(observer); - } - - @Test(groups = { "events", "underInvestigation" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "h") }) - public void testManagerRemoveObserverWithEventTypeParametersFails() - { - //TODO This requires passing a Class<T> corresponding to Event<T> which is not possible - assert false; - } - - @Test(groups = { "events", "underInvestigation" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertions( { @SpecAssertion(section = "7.3", id = "i") }) - public void testManagerRemoveObserverWithEventTypeWildcardsFails() - { - //TODO This requires passing a Class<T> corresponding to Event<?> which is not possible - assert false; - } - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.7", id = "a") }) + @SpecAssertion(section = "11.2.9", id = "a") public void testManagerResolveObserversSignature() throws Exception { - assert getCurrentManager().getClass().getDeclaredMethod("resolveObservers", Object.class, Annotation[].class) != null; + assert getCurrentManager().getClass().getDeclaredMethod(RESOLVE_OBSERVERS_METHOD_NAME, Object.class, Annotation[].class) != null; } @Test(groups = { "events" }) - @SpecAssertions( { - @SpecAssertion(section = "7.5", id = "a"), - @SpecAssertion(section = "7.5.2", id = "a"), - @SpecAssertion(section = "11.2", id = "af") + @SpecAssertions({ + @SpecAssertion(section = "10.5", id = "a"), + @SpecAssertion(section = "10.5.2", id = "a"), + @SpecAssertion(section = "12.3", id = "o") }) public void testObserverMethodAutomaticallyRegistered() { - assert !getCurrentManager().resolveObservers("event").isEmpty(); + assert !getCurrentManager().resolveObservers(new String()).isEmpty(); } + + @Test(groups = { "events", "ri-broken" }) + @SpecAssertion(section = "12.3", id = "o") + public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() + { + Set<Observer<String>> observers = getCurrentManager().resolveObservers(new String()); + assert observers.size() == 2; + for (Observer<String> observer : observers) + { + // an assertion error will be raised if an inappropriate observer is called + observer.notify("fail if disable observer invoked"); + } + } @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "e") - public void testMultipleObserverMethodsForSameEventOK() + @SpecAssertion(section = "10.5", id = "e") + public void testMultipleObserverMethodsForSameEventPermissible() { - assert getCurrentManager().resolveObservers("event").size() > 1; + assert getCurrentManager().resolveObservers(new String()).size() > 1; } @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "f") - public void testMultipleObserverMethodsOnBeanOK() + @SpecAssertion(section = "10.5", id = "f") + public void testMultipleObserverMethodsOnBeanPermissible() { // Resolve the observers for types 1 and 2 Set<Observer<ObservedType1>> resolvedStringObservers = getCurrentManager().resolveObservers(new ObservedType1()); @@ -289,7 +254,7 @@ } @Test(groups = { "events", "ejb" }) - @SpecAssertion(section = "7.5", id = "d") + @SpecAssertion(section = "10.5", id = "d") public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic() { Set<Observer<EJBEvent>> observers = getCurrentManager().resolveObservers(new EJBEvent()); @@ -297,7 +262,7 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.1", id = "b") + @SpecAssertion(section = "10.5.1", id = "b") public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes() { // Resolve registered observers with an event containing no binding types @@ -306,78 +271,68 @@ } @Test(groups = { "events" }) - @SpecAssertions( { - @SpecAssertion(section = "7.5.2", id = "g"), - @SpecAssertion(section = "7.7.1", id = "a"), - @SpecAssertion(section = "7.7.2", id = "a") + @SpecAssertions( { + @SpecAssertion(section = "10.5.2", id = "c"), + @SpecAssertion(section = "10.2.1", id = "a"), + @SpecAssertion(section = "10.2.2", id = "a") }) public void testObserverMethodMayHaveMultipleBindingTypes() { - // If we can resolve the observer with the two binding types, - // then it worked - Set<Observer<MultiBindingType>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingType(), new RoleBinding("Admin"), new TameAnnotationLiteral()); + // If we can resolve the observer with the two binding types, then it worked + Set<Observer<MultiBindingEvent>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()); assert resolvedObservers.size() == 2; } - /** - * In addition to the event parameter, observer methods may declare - * additional parameters, which may declare bindings. The container calls the - * method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving - * dependencies" to determine a value for each parameter of an observer - * method and calls the observer method with those parameter values. - * - * To invoke an observer method, the container must pass the event object to - * the event parameter and the object returned by - * Manager.getInstanceToInject() to each of the other parameters. - */ @Test(groups = { "events" }) - @SpecAssertions( { - @SpecAssertion(section = "7.5.4", id = "a"), - @SpecAssertion(section = "7.5.8", id = "j") + @SpecAssertions( { + @SpecAssertion(section = "10.5.3", id = "a"), + @SpecAssertion(section = "5.4.8", id = "c") }) public void testObserverMethodReceivesInjectionsOnNonObservesParameters() { - getCurrentManager().fireEvent("string event"); + getCurrentManager().fireEvent("validate injected parameters"); } @Test(groups = { "events" }) - @SpecAssertions( { - @SpecAssertion(section = "7.5.5", id = "a"), - @SpecAssertion(section = "7.5.5", id = "b") + @SpecAssertions( { + @SpecAssertion(section = "10.5.4", id = "a"), + @SpecAssertion(section = "5.4.8", id = "b") } ) public void testConditionalObserver() throws Exception { - RecluseSpider.notified = false; + RecluseSpider.reset(); getCurrentManager().fireEvent(new ConditionalEvent()); // Should not be notified since bean is not instantiated yet - assert !RecluseSpider.notified; + assert !RecluseSpider.isNotified(); // Now instantiate the bean and fire another event new RunInDependentContext() { - @Override protected void execute() throws Exception { RecluseSpider bean = getInstanceByType(RecluseSpider.class); assert bean != null; // Must invoke a method to really create the instance - assert !bean.isNotified(); - + assert !bean.isInstanceNotified(); getCurrentManager().fireEvent(new ConditionalEvent()); - assert bean.isNotified(); + assert RecluseSpider.isNotified() && bean.isInstanceNotified(); } }.run(); + + RecluseSpider.reset(); } @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "c"), @SpecAssertion(section = "7.5.8", id = "g")} ) + @SpecAssertions({ + @SpecAssertion(section = "10.6.1", id = "c"), + @SpecAssertion(section = "10.6.1", id = "g") + }) public void testAsynchronousObserverIsAsynchronous() throws Exception { new RunInDependentContext() { - @Override protected void execute() throws Exception { @@ -390,7 +345,7 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "a") + @SpecAssertion(section = "10.6.1", id = "aa") public void testObserverMethodRegistration() { // Resolve registered observers with an event containing no binding types @@ -398,33 +353,56 @@ assert resolvedObservers.size() == 2; } - @Test(groups = { "stub", "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "b"), @SpecAssertion(section = "7.5.8", id = "h")} ) - public void testObserverMethodCalledImmediately() + @Test(groups = { "events" }) + @SpecAssertions({ + @SpecAssertion(section = "10.6.1", id = "b"), + @SpecAssertion(section = "10.6.1", id = "h") + }) + public void testObserverMethodCalledImmediately() throws Exception { - - assert false; + StaticObserver.reset(); + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().fireEvent(new Delivery()); + assert StaticObserver.isDeliveryReceived() && StaticObserver.getThreadObservingEvent().equals(Thread.currentThread()); + } + + }.run(); + StaticObserver.reset(); } + /** + * FIXME the spec doesn't follow this exactly because technically it isn't supposed to use + * the bean resolution alorithm to obtain the instance, which it does. + */ @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.5", id = "c"), @SpecAssertion(section = "7.5.8", id = "k")} ) - public void testStaticObserverMethodInvoked() + @SpecAssertions({ + @SpecAssertion(section = "10.5", id = "c"), + @SpecAssertion(section = "5.4.8", id = "k") + }) + public void testStaticObserverMethodInvoked() throws Exception { - getCurrentManager().fireEvent(new Delivery()); - assert StaticObserver.isDeliveryReceived(); + try + { + getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); + StaticObserver.reset(); + getCurrentManager().fireEvent(new Delivery()); + assert StaticObserver.isDeliveryReceived(); + StaticObserver.reset(); + } + finally + { + getCurrentConfiguration().getContexts().setActive(getCurrentConfiguration().getContexts().getRequestContext()); + } } - /** - * Otherwise, if the observer method is non-static, the container must: - * - * • obtain the Bean object for the most specialized bean that specializes - * the bean which declares the observer method, and then - * - */ @Test(groups = { "events" }) @SpecAssertions({ - @SpecAssertion(section = "7.5.8", id = "l"), - @SpecAssertion(section = "4.3.2", id = "f") + @SpecAssertion(section = "4.3.2", id = "a"), + @SpecAssertion(section = "5.4.8", id = "b") }) public void testObserverCalledOnMostSpecializedInstance() { @@ -433,42 +411,19 @@ assert Shop.deliveryObservedBy.equals(FarmShop.class.getName()); } - /** - * obtain the context object by calling Manager.getContext(), passing the - * bean scope, then - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "m") - public void testObserverContextRetrieved() - { - assert false; - } - - /** - * obtain an instance of the bean by calling Context.get(), passing the Bean - * instance representing the bean, together with a CreationalContext unless - * this observer method is a conditional observer method, and then - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "n") - public void testObserverInstanceRetrievedFromContext() - { - assert false; - } - - /** - * if the get() method returned a non-null value, invoke the observer method - * on the returned instance - */ - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.8", id = "o") + @Test(groups = { "events" }) + @SpecAssertion(section = "5.4.8", id = "b") public void testObserverMethodInvokedOnReturnedInstanceFromContext() { - assert false; + RecluseSpider spider = getInstanceByType(RecluseSpider.class); + spider.setWeb(new Web()); + getCurrentManager().fireEvent(new ConditionalEvent()); + assert spider.isInstanceNotified(); + assert spider.getWeb().getRings() == 1; } @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "p") + @SpecAssertion(section = "7.5.8", id = "p") // skipped public void testAsynchronousObserverThrowsExceptionIsLogged() throws Exception { new RunInDependentContext() @@ -486,19 +441,18 @@ } @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.9", id = "a") + @SpecAssertion(section = "7.5.9", id = "a") // skipped public void testAsynchronousObserverMethodContexts() { assert false; } @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) - @SpecAssertion(section = "7.6", id = "g") + @SpecAssertion(section = "11.2.8", id = "d") public void testDuplicateBindingsToFireFails() throws Exception { new RunInDependentContext() { - @Override protected void execute() throws Exception { @@ -510,7 +464,7 @@ } @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) - @SpecAssertion(section = "7.6", id = "g") + @SpecAssertion(section = "11.2.7", id = "d") public void testDuplicateBindingsToObservesFails() throws Exception { new RunInDependentContext() @@ -525,7 +479,9 @@ }.run(); } - + + // left off here + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "7.6", id = "h") public void testNonBindingTypePassedToFireFails() throws Exception @@ -624,13 +580,18 @@ assert eventBeans.size() == 1; } - // TODO The manager related tests require intercepting all calls - // to it to verify that the correct calls are made. - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") + // FIXME the assertion is being verified indirectly by verifying outcome + // to verify directly, would need to mock BeanManager (very hard) or + // intercept the call to BeanManager#fireEvent() (equally hard) + @Test(groups = { "events" }) + @SpecAssertion(section = "10.4.1", id = "ed") public void testFireMethodCallsManagerFireWithEventObject() { - assert false; + BullTerrier.reset(); + getInstanceByType(DogWhisperer.class).issueTamingCommand(); + assert BullTerrier.isMultiBindingEventObserved(); + assert BullTerrier.isSingleBindingEventObserved(); + BullTerrier.reset(); } @Test(groups = { "events", "underInvestigation" }) @@ -694,13 +655,13 @@ @Test(groups = { "events" }) - @SpecAssertions( { - @SpecAssertion(section = "7.7.2", id = "b"), + @SpecAssertions( { + @SpecAssertion(section = "7.7.2", id = "b"), @SpecAssertion(section = "7.7.2", id = "c") } ) public void testObserverMethodNotifiedWhenBindingsMatch() { - getCurrentManager().fireEvent(new MultiBindingType(), new RoleBinding("Admin"), new TameAnnotationLiteral()); + getCurrentManager().fireEvent(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()); assert BullTerrier.isMultiBindingEventObserved(); assert BullTerrier.isSingleBindingEventObserved(); } @@ -783,13 +744,13 @@ assert observers.size() == 1; // Notify the observer so we can confirm that it - // is a method only on StockWatcher, and not IntermediateStockWatcher + // is a method only on StockWatcher, and not IntermediateStockWatcher // or IndirectStockWatcher observers.iterator().next().notify(new StockPrice()); assert StockWatcher.getObserverClazz().equals(StockWatcher.class); } }.run(); - } + } } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingEvent.java (from rev 2838, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingEvent.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingEvent.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.event; + +class MultiBindingEvent +{ + +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/MultiBindingType.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.tests.event; - -class MultiBindingType -{ - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Pomeranian.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -12,6 +12,10 @@ { notificationThread = Thread.currentThread(); } + + public void observerTameSimpleEvent(@Observes @Tame SimpleEventType someEvent) + { + } public static void staticallyObserveEvent(@Observes SimpleEventType someEvent) { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RecluseSpider.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,7 +1,7 @@ package org.jboss.jsr299.tck.tests.event; import javax.enterprise.context.RequestScoped; -import javax.event.IfExists; +import javax.event.Notify; import javax.event.Observes; /** @@ -11,15 +11,42 @@ @RequestScoped class RecluseSpider { - public static boolean notified = false; + private static boolean notified = false; + private boolean instanceNotified = false; + private Web web; - public void observe(@Observes @IfExists ConditionalEvent someEvent) + public void observe(@Observes(notifyObserver = Notify.IF_EXISTS) ConditionalEvent someEvent) { notified = true; + instanceNotified = true; + if (web != null) + { + web.addRing(); + } } - public boolean isNotified() + public boolean isInstanceNotified() { + return instanceNotified; + } + + public static boolean isNotified() + { return notified; } + + public static void reset() + { + notified = false; + } + + public void setWeb(Web web) + { + this.web = web; + } + + public Web getWeb() + { + return this.web; + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spun.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spun.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Spun.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Spun +{ +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StaticObserver.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,16 +1,19 @@ package org.jboss.jsr299.tck.tests.event; +import javax.enterprise.context.RequestScoped; import javax.event.Observes; -class StaticObserver +@RequestScoped class StaticObserver { private static boolean deliveryReceived = false; + private static Thread threadObservingEvent = null; public static void accept(@Observes Delivery delivery) { setDeliveryReceived(true); + setThreadObservingEvent(Thread.currentThread()); } - + public static boolean isDeliveryReceived() { return deliveryReceived; @@ -20,4 +23,20 @@ { StaticObserver.deliveryReceived = deliveryReceived; } + + public static Thread getThreadObservingEvent() + { + return threadObservingEvent; + } + + public static void setThreadObservingEvent(Thread threadObservingEvent) + { + StaticObserver.threadObservingEvent = threadObservingEvent; + } + + public static void reset() + { + deliveryReceived = false; + threadObservingEvent = null; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,10 +1,9 @@ package org.jboss.jsr299.tck.tests.event; -import javax.event.Event; import javax.enterprise.inject.Any; +import javax.event.Event; import javax.event.Observer; - class SweeWaxbill { @Any @Role("Admin") @@ -12,7 +11,7 @@ public void methodThatFiresEvent() { - simpleEvent.fire("An event", new RoleBinding("Admin")); + simpleEvent.fire("string event", new RoleBinding("Admin")); } public void methodThatRegistersObserver() Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Web.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Web.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Web.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.event; + +@Spun class Web +{ + private int rings = 0; + + public void addRing() + { + this.rings++; + } + + public void setRings(int rings) + { + this.rings = rings; + } + + public int getRings() + { + return this.rings; + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/event1/FiresOnNonEventTest.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,9 +20,9 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.api.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** @@ -30,7 +30,6 @@ * not an Event type. * * @author David Allen - * */ @Artifact @ExpectedDeploymentException(DefinitionError.class) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -9,37 +9,36 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ - package org.jboss.jsr299.tck.tests.event.broken.observer8; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.api.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; import org.testng.annotations.Test; /** * Tests an asynchronous observer method that is also a * transactional observer for the before completion phase. * + * Spec version: 20090519 + * * @author David Allen - * */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test { @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.7", id = "d") + @SpecAssertion(section = "10.5.6", id = "b") public void testAsynchronousObserverAsBeforeCompletionObserverFails() { assert false; } -} +} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,13 +1,12 @@ package org.jboss.jsr299.tck.tests.event.broken.observer8; -import javax.event.Asynchronously; import javax.event.BeforeTransactionCompletion; +import javax.event.Notify; import javax.event.Observes; class Terrier { - public void observer(@Observes @Asynchronously @BeforeTransactionCompletion String event) + public void observer(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) @BeforeTransactionCompletion String event) { - } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.tests.event.broken.observer9; - - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.jboss.jsr299.tck.api.DefinitionError; -import org.testng.annotations.Test; - -/** - * Tests an observer method that is both conditional and - * asynchronous, which is not allowed. - * - * @author David Allen - * - */ -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -public class AsynchronousConditionalObserverTest extends AbstractJSR299Test -{ - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.7", id = "e") - public void testAsynchronousObserverAsConditionalObserverFails() - { - assert false; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java 2009-06-23 02:38:25 UTC (rev 2860) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer9/Terrier.java 2009-06-23 02:41:14 UTC (rev 2861) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.tests.event.broken.observer9; - -import javax.event.Asynchronously; -import javax.event.IfExists; -import javax.event.Observes; - -class Terrier -{ - public void observer(@Observes @Asynchronously @IfExists String event) - { - - } -}

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2860 - ri/trunk/impl/src/main/java/org/jboss/webbeans/util.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-22 22:38:25 -0400 (Mon, 22 Jun 2009) New Revision: 2860 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java Log: properly detect if a BindingType annotation is marked w/ runtime retention Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-06-23 02:18:45 UTC (rev 2859) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-06-23 02:38:25 UTC (rev 2860) @@ -9,7 +9,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,6 +19,8 @@ import java.beans.Introspector; import java.io.Serializable; import java.lang.annotation.Annotation; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -125,7 +127,7 @@ } if (beanType instanceof Class) { - return resolveType(((Class<?>) beanType).getGenericSuperclass(), (ParameterizedType) type); + return resolveType(((Class<?>) beanType).getGenericSuperclass(), type); } } @@ -137,7 +139,7 @@ } if (beanType instanceof Class) { - return resolveType(((Class<?>) beanType).getGenericSuperclass(), (TypeVariable<?>) type); + return resolveType(((Class<?>) beanType).getGenericSuperclass(), type); } } return type; @@ -493,7 +495,7 @@ { return lookupMethod(method.getName(), method.getParameterTypes(), instance); } - catch (NoSuchMethodException e) + catch (NoSuchMethodException e) { throw new IllegalArgumentException(e); } @@ -522,7 +524,7 @@ { return lookupMethod(methodName, parameterTypes, intf); } - catch (NoSuchMethodException e) + catch (NoSuchMethodException e) { // Expected } @@ -546,7 +548,8 @@ /** * Checks the bindingType to make sure the annotation was declared properly - * as a binding type (annotated with @BindingType). + * as a binding type (annotated with @BindingType) and that it has + * a runtime retention policy. * * @param binding The binding type to check * @return true only if the annotation is really a binding type @@ -556,7 +559,9 @@ public static boolean isBindings(Annotation binding) { boolean isBindingAnnotation = false; - if (binding.annotationType().isAnnotationPresent(BindingType.class)) + if (binding.annotationType().isAnnotationPresent(BindingType.class) && + binding.annotationType().isAnnotationPresent(Retention.class) && + binding.annotationType().getAnnotation(Retention.class).value().equals(RetentionPolicy.RUNTIME)) { isBindingAnnotation = true; }

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2859 - tck/trunk.

by webbeans-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-06-22 22:18:45 -0400 (Mon, 22 Jun 2009) New Revision: 2859 Modified: tck/trunk/pom.xml Log: add jsr299-tck prefix to parent artifact name Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-06-22 02:14:28 UTC (rev 2858) +++ tck/trunk/pom.xml 2009-06-23 02:18:45 UTC (rev 2859) @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>parent</artifactId> + <artifactId>jsr299-tck-parent</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <name>JSR-299 TCK</name> @@ -70,14 +70,17 @@ <dependencyManagement> <dependencies> - <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>5.8</version> <classifier>jdk15</classifier> </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId>

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2858 - ri/trunk/parent.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-06-21 22:14:28 -0400 (Sun, 21 Jun 2009) New Revision: 2858 Modified: ri/trunk/parent/pom.xml Log: typo Modified: ri/trunk/parent/pom.xml =================================================================== --- ri/trunk/parent/pom.xml 2009-06-19 10:34:07 UTC (rev 2857) +++ ri/trunk/parent/pom.xml 2009-06-22 02:14:28 UTC (rev 2858) @@ -11,7 +11,7 @@ <version>1.0.0-SNAPSHOT</version> </parent> - <name>Web Beans, the reference implmentation of JSR-299</name> + <name>Web Beans, the reference implementation of JSR-299</name> <url>http://www.seamframework.org/WebBeans</url> <description>

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r2857 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2009-06-19 06:34:07 -0400 (Fri, 19 Jun 2009) New Revision: 2857 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java Log: Fixed compilation problem with a test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java 2009-06-19 04:37:45 UTC (rev 2856) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/fail2/AfterBeanDiscoveryFailureTest.java 2009-06-19 10:34:07 UTC (rev 2857) @@ -46,7 +46,7 @@ @SpecAssertion(section = "11.5.2", id = "a"), @SpecAssertion(section = "12.2", id = "e"), @SpecAssertion(section = "11.5.3", id = "a"), - @SpecAssertion(section = "12.2", id = "f"), + @SpecAssertion(section = "12.2", id = "f") }) public void testDeploymentFailsDuringValidation() {

15 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits June 2009